[arch-commits] Commit in subsurface/trunk (PKGBUILD)

[Gaetan Bisson]

    Date: Saturday, February 21, 2015 @ 09:18:42
  Author: bisson
Revision: 128061

rebuild against subsurface-{libdc,marble}

Modified:
  subsurface/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++-------------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-21 06:32:47 UTC (rev 128060)
+++ PKGBUILD	2015-02-21 08:18:42 UTC (rev 128061)
@@ -5,61 +5,29 @@
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
-makedepends=('git' 'cmake' 'asciidoc')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusbx' 'libgit2'
-         'libdivecomputer' 'qt5-'{script,svg,tools,webkit})
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz"
-        'git://git.subsurface-divelog.org/marble#commit=aa18d0af6951debf3a3a90916f3f772784dbf326')
-sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d'
-          'SKIP')
+         'subsurface-libdc' 'subsurface-marble')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
+sha1sums=('7c33c734c59ced134f10c242c5f51b6d48cb3a0d')
 
 install=install
 
 build() {
-	# subsurface is Qt5-only so we need to build marble against it;
-	# while we're at it we use Subsurface's custom marble branch.
-
-	cd "${srcdir}/marble"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DQT5BUILD=ON \
-		-DQTONLY=ON \
-	        -DBUILD_MARBLE_APPS=OFF \
-		-DBUILD_MARBLE_EXAMPLES=OFF \
-	        -DBUILD_MARBLE_TESTS=OFF \
-		-DBUILD_MARBLE_TOOLS=OFF \
-	        -DBUILD_TESTING=OFF \
-		-DWITH_DESIGNER_PLUGIN=OFF \
-	        -DBUILD_WITH_DBUS=OFF \
-		.
-	make
-	install -d pkg
-	make DESTDIR="`pwd`/pkg" install
-
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	qmake-qt5 \
 		-config release \
 		SPECIAL_MARBLE_PREFIX=1 \
-		LIBMARBLEDEVEL=../marble/pkg \
-		LIBS+="-L`pwd`/../marble/pkg/usr/lib" \
-		INCLUDEPATH+="`pwd`/../marble/pkg/usr/include" \
+		INCLUDEPATH+='/usr/include/subsurface' \
 
 	make
 }
 
 package() {
-	cd "${srcdir}/marble"
-	make DESTDIR="${pkgdir}" install
-
-	# remove conflicts with kdeedu-marble
-	rm -fr "${pkgdir}"/usr/{include,share/{appdata,icons}}
-
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	make INSTALL_ROOT="${pkgdir}" install
 }