[trunk] -> [staging] 'geany-plugins-1.38-4' add

master
Dudemanguy 4 months ago
parent f4709bf3fc
commit 014cd63899
Signed by: Dudemanguy
GPG Key ID: 4003D2EF625D6492
  1. 29
      trunk/PKGBUILD
  2. 29
      trunk/keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc
  3. 0
      trunk/libgit2.patch
  4. 41
      x86_64/staging/PKGBUILD
  5. 29
      x86_64/staging/keys/pgp/986FA7E80256D3D16F30FB7A01380DF54FD09D02.asc
  6. 22
      x86_64/staging/libgit2.patch

@ -1,43 +1,34 @@
# Maintainer: Alexander F. Rødseth <xyproto@archlinux.org>
# Maintainer: Dudemanguy <random342@airmail.cc>
# Contributor: Angel 'angvp' Velasquez <angvp@archlinux.org>
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
# Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
pkgname=geany-plugins
pkgver=1.38
pkgrel=3
pkgrel=4
pkgdesc='Plugins for Geany'
arch=(x86_64)
url='https://plugins.geany.org/'
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 <frank@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
# https://github.com/geany/geany-plugins/issues/1164
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

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEYWF/YxYJKwYBBAHaRw8BAQdAv0DRVwxpoIWCgm1g3KRR6jV1+VttISKPDtFp
/yMGj1C0I0ZyYW5rIExhbml0eiA8ZnJhbmtAZnJhbmsudXZlbmEuZGU+iJYEExYI
AD4WIQSYb6foAlbT0W8w+3oBOA31T9CdAgUCYWGAbwIbAwUJBaOagAULCQgHAgYV
CgkICwIEFgIDAQIeAQIXgAAKCRABOA31T9CdAtxzAP9kciUHN7ZlX1V8Epio49Cb
rIvWAljv0aIz0BVeYMKJdQEA+TNOvaOvd0u3QquXpm677h86Zgw6eiXl6PRb2jQJ
7wy0HkZyYW5rIExhbml0eiA8ZnJhbmtAZ2Vhbnkub3JnPoiWBBMWCAA+FiEEmG+n
6AJW09FvMPt6ATgN9U/QnQIFAmFhgJECGwMFCQWjmoAFCwkIBwIGFQoJCAsCBBYC
AwECHgECF4AACgkQATgN9U/QnQKO1wD9EGehPOS0lBfAAS6ZM4jcl0YfIKSGvCR0
23UKUzlpQDYBAKhVQfs6+g4kecM4t7kKhE2e+Q/OX+50vJLO22NZOL4OtCBGcmFu
ayBMYW5pdHogPGZyYW5rQGxhbml0ei5pbmZvPoiZBBMWCABBAhsDBQkFo5qABQsJ
CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEmG+n6AJW09FvMPt6ATgN9U/QnQIFAmFh
gbACGQEACgkQATgN9U/QnQJCLgD+MXjLflymX5ZxDAI6N9V5XZgRJFXQ9oEyaifH
N1rlixAA/AqWKMO7oS10BpcMd/bmH3AqVDKamXZ0EqdviJbSfDQCtB5GcmFuayBM
YW5pdHogPGZyYW5rQG14c3J2Lm9yZz6IlgQTFggAPhYhBJhvp+gCVtPRbzD7egE4
DfVP0J0CBQJhYYCCAhsDBQkFo5qABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJ
EAE4DfVP0J0Ct4AA/Rmp40YnD871T4HBu6hrbuyYprj/rOq1XOP13D9mjmrrAQD/
SZ9AABGp6tGKN2eyQdpPoUTJuuUop80QPpW70q2xDrQdRnJhbmsgTGFuaXR6IDxm
cmxhbkBmc2ZlLm9yZz6IlgQTFggAPhYhBJhvp+gCVtPRbzD7egE4DfVP0J0CBQJh
YYDsAhsDBQkFo5qABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEAE4DfVP0J0C
bJoBAIgD29N5NhGRfScFfHA9dS/mA7HZ/Ao6ngSQSn7AHdrlAP9qsGfDw4QzZldN
BpO/kzkal5Q3OimR2y9E0tD1S1WbCbg4BGFhf2MSCisGAQQBl1UBBQEBB0BsZvJi
EGya4B6YMpGkZPOdyh9FK6dwSHpdzaB9xZwCSQMBCAeIfgQYFggAJhYhBJhvp+gC
VtPRbzD7egE4DfVP0J0CBQJhYX9jAhsMBQkFo5qAAAoJEAE4DfVP0J0CDBkBAPnJ
ZmupMvggjqC7sEDwWw2fEl3wXklkbfG9MhcQ/EubAP4ymdy3oLehQjB715FIk8Nj
OSmvHuwJm0rtP9C/GATiDA==
=D24c
-----END PGP PUBLIC KEY BLOCK-----

@ -0,0 +1,41 @@
# Maintainer: Dudemanguy <random342@airmail.cc>
# Contributor: Angel 'angvp' Velasquez <angvp@archlinux.org>
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
# Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
pkgname=geany-plugins
pkgver=1.38
pkgrel=4
pkgdesc='Plugins for Geany'
arch=(x86_64)
url='https://plugins.geany.org/'
license=(GPL)
depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3 webkit2gtk)
makedepends=(cppcheck intltool)
source=(libgit2.patch
"$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig})
b2sums=('8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387'
'a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47'
'SKIP')
validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz <frank@geany.org>
prepare() {
cd $pkgname-$pkgver
# https://github.com/geany/geany-plugins/issues/1164
patch -p1 -i ../libgit2.patch
autoreconf -fi
}
build() {
cd $pkgname-$pkgver
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
}
package() {
make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
}
# getver: plugins.geany.org/downloads.html

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEYWF/YxYJKwYBBAHaRw8BAQdAv0DRVwxpoIWCgm1g3KRR6jV1+VttISKPDtFp
/yMGj1C0I0ZyYW5rIExhbml0eiA8ZnJhbmtAZnJhbmsudXZlbmEuZGU+iJYEExYI
AD4WIQSYb6foAlbT0W8w+3oBOA31T9CdAgUCYWGAbwIbAwUJBaOagAULCQgHAgYV
CgkICwIEFgIDAQIeAQIXgAAKCRABOA31T9CdAtxzAP9kciUHN7ZlX1V8Epio49Cb
rIvWAljv0aIz0BVeYMKJdQEA+TNOvaOvd0u3QquXpm677h86Zgw6eiXl6PRb2jQJ
7wy0HkZyYW5rIExhbml0eiA8ZnJhbmtAZ2Vhbnkub3JnPoiWBBMWCAA+FiEEmG+n
6AJW09FvMPt6ATgN9U/QnQIFAmFhgJECGwMFCQWjmoAFCwkIBwIGFQoJCAsCBBYC
AwECHgECF4AACgkQATgN9U/QnQKO1wD9EGehPOS0lBfAAS6ZM4jcl0YfIKSGvCR0
23UKUzlpQDYBAKhVQfs6+g4kecM4t7kKhE2e+Q/OX+50vJLO22NZOL4OtCBGcmFu
ayBMYW5pdHogPGZyYW5rQGxhbml0ei5pbmZvPoiZBBMWCABBAhsDBQkFo5qABQsJ
CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEmG+n6AJW09FvMPt6ATgN9U/QnQIFAmFh
gbACGQEACgkQATgN9U/QnQJCLgD+MXjLflymX5ZxDAI6N9V5XZgRJFXQ9oEyaifH
N1rlixAA/AqWKMO7oS10BpcMd/bmH3AqVDKamXZ0EqdviJbSfDQCtB5GcmFuayBM
YW5pdHogPGZyYW5rQG14c3J2Lm9yZz6IlgQTFggAPhYhBJhvp+gCVtPRbzD7egE4
DfVP0J0CBQJhYYCCAhsDBQkFo5qABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJ
EAE4DfVP0J0Ct4AA/Rmp40YnD871T4HBu6hrbuyYprj/rOq1XOP13D9mjmrrAQD/
SZ9AABGp6tGKN2eyQdpPoUTJuuUop80QPpW70q2xDrQdRnJhbmsgTGFuaXR6IDxm
cmxhbkBmc2ZlLm9yZz6IlgQTFggAPhYhBJhvp+gCVtPRbzD7egE4DfVP0J0CBQJh
YYDsAhsDBQkFo5qABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEAE4DfVP0J0C
bJoBAIgD29N5NhGRfScFfHA9dS/mA7HZ/Ao6ngSQSn7AHdrlAP9qsGfDw4QzZldN
BpO/kzkal5Q3OimR2y9E0tD1S1WbCbg4BGFhf2MSCisGAQQBl1UBBQEBB0BsZvJi
EGya4B6YMpGkZPOdyh9FK6dwSHpdzaB9xZwCSQMBCAeIfgQYFggAJhYhBJhvp+gC
VtPRbzD7egE4DfVP0J0CBQJhYX9jAhsMBQkFo5qAAAoJEAE4DfVP0J0CDBkBAPnJ
ZmupMvggjqC7sEDwWw2fEl3wXklkbfG9MhcQ/EubAP4ymdy3oLehQjB715FIk8Nj
OSmvHuwJm0rtP9C/GATiDA==
=D24c
-----END PGP PUBLIC KEY BLOCK-----

@ -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;
}
}
Loading…
Cancel
Save