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

[Gaetan Bisson]

    Date: Wednesday, October 14, 2015 @ 22:04:43
  Author: bisson
Revision: 144006

upstream update

Modified:
  subsurface/trunk/PKGBUILD
Deleted:
  subsurface/trunk/libgit2.patch

---------------+
 PKGBUILD      |   29 +++++++++++++++--------------
 libgit2.patch |   19 -------------------
 2 files changed, 15 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-14 19:41:55 UTC (rev 144005)
+++ PKGBUILD	2015-10-14 20:04:43 UTC (rev 144006)
@@ -4,37 +4,38 @@
 
 pkgname=subsurface
 _pkgname=Subsurface
-pkgver=4.4.2
-pkgrel=2
+pkgver=4.5.0
+pkgrel=1
 pkgdesc='Divelog program'
 url='http://subsurface-divelog.org/'
 license=('GPL2')
 arch=('i686' 'x86_64')
+makedepends=('cmake' 'asciidoc')
 depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
-         'subsurface-libdc' 'subsurface-marble')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz"
-        'libgit2.patch')
-sha1sums=('40dd3e3693170219d58dd9c1484274f724bedbea'
-          'd36e5d3182254a0a5d1940308a7878febdcfdef8')
+         'subsurface-libdc' 'subsurface-marble'
+         'qt5-connectivity' 'grantlee-qt5')
+source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
+sha1sums=('1e5e72076d329b8283d4871609af080b787c71f1')
 
 install=install
 
 prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
-	patch -p1 -i ../libgit2.patch
+	sed 's:<marble:<subsurface/marble:g' -i qt-ui/globe.*
 }
 
 build() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
-	qmake-qt5 \
-		-config release \
-		SPECIAL_MARBLE_PREFIX=1 \
-		INCLUDEPATH+='/usr/include/subsurface' \
-
+	cmake \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DMARBLE_LIBRARIES=/usr/lib/libssrfmarblewidget.so \
+		-DUSE_LIBGIT23_API=1 \
+		.
 	make
 }
 
 package() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make INSTALL_ROOT="${pkgdir}" install
+	make DESTDIR="${pkgdir}" install
 }

Deleted: libgit2.patch
===================================================================
--- libgit2.patch	2015-10-14 19:41:55 UTC (rev 144005)
+++ libgit2.patch	2015-10-14 20:04:43 UTC (rev 144006)
@@ -1,19 +0,0 @@
-diff -Naur old/save-git.c new/save-git.c
---- old/save-git.c	2015-05-04 07:59:10.000000000 -1000
-+++ new/save-git.c	2015-08-28 15:33:01.298869918 -1000
-@@ -34,6 +34,15 @@
- #else
-   #define git_treebuilder_write(id, repo, bld)   git_treebuilder_write(id, bld)
- #endif
-+/*
-+ * api break introduced in libgit2 master after 0.22 - let's guess this is the v0.23 API
-+ */
-+#if USE_LIBGIT23_API || (!LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR >= 23)
-+  #define git_branch_create(out, repo, branch_name, target, force, signature, log_message) \
-+       git_branch_create(out, repo, branch_name, target, force)
-+  #define git_reference_set_target(out, ref, id, author, log_message) \
-+       git_reference_set_target(out, ref, id, log_message)
-+#endif
- 
- #define VA_BUF(b, fmt) do { va_list args; va_start(args, fmt); put_vformat(b, fmt, args); va_end(args); } while (0)
-