From ea13b806251cc6f6a3f15f08aa56da7f8e9fca43 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 27 Jan 2017 11:11:01 +0100
Subject: marble: support for Qt4 was removed from the source.

---
 kde/make/marble | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/kde/make/marble b/kde/make/marble
index 2f12213..95ba2b1 100644
--- a/kde/make/marble
+++ b/kde/make/marble
@@ -1,23 +1,29 @@
-# Marble's cmake left us in build_qt4,
-# so we build and install Qt4 support first:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-# Move the marble4 cmake file so that it will be found:
-mkdir -p $PKG/usr/share/apps/cmake/modules
-mv $PKG/usr/share/marble/cmake/FindMarble.cmake \
-  $PKG/usr/share/apps/cmake/modules/FindMarble.cmake
-# Rename the marble4 include dir to avoid a conflict with marble:
-mv $PKG/usr/include/marble{,4}
-# And fix that include path in the cmake file too:
-sed -i $PKG/usr/share/apps/cmake/modules/FindMarble.cmake \
-    -e 's,marble/MarbleModel.h,marble4/MarbleModel.h,'
+#
+## Marble's cmake left us in build_qt4,
+## so we build and install Qt4 support first:
+#make $NUMJOBS || make || exit 1
+#make install DESTDIR=$PKG || exit 1
+## Move the marble4 cmake file so that it will be found:
+#mkdir -p $PKG/usr/share/apps/cmake/modules
+#mv $PKG/usr/share/marble/cmake/FindMarble.cmake \
+#  $PKG/usr/share/apps/cmake/modules/FindMarble.cmake
+## Rename the marble4 include dir to avoid a conflict with marble:
+#mv $PKG/usr/include/marble{,4}
+## And fix that include path in the cmake file too:
+#sed -i $PKG/usr/share/apps/cmake/modules/FindMarble.cmake \
+#    -e 's,marble/MarbleModel.h,marble4/MarbleModel.h,'
+#
+## Go back to build_qt5 and build/install the Qt5 support:
+#cd ..
+## Fix installation of the designer plugins - only a problem for the Qt5 libs:
+#sed  -i CMakeLists.txt \
+#     -e 's,LIB_SUFFIX}/plugins,LIB_SUFFIX}/qt5/plugins,g'
+#cd build_qt5
+#
 
-# Go back to build_qt5 and build/install the Qt5 support:
-cd ..
-# Fix installation of the designer plugins - only a problem for the Qt5 libs:
-sed  -i CMakeLists.txt \
+# Fix installation of the designer plugins:
+sed  -i ../CMakeLists.txt \
      -e 's,LIB_SUFFIX}/plugins,LIB_SUFFIX}/qt5/plugins,g'
-cd build_qt5
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-- 
cgit v1.2.3