upstream update

2 files changed, 8 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3d7cba800cc..7279a1e2159b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = subsurface-git
 	pkgdesc = Divelog program
-	pkgver = 20150919.a319c42
+	pkgver = 20150924.9d1c394
 	pkgrel = 1
 	url = http://subsurface-divelog.org/
 	install = install
diff --git a/PKGBUILD b/PKGBUILD
index c77b281f0a0e..c6221cc2deab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=subsurface-git
 _pkgname=subsurface
-pkgver=20150919.a319c42
+pkgver=20150924.9d1c394
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -26,12 +26,17 @@ pkgver() {
 	git log -1 --format='%cd.%h' --date=short | tr -d -
 }
 
+prepare() {
+	cd "${srcdir}/${_pkgname}"
+	sed 's:<marble:<subsurface/marble:g' -i qt-ui/globe.*
+}
+
 build() {
 	cd "${srcdir}/${_pkgname}"
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMARBLE_INCLUDE_DIR='/usr/include/subsurface' \
+		-DMARBLE_LIBRARIES=/usr/lib/libssrfmarblewidget.so \
 		-DUSE_LIBGIT23_API=1 \
 		.
 	make