Date: Monday, October 26, 2020 @ 20:05:49 Author: arodseth Revision: 734045
archrelease: copy trunk to community-x86_64 Added: geany-plugins/repos/community-x86_64/PKGBUILD (from rev 734044, geany-plugins/trunk/PKGBUILD) Deleted: geany-plugins/repos/community-x86_64/9497d829e1b207eb83575dc6f617feecfb89bc16.patch geany-plugins/repos/community-x86_64/PKGBUILD ------------------------------------------------+ 9497d829e1b207eb83575dc6f617feecfb89bc16.patch | 55 --------------- PKGBUILD | 83 ++++++++++------------- 2 files changed, 38 insertions(+), 100 deletions(-) Deleted: 9497d829e1b207eb83575dc6f617feecfb89bc16.patch =================================================================== --- 9497d829e1b207eb83575dc6f617feecfb89bc16.patch 2020-10-26 20:05:33 UTC (rev 734044) +++ 9497d829e1b207eb83575dc6f617feecfb89bc16.patch 2020-10-26 20:05:49 UTC (rev 734045) @@ -1,55 +0,0 @@ -From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 -From: Dominik Schmidt <domi...@schm1dt.ch> -Date: Sun, 23 Feb 2020 19:15:30 +0100 -Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible - with libgit2-0.99 - -LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", -from libgit2-0.99 and beyond. Arithmetic checks against this -variable whill hence fail. This patch switches the checks to -compare against the LIBGIT2_VER_* family, which should be more stable. ---- - git-changebar/src/gcb-plugin.c | 6 +++--- - workbench/src/plugin_main.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index b7083199..a911815f 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -32,11 +32,11 @@ - #include <geany.h> - #include <document.h> - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) - /* 0.23 added @p binary_cb */ - # define git_diff_buffers(old_buffer, old_len, old_as_path, \ - new_buffer, new_len, new_as_path, options, \ -@@ -45,7 +45,7 @@ - new_buffer, new_len, new_as_path, options, \ - file_cb, hunk_cb, line_cb, payload) - #endif --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) - # define git_buf_dispose git_buf_free - # define git_error_last giterr_last - #endif -diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c -index 6fa6fc84..25ecdf6d 100644 ---- a/workbench/src/plugin_main.c -+++ b/workbench/src/plugin_main.c -@@ -36,7 +36,7 @@ - #include "tm_control.h" - - --#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 -+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-10-26 20:05:33 UTC (rev 734044) +++ PKGBUILD 2020-10-26 20:05:49 UTC (rev 734045) @@ -1,45 +0,0 @@ -# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> -# Contributor: Angel 'angvp' Velasquez <an...@archlinux.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz...@gmail.com> -# Contributor: Patrick Melo <patr...@patrickmelo.eti.br> - -pkgname=geany-plugins -pkgver=1.36 -pkgrel=5 -pkgdesc='Plugins for Geany' -arch=(x86_64) -url='https://plugins.geany.org/' -license=(GPL) -depends=("geany>=$pkgver" ctpl gpgme gtkspell3 lua51 python vte3 webkit2gtk libgit2) -makedepends=(cppcheck intltool) -source=("$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig} - 9497d829e1b207eb83575dc6f617feecfb89bc16.patch) -sha256sums=('ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6' - 'SKIP' - 'ecf3c6725c3d9f482274ecdbce66459d168162690beec2c8ff5b6ae9e0e8b318') -validpgpkeys=(6D0E68FCE198824C27C90EB0B507ACD04BA283C9) # Frank Lanitz <fr...@geany.org> - -prepare() { - cd $pkgname-$pkgver - - # https://github.com/geany/geany-plugins/commit/9497d829e1b207eb83575dc6f617feecfb89bc16 - patch -Np1 -i ../9497d829e1b207eb83575dc6f617feecfb89bc16.patch - - autoreconf -fi -} - -build() { - cd "$pkgname-$pkgver" - - export PYTHON=/usr/bin/python - ./configure --prefix=/usr --libexecdir=/usr/lib -enable-all - 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 -# vim: ts=2 sw=2 et: Copied: geany-plugins/repos/community-x86_64/PKGBUILD (from rev 734044, geany-plugins/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-10-26 20:05:49 UTC (rev 734045) @@ -0,0 +1,38 @@ +# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> +# Contributor: Angel 'angvp' Velasquez <an...@archlinux.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz...@gmail.com> +# Contributor: Patrick Melo <patr...@patrickmelo.eti.br> + +pkgname=geany-plugins +pkgver=1.37 +pkgrel=1 +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}) +sha256sums=('c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8' + 'SKIP') +validpgpkeys=('6BEC027CD44552A5B566F28DB7A4039D0630EA07') # Frank Lanitz <fr...@geany.org> + +prepare() { + cd "$pkgname-$pkgver" + autoreconf -fi +} + +build() { + cd "$pkgname-$pkgver" + export PYTHON=/usr/bin/python + ./configure --prefix=/usr --libexecdir=/usr/lib -enable-all + 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