[arch-commits] Commit in subsurface/repos (12 files)

Gaetan Bisson bisson at archlinux.org
Thu Sep 3 05:39:07 UTC 2015


    Date: Thursday, September 3, 2015 @ 07:39:07
  Author: bisson
Revision: 139125

db-move: moved subsurface from [community-testing] to [community] (i686, x86_64)

Added:
  subsurface/repos/community-i686/PKGBUILD
    (from rev 139122, subsurface/repos/community-testing-i686/PKGBUILD)
  subsurface/repos/community-i686/install
    (from rev 139122, subsurface/repos/community-testing-i686/install)
  subsurface/repos/community-i686/libgit2.patch
    (from rev 139122, subsurface/repos/community-testing-i686/libgit2.patch)
  subsurface/repos/community-x86_64/PKGBUILD
    (from rev 139122, subsurface/repos/community-testing-x86_64/PKGBUILD)
  subsurface/repos/community-x86_64/install
    (from rev 139122, subsurface/repos/community-testing-x86_64/install)
  subsurface/repos/community-x86_64/libgit2.patch
    (from rev 139122, subsurface/repos/community-testing-x86_64/libgit2.patch)
Deleted:
  subsurface/repos/community-i686/PKGBUILD
  subsurface/repos/community-i686/install
  subsurface/repos/community-testing-i686/
  subsurface/repos/community-testing-x86_64/
  subsurface/repos/community-x86_64/PKGBUILD
  subsurface/repos/community-x86_64/install

--------------------------------+
 /PKGBUILD                      |   80 +++++++++++++++++++++++++++++++++++++++
 /install                       |   22 ++++++++++
 community-i686/PKGBUILD        |   33 ----------------
 community-i686/install         |   11 -----
 community-i686/libgit2.patch   |   19 +++++++++
 community-x86_64/PKGBUILD      |   33 ----------------
 community-x86_64/install       |   11 -----
 community-x86_64/libgit2.patch |   19 +++++++++
 8 files changed, 140 insertions(+), 88 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-09-03 05:39:05 UTC (rev 139124)
+++ community-i686/PKGBUILD	2015-09-03 05:39:07 UTC (rev 139125)
@@ -1,33 +0,0 @@
-# $Id$
-# Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=subsurface
-_pkgname=Subsurface
-pkgver=4.4.2
-pkgrel=1
-pkgdesc='Divelog program'
-url='http://subsurface-divelog.org/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
-         'subsurface-libdc' 'subsurface-marble')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
-sha1sums=('40dd3e3693170219d58dd9c1484274f724bedbea')
-
-install=install
-
-build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	qmake-qt5 \
-		-config release \
-		SPECIAL_MARBLE_PREFIX=1 \
-		INCLUDEPATH+='/usr/include/subsurface' \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make INSTALL_ROOT="${pkgdir}" install
-}

Copied: subsurface/repos/community-i686/PKGBUILD (from rev 139122, subsurface/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-09-03 05:39:07 UTC (rev 139125)
@@ -0,0 +1,40 @@
+# $Id$
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.2
+pkgrel=2
+pkgdesc='Divelog program'
+url='http://subsurface-divelog.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+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')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	patch -p1 -i ../libgit2.patch
+}
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	qmake-qt5 \
+		-config release \
+		SPECIAL_MARBLE_PREFIX=1 \
+		INCLUDEPATH+='/usr/include/subsurface' \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	make INSTALL_ROOT="${pkgdir}" install
+}

Deleted: community-i686/install
===================================================================
--- community-i686/install	2015-09-03 05:39:05 UTC (rev 139124)
+++ community-i686/install	2015-09-03 05:39:07 UTC (rev 139125)
@@ -1,11 +0,0 @@
-post_upgrade() {
-	type gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}

Copied: subsurface/repos/community-i686/install (from rev 139122, subsurface/repos/community-testing-i686/install)
===================================================================
--- community-i686/install	                        (rev 0)
+++ community-i686/install	2015-09-03 05:39:07 UTC (rev 139125)
@@ -0,0 +1,11 @@
+post_upgrade() {
+	type gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+	post_upgrade
+}
+
+post_remove() {
+	post_upgrade
+}

Copied: subsurface/repos/community-i686/libgit2.patch (from rev 139122, subsurface/repos/community-testing-i686/libgit2.patch)
===================================================================
--- community-i686/libgit2.patch	                        (rev 0)
+++ community-i686/libgit2.patch	2015-09-03 05:39:07 UTC (rev 139125)
@@ -0,0 +1,19 @@
+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)
+ 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-09-03 05:39:05 UTC (rev 139124)
+++ community-x86_64/PKGBUILD	2015-09-03 05:39:07 UTC (rev 139125)
@@ -1,33 +0,0 @@
-# $Id$
-# Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=subsurface
-_pkgname=Subsurface
-pkgver=4.4.2
-pkgrel=1
-pkgdesc='Divelog program'
-url='http://subsurface-divelog.org/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
-         'subsurface-libdc' 'subsurface-marble')
-source=("http://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
-sha1sums=('40dd3e3693170219d58dd9c1484274f724bedbea')
-
-install=install
-
-build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	qmake-qt5 \
-		-config release \
-		SPECIAL_MARBLE_PREFIX=1 \
-		INCLUDEPATH+='/usr/include/subsurface' \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	make INSTALL_ROOT="${pkgdir}" install
-}

Copied: subsurface/repos/community-x86_64/PKGBUILD (from rev 139122, subsurface/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-09-03 05:39:07 UTC (rev 139125)
@@ -0,0 +1,40 @@
+# $Id$
+# Contributor: Francois Boulogne <fboulogne at april dot org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=subsurface
+_pkgname=Subsurface
+pkgver=4.4.2
+pkgrel=2
+pkgdesc='Divelog program'
+url='http://subsurface-divelog.org/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+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')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	patch -p1 -i ../libgit2.patch
+}
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	qmake-qt5 \
+		-config release \
+		SPECIAL_MARBLE_PREFIX=1 \
+		INCLUDEPATH+='/usr/include/subsurface' \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	make INSTALL_ROOT="${pkgdir}" install
+}

Deleted: community-x86_64/install
===================================================================
--- community-x86_64/install	2015-09-03 05:39:05 UTC (rev 139124)
+++ community-x86_64/install	2015-09-03 05:39:07 UTC (rev 139125)
@@ -1,11 +0,0 @@
-post_upgrade() {
-	type gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}

Copied: subsurface/repos/community-x86_64/install (from rev 139122, subsurface/repos/community-testing-x86_64/install)
===================================================================
--- community-x86_64/install	                        (rev 0)
+++ community-x86_64/install	2015-09-03 05:39:07 UTC (rev 139125)
@@ -0,0 +1,11 @@
+post_upgrade() {
+	type gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_install() {
+	post_upgrade
+}
+
+post_remove() {
+	post_upgrade
+}

Copied: subsurface/repos/community-x86_64/libgit2.patch (from rev 139122, subsurface/repos/community-testing-x86_64/libgit2.patch)
===================================================================
--- community-x86_64/libgit2.patch	                        (rev 0)
+++ community-x86_64/libgit2.patch	2015-09-03 05:39:07 UTC (rev 139125)
@@ -0,0 +1,19 @@
+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)
+ 



More information about the arch-commits mailing list