Date: Wednesday, February 26, 2020 @ 11:09:42 Author: heftig Revision: 376257
3.34.1+11+gbf485934b-1 Added: gnome-builder/trunk/libgit2.diff Modified: gnome-builder/trunk/PKGBUILD --------------+ PKGBUILD | 18 ++++++++++++------ libgit2.diff | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-26 11:00:03 UTC (rev 376256) +++ PKGBUILD 2020-02-26 11:09:42 UTC (rev 376257) @@ -1,8 +1,8 @@ # Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> pkgname=gnome-builder -pkgver=3.34.1 -pkgrel=3 +pkgver=3.34.1+11+gbf485934b +pkgrel=1 pkgdesc="An IDE for writing GNOME-based software" url="https://wiki.gnome.org/Apps/Builder" arch=(x86_64) @@ -15,9 +15,11 @@ checkdepends=(xorg-server-xvfb) optdepends=('gnome-code-assistance: Legacy assistance services') groups=(gnome-extra) -_commit=f28549a6e8dc326b7f29eaa5b0fc29e4050f4b75 # tags/3.34.1^0 -source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit") -sha256sums=('SKIP') +_commit=bf485934b3762c6915419458623b850b4a63c2a8 # gnome-builder-3-34 +source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit" + libgit2.diff) +sha256sums=('SKIP' + '968d30b68c67e7b89d39e5db870b62adbf73cfd98a8e2f44b4cd515035f73f50') pkgver() { cd $pkgname @@ -27,8 +29,12 @@ prepare() { cd $pkgname - git cherry-pick -n c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f # Fix build with meson 0.52 + # Fix build with meson 0.52 + git cherry-pick -n c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f git cherry-pick -n da26dfbf78468f5ed724e022b300a07862a95833 + + # Fix build with libgit2 0.99 + git apply -3 ../libgit2.diff } build() { Added: libgit2.diff =================================================================== --- libgit2.diff (rev 0) +++ libgit2.diff 2020-02-26 11:09:42 UTC (rev 376257) @@ -0,0 +1,16 @@ + src/plugins/git/daemon/ipc-git-repository-impl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git c/src/plugins/git/daemon/ipc-git-repository-impl.c i/src/plugins/git/daemon/ipc-git-repository-impl.c +index 7f010427a..c5028658d 100644 +--- c/src/plugins/git/daemon/ipc-git-repository-impl.c ++++ i/src/plugins/git/daemon/ipc-git-repository-impl.c +@@ -33,7 +33,7 @@ + #include "ipc-git-types.h" + #include "ipc-git-util.h" + +-#if LIBGIT2_SOVERSION >= 28 ++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28) + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose) + #else + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free)