[arch-commits] Commit in gnome-builder/trunk (PKGBUILD libgit2.diff)

[Jan Steffens]

    Date: Tuesday, March 3, 2020 @ 19:26:44
  Author: heftig
Revision: 376526

3.34.1+11+gbf485934b-2: vala 0.48

Modified:
  gnome-builder/trunk/PKGBUILD
Deleted:
  gnome-builder/trunk/libgit2.diff

--------------+
 PKGBUILD     |   17 +++++++++--------
 libgit2.diff |   16 ----------------
 2 files changed, 9 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 19:26:41 UTC (rev 376525)
+++ PKGBUILD	2020-03-03 19:26:44 UTC (rev 376526)
@@ -2,7 +2,7 @@
 
 pkgname=gnome-builder
 pkgver=3.34.1+11+gbf485934b
-pkgrel=1
+pkgrel=2
 pkgdesc="An IDE for writing GNOME-based software"
 url="https://wiki.gnome.org/Apps/Builder"
 arch=(x86_64)
@@ -16,10 +16,8 @@
 optdepends=('gnome-code-assistance: Legacy assistance services')
 groups=(gnome-extra)
 _commit=bf485934b3762c6915419458623b850b4a63c2a8  # gnome-builder-3-34
-source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit"
-        libgit2.diff)
-sha256sums=('SKIP'
-            '968d30b68c67e7b89d39e5db870b62adbf73cfd98a8e2f44b4cd515035f73f50')
+source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -29,12 +27,15 @@
 prepare() {
   cd $pkgname
 
-  # Fix build with meson 0.52
+  # meson 0.52
   git cherry-pick -n c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f
   git cherry-pick -n da26dfbf78468f5ed724e022b300a07862a95833
 
-  # Fix build with libgit2 0.99
-  git apply -3 ../libgit2.diff
+  # libgit2 0.99
+  git cherry-pick -n 582bf0281358437cc35d96d363f0af81a1b21068
+
+  # vala 0.48
+  git cherry-pick -n fc4607dec2f3dca5dbfee7a56662856dc5a60254
 }
 
 build() {

Deleted: libgit2.diff
===================================================================
--- libgit2.diff	2020-03-03 19:26:41 UTC (rev 376525)
+++ libgit2.diff	2020-03-03 19:26:44 UTC (rev 376526)
@@ -1,16 +0,0 @@
- 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)