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

[Gaetan Bisson]

    Date: Monday, April 11, 2016 @ 21:57:57
  Author: bisson
Revision: 170539

upstream update

Modified:
  subsurface/trunk/PKGBUILD

----------+
 PKGBUILD |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-11 18:54:21 UTC (rev 170538)
+++ PKGBUILD	2016-04-11 19:57:57 UTC (rev 170539)
@@ -4,7 +4,7 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.5.4
+pkgver=4.5.5
 pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
@@ -15,7 +15,7 @@
          'subsurface-libdc' 'subsurface-marble'
          'qt5-connectivity' 'grantlee-qt5')
 source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
-sha1sums=('e4ff548171b0a317a1f3f762bde2f62fd2152088')
+sha1sums=('f108d9d6048a34a4f61e37fab855081ce7c1ec67')
 
 install=install
 
@@ -22,6 +22,7 @@
 prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	sed 's:<marble:<subsurface/marble:g' -i qt-ui/globe.*
+	sed 's:GIT_MERGE_TREE_FIND_RENAMES:GIT_MERGE_FIND_RENAMES:g' -i git-access.c
 }
 
 build() {
@@ -30,7 +31,6 @@
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DMARBLE_LIBRARIES=/usr/lib/libssrfmarblewidget.so \
-		-DUSE_LIBGIT23_API=1 \
 		.
 	make
 }