From a1cd2306255a3a3bdcd47ffd11af884df7ed331c Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 2 Dec 2014 15:04:21 -0800
Subject: [PATCH] Ubuntu packaging: include static libmarblewidget

Still all Qt4 based. Baby steps.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/ubuntu/control |  1 -
 packaging/ubuntu/rules   | 12 +++++++++---
 subsurface-configure.pri | 12 ++++++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packaging/ubuntu/control b/packaging/ubuntu/control
index 98c362eba..771b335f3 100644
--- a/packaging/ubuntu/control
+++ b/packaging/ubuntu/control
@@ -15,7 +15,6 @@ Build-Depends: asciidoc,
                txt2html,
                libzip-dev,
                libsqlite3-dev,
-               libmarble-dev,
                autoconf,
                automake,
                cmake,
diff --git a/packaging/ubuntu/rules b/packaging/ubuntu/rules
index 5b9fdc516..76ac5b98a 100755
--- a/packaging/ubuntu/rules
+++ b/packaging/ubuntu/rules
@@ -12,14 +12,20 @@ override_dh_auto_clean:
 	(cd libdivecomputer ; make clean || true)
 	make clean || true
 	rm -rf libgit2/build
+	rm -rf marble-build
 	rm -f ssrf-version.h
 	rm -f subsurface
 	rm -f Makefile
 
 override_dh_auto_configure:
-	(cd libdivecomputer ; autoreconf --install ; ./configure ; make)
-	(mkdir libgit2/build ; cd libgit2/build ; cmake -DBUILD_SHARED_LIBS=OFF .. ; sed -i 's/.so$/.a/' CMakeCache.txt ; make )
-	qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 subsurface.pro
+	(cd libdivecomputer ; autoreconf --install ; ./configure ; make -j8 )
+	(mkdir libgit2/build ; cd libgit2/build ; cmake -DBUILD_SHARED_LIBS=OFF .. ; sed -i 's/.so$/.a/' CMakeCache.txt ; make -j8 )
+	(mkdir marble-build ; cd marble-build ; \
+		cmake -DQTONLY=ON -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF -DBUILD_WITH_DBUS=OFF ../marble-source ; \
+		make -j8 ; \
+		mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; echo ln -s $$i . ; done ; \
+		ln -s . marble )
+	qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build LIBMARBLESTATIC=1 subsurface.pro
 
 override_dh_installchangelogs:
 	dh_installchangelogs
diff --git a/subsurface-configure.pri b/subsurface-configure.pri
index 4c55c8b67..5f8be2ba4 100644
--- a/subsurface-configure.pri
+++ b/subsurface-configure.pri
@@ -156,11 +156,19 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
 !isEmpty(LIBMARBLEDEVEL) {
 	# find it next to our sources
 	INCLUDEPATH += $$LIBMARBLEDEVEL/include
-	LIBS += -L$$LIBMARBLEDEVEL/lib
+	isEmpty(LIBMARBLESTATIC) {
+		LIBS += -L$$LIBMARBLEDEVEL/lib
+	}
 }
 !contains(DEFINES, NO_MARBLE) {
 	win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
-	else: LIBS += -lmarblewidget
+	else: {
+		isEmpty(LIBMARBLESTATIC) {
+			LIBS += -lmarblewidget
+		} else {
+			LIBS += $$LIBMARBLEDEVEL/src/lib/marble/libmarblewidget.a
+		}
+	}
 }
 
 libgit21-api {