build-system: remove Grantlee from the packaging scripts

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

6 files changed, 1 insertions, 35 deletions

diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec
index 586878fbd..e01373c23 100644
--- a/packaging/OBS/subsurfacedaily.spec
+++ b/packaging/OBS/subsurfacedaily.spec
@@ -37,14 +37,6 @@ BuildRequires:	libxslt-devel
 BuildRequires:	libssh2-devel
 BuildRequires:	libcurl-devel
 BuildRequires:  libgit2-devel
-%if  0%{?fedora_version} >= 30
-# current Fedora has Grantlee under a different name
-# and F32 has a weird conflict with different boost-regex versions
-BuildRequires:	grantlee-qt5-devel
-BuildRequires:  boost-regex
-%else
-BuildRequires:	grantlee5-devel
-%endif
 %if  0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 BuildRequires:	netpbm-devel
 BuildRequires:	openssl-devel
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index c1cafe177..c29aa672e 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -36,7 +36,7 @@ LIBRARY_PATH=${DIR}/install-root/lib make install
 
 # now adjust a few references that macdeployqt appears to miss
 EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface
-for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do
+for i in libgit2 ; do
 	OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\  -f1 | tr -d "\t")
 	if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${OLD}) ]] ; then
 		# copy the library into the bundle and make sure its id and the reference to it are correct
@@ -78,26 +78,6 @@ for i in ${RPATH}; do
 	install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE}
 done
 
-# next deal with libGrantlee
-LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib)
-for i in QtScript.framework/Versions/5/QtScript QtCore.framework/Versions/5/QtCore ; do
-	install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${LIBG}
-done
-
-# clean up shared library dependency in the Grantlee plugins
-for i in Subsurface.app/Contents/PlugIns/grantlee/5.1/*.so; do
-	OLD=$(otool -L $i | grep libGrantlee_Templates | cut -d\  -f1 | tr -d "\t")
-	SONAME=$(basename $OLD )
-	install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} $i;
-	OLD=$(otool -L $i | grep QtCore | cut -d\  -f1 | tr -d "\t")
-	install_name_tool -change ${OLD} @executable_path/../Frameworks/QtCore.framework/QtCore $i;
-	mv $i Subsurface.app/Contents/PlugIns/grantlee
-done
-rmdir Subsurface.app/Contents/PlugIns/grantlee/5.1
-pushd Subsurface.app/Contents/PlugIns/grantlee
-ln -s . 5.1
-popd
-
 if [ "$1" = "-nodmg" ] ; then
 	exit 0
 fi
diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control
index 08b51bf3c..5fc13979e 100644
--- a/packaging/ubuntu/debian/control
+++ b/packaging/ubuntu/debian/control
@@ -38,7 +38,6 @@ Build-Depends: asciidoc,
 	       qml-module-qtquick2,
                libcurl4-openssl-dev,
                qtconnectivity5-dev,
-               libgrantlee5-dev,
                subsurface-qt-private-headers
 Standards-Version: 3.9.7
 Homepage: http://subsurface-divelog.org
diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index f78c3d0d8..f57af68b5 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -44,7 +44,6 @@
 # Something like this:
 #
 # ~/src/mxe                    <- MXE git with Qt5, automake (see above)
-#      /grantlee               <- Grantlee 5.0.0 sources from git
 #      /subsurface             <- current subsurface git
 #      /googlemaps             <- Google Maps plugin for QtLocation from git
 #      /hidapi                 <- HIDAPI library for libdivecomputer
diff --git a/packaging/windows/smtk-import.nsi.in b/packaging/windows/smtk-import.nsi.in
index 109b6647c..eaa835670 100644
--- a/packaging/windows/smtk-import.nsi.in
+++ b/packaging/windows/smtk-import.nsi.in
@@ -154,7 +154,6 @@ Section
 #    File /r Documentation
 #    File /r translations
 #    File /r printing_templates
-#    File /r grantlee
     File *.dll
     File subsurface.ico
     File qt.conf
@@ -206,7 +205,6 @@ Section "Uninstall"
     RMDir /r "$INSTDIR\plugins"
 #    RMDir /r "$INSTDIR\Documentation"
 #    RMDir /r "$INSTDIR\printing_templates"
-#    RMDir /r "$INSTDIR\grantlee"
     RMDir "$INSTDIR"
 
     # Remove shortcuts
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index d9fb92ba6..c13abdae8 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -154,7 +154,6 @@ Section
     File /r Documentation
     File /r translations
     File /r printing_templates
-    File /r grantlee
     File *.dll
     File subsurface.ico
     File qt.conf
@@ -207,7 +206,6 @@ Section "Uninstall"
     RMDir /r "$INSTDIR\qml"
     RMDir /r "$INSTDIR\Documentation"
     RMDir /r "$INSTDIR\printing_templates"
-    RMDir /r "$INSTDIR\grantlee"
     RMDir "$INSTDIR"
 
     # Remove shortcuts