[arch-commits] Commit in geany-plugins/trunk (2 files)

[David Runge]

    Date: Friday, February 18, 2022 @ 22:20:11
  Author: dvzrv
Revision: 1134320

upgpkg: geany-plugins 1.38-3: Rebuild against libgit2 1.4.1

Added:
  geany-plugins/trunk/geany-plugins-1.38-libgit2_1.4.patch
Modified:
  geany-plugins/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   14 +++++++++++---
 geany-plugins-1.38-libgit2_1.4.patch |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-18 22:13:20 UTC (rev 1134319)
+++ PKGBUILD	2022-02-18 22:20:11 UTC (rev 1134320)
@@ -5,7 +5,7 @@
 
 pkgname=geany-plugins
 pkgver=1.38
-pkgrel=2
+pkgrel=3
 pkgdesc='Plugins for Geany'
 arch=(x86_64)
 url='https://plugins.geany.org/'
@@ -12,12 +12,20 @@
 license=(GPL)
 depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3 webkit2gtk)
 makedepends=(cppcheck intltool)
-source=("$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig})
+source=(
+  "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig}
+  $pkgname-1.38-libgit2_1.4.patch
+)
 b2sums=('a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47'
-        'SKIP')
+        'SKIP'
+        '8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387')
 validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz <frank at geany.org>
 
 prepare() {
+  # fix for changes to git_buf with libgit2 >= 1.4
+  # https://github.com/geany/geany-plugins/issues/1164
+  patch -d $pkgname-$pkgver -p1 -i ../$pkgname-1.38-libgit2_1.4.patch
+
   cd $pkgname-$pkgver
   autoreconf -fi
 

Added: geany-plugins-1.38-libgit2_1.4.patch
===================================================================
--- geany-plugins-1.38-libgit2_1.4.patch	                        (rev 0)
+++ geany-plugins-1.38-libgit2_1.4.patch	2022-02-18 22:20:11 UTC (rev 1134320)
@@ -0,0 +1,22 @@
+diff --git i/git-changebar/src/gcb-plugin.c w/git-changebar/src/gcb-plugin.c
+index f8ce20cd..4488b22f 100644
+--- i/git-changebar/src/gcb-plugin.c
++++ w/git-changebar/src/gcb-plugin.c
+@@ -216,7 +216,7 @@ static int
+ gcb_git_buf_grow (git_buf  *buf,
+                   size_t    target_size)
+ {
+-  if (buf->asize == 0) {
++  if (buf->reserved == 0) {
+     if (target_size == 0) {
+       target_size = buf->size;
+     }
+@@ -234,7 +234,7 @@ buf_zero (git_buf *buf)
+   if (buf) {
+     buf->ptr = NULL;
+     buf->size = 0;
+-    buf->asize = 0;
++    buf->reserved = 0;
+   }
+ }
+