Date: Saturday, August 29, 2015 @ 03:53:00 Author: bisson Revision: 138907
rebuild for libgit2-1:0.23.1 Added: subsurface/trunk/libgit2.patch Modified: subsurface/trunk/PKGBUILD ---------------+ PKGBUILD | 13 ++++++++++--- libgit2.patch | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-28 23:42:37 UTC (rev 138906) +++ PKGBUILD 2015-08-29 01:53:00 UTC (rev 138907) @@ -5,7 +5,7 @@ pkgname=subsurface _pkgname=Subsurface pkgver=4.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Divelog program' url='http://subsurface-divelog.org/' license=('GPL2') @@ -12,11 +12,18 @@ 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') +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 \ Added: libgit2.patch =================================================================== --- libgit2.patch (rev 0) +++ libgit2.patch 2015-08-29 01:53:00 UTC (rev 138907) @@ -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) +
