Date: Tuesday, August 16, 2022 @ 17:31:39 Author: arodseth Revision: 1266652
upgpkg: geany-plugins 1.38-4 Added: geany-plugins/trunk/keys/ geany-plugins/trunk/keys/pgp/ geany-plugins/trunk/keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc geany-plugins/trunk/libgit2.patch (from rev 1266651, geany-plugins/trunk/geany-plugins-1.38-libgit2_1.4.patch) Modified: geany-plugins/trunk/PKGBUILD Deleted: geany-plugins/trunk/geany-plugins-1.38-libgit2_1.4.patch -------------------------------------------------------+ PKGBUILD | 27 +++++----------- geany-plugins-1.38-libgit2_1.4.patch | 22 ------------- keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc | 1 libgit2.patch | 22 +++++++++++++ 4 files changed, 32 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-16 17:19:28 UTC (rev 1266651) +++ PKGBUILD 2022-08-16 17:31:39 UTC (rev 1266652) @@ -5,7 +5,7 @@ pkgname=geany-plugins pkgver=1.38 -pkgrel=3 +pkgrel=4 pkgdesc='Plugins for Geany' arch=(x86_64) url='https://plugins.geany.org/' @@ -12,32 +12,23 @@ license=(GPL) depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3 webkit2gtk) makedepends=(cppcheck intltool) -source=( - "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig} - $pkgname-1.38-libgit2_1.4.patch -) -b2sums=('a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47' - 'SKIP' - '8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387') +source=(libgit2.patch + "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig}) +b2sums=('8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387' + 'a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47' + 'SKIP') validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz <fr...@geany.org> prepare() { - # fix for changes to git_buf with libgit2 >= 1.4 + cd $pkgname-$pkgver # https://github.com/geany/geany-plugins/issues/1164 - patch -d $pkgname-$pkgver -p1 -i ../$pkgname-1.38-libgit2_1.4.patch - - cd $pkgname-$pkgver + patch -p1 -i ../libgit2.patch autoreconf -fi - - # don't redefine bool - sed -i 's/typedef unsigned int bool/#include <stdbool.h>/g' \ - pretty-printer/src/PrettyPrinter.h } build() { cd $pkgname-$pkgver - export CFLAGS+=' -w' - export PYTHON=/usr/bin/python + export CFLAGS+=' -w' PYTHON=/usr/bin/python ./configure --prefix=/usr --libexecdir=/usr/lib sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make Deleted: geany-plugins-1.38-libgit2_1.4.patch =================================================================== --- geany-plugins-1.38-libgit2_1.4.patch 2022-08-16 17:19:28 UTC (rev 1266651) +++ geany-plugins-1.38-libgit2_1.4.patch 2022-08-16 17:31:39 UTC (rev 1266652) @@ -1,22 +0,0 @@ -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; - } - } - Added: keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc =================================================================== (Binary files differ) Index: geany-plugins/trunk/keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc =================================================================== --- keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc 2022-08-16 17:19:28 UTC (rev 1266651) +++ keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc 2022-08-16 17:31:39 UTC (rev 1266652) Property changes on: geany-plugins/trunk/keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Copied: geany-plugins/trunk/libgit2.patch (from rev 1266651, geany-plugins/trunk/geany-plugins-1.38-libgit2_1.4.patch) =================================================================== --- libgit2.patch (rev 0) +++ libgit2.patch 2022-08-16 17:31:39 UTC (rev 1266652) @@ -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; + } + } +