From d47f607cf048cf2983ac7b6a138639ea7ddc6698 Mon Sep 17 00:00:00 2001 From: uglyside Date: Sun, 6 Jul 2025 18:58:40 +0300 Subject: [PATCH] geany-plugins v2.1 --- editor/geany-plugins/actions.py | 13 +- ...d829e1b207eb83575dc6f617feecfb89bc16.patch | 55 ---- .../files/Add_support_for_libgit2_1_4.patch | 121 -------- .../Simplify_libgit2_version_checks.patch | 46 --- .../files/overview_plugin_test.patch | 21 -- editor/geany-plugins/pspec.xml | 263 +++++++++--------- 6 files changed, 139 insertions(+), 380 deletions(-) delete mode 100644 editor/geany-plugins/files/9497d829e1b207eb83575dc6f617feecfb89bc16.patch delete mode 100644 editor/geany-plugins/files/Add_support_for_libgit2_1_4.patch delete mode 100644 editor/geany-plugins/files/Simplify_libgit2_version_checks.patch delete mode 100644 editor/geany-plugins/files/overview_plugin_test.patch diff --git a/editor/geany-plugins/actions.py b/editor/geany-plugins/actions.py index bf252f709b..460bee433f 100644 --- a/editor/geany-plugins/actions.py +++ b/editor/geany-plugins/actions.py @@ -9,18 +9,15 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - pisitools.cflags.add("-Wno-deprecated-declarations") - autotools.configure("--prefix=/usr --libexecdir=/usr/lib") + autotools.configure("--prefix=/usr --libexecdir=/usr/lib") def build(): - autotools.make() + autotools.make() def check(): - pass -# autotools.make("check") + pass def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("NEWS", "README") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.dodoc("NEWS") diff --git a/editor/geany-plugins/files/9497d829e1b207eb83575dc6f617feecfb89bc16.patch b/editor/geany-plugins/files/9497d829e1b207eb83575dc6f617feecfb89bc16.patch deleted file mode 100644 index 25e5ac4ea2..0000000000 --- a/editor/geany-plugins/files/9497d829e1b207eb83575dc6f617feecfb89bc16.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001 -From: Dominik Schmidt -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 - #include - --#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 diff --git a/editor/geany-plugins/files/Add_support_for_libgit2_1_4.patch b/editor/geany-plugins/files/Add_support_for_libgit2_1_4.patch deleted file mode 100644 index 30e9230db9..0000000000 --- a/editor/geany-plugins/files/Add_support_for_libgit2_1_4.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 5d9f1bc6d010e6b4c6a21af8a39b90922f89a82c Mon Sep 17 00:00:00 2001 -From: Colomban Wendling -Date: Sun, 5 Jun 2022 23:22:59 +0200 -Subject: [PATCH] git-changebar: Add support for libgit2 1.4 - -The buffer API changed a lot in libgit2 1.4, so compatibility is a bit -nastier than one could hope for. - -Fixes #1164. ---- - git-changebar/src/gcb-plugin.c | 76 ++++++++++++++++++++++++---------- - 1 file changed, 54 insertions(+), 22 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index bee8c865c..76208cd00 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -219,30 +219,19 @@ static const struct { - }; - - --/* workaround https://github.com/libgit2/libgit2/pull/3187 */ --static int --gcb_git_buf_grow (git_buf *buf, -- size_t target_size) --{ -- if (buf->asize == 0) { -- if (target_size == 0) { -- target_size = buf->size; -- } -- if ((target_size & 7) == 0) { -- target_size++; -- } -- } -- return git_buf_grow (buf, target_size); --} --#define git_buf_grow gcb_git_buf_grow -- - static void - buf_zero (git_buf *buf) - { - if (buf) { - buf->ptr = NULL; - buf->size = 0; -+#if ! CHECK_LIBGIT2_VERSION(1, 4) - buf->asize = 0; -+#else -+ /* we don't really need this field, but the documentation states that all -+ * fields should be set to 0, so fill it as well */ -+ buf->reserved = 0; -+#endif - } - } - -@@ -256,6 +245,52 @@ clear_cached_blob_contents (void) - G_blob_contents_tag = 0; - } - -+/* similar to old git_blob_filtered_content() but makes sure the caller owns -+ * the data in the output buffer -- and uses a boolean return */ -+static gboolean -+get_blob_contents (git_buf *out, -+ git_blob *blob, -+ const char *as_path, -+ int check_for_binary_data) -+{ -+/* libgit2 1.4 changed buffer API quite a bit */ -+#if ! CHECK_LIBGIT2_VERSION(1, 4) -+ gboolean success = TRUE; -+ -+ if (git_blob_filtered_content (out, blob, as_path, -+ check_for_binary_data) != 0) -+ return FALSE; -+ -+ /* Workaround for https://github.com/libgit2/libgit2/pull/3187 -+ * We want to own the buffer, which git_buf_grow(buf, 0) was supposed to do, -+ * but there is a corner case where it doesn't do what it should and -+ * truncates the buffer contents, so we fix this manually. */ -+ if (out->asize == 0) { -+ size_t target_size = out->size; -+ if ((target_size & 7) == 0) { -+ target_size++; -+ } -+ success = (git_buf_grow (out, target_size) == 0); -+ } -+ -+ return success; -+#else /* libgit2 >= 1.4 */ -+ /* Here we can assume we will always get a buffer we own (at least as of -+ * 2022-06-05 it is the case), so there's no need for a pendent to the -+ * previous git_buf_grow() shenanigans. -+ * This code path does the same as the older git_blob_filtered_content() -+ * but with non-deprecated API */ -+ git_blob_filter_options opts = GIT_BLOB_FILTER_OPTIONS_INIT; -+ -+ if (check_for_binary_data) -+ opts.flags |= GIT_BLOB_FILTER_CHECK_FOR_BINARY; -+ else -+ opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY; -+ -+ return git_blob_filter(out, blob, as_path, &opts) == 0; -+#endif -+} -+ - /* get the file blob for @relpath at HEAD */ - static gboolean - repo_get_file_blob_contents (git_repository *repo, -@@ -279,11 +314,8 @@ repo_get_file_blob_contents (git_repository *repo, - git_blob *blob; - - if (git_blob_lookup (&blob, repo, git_tree_entry_id (entry)) == 0) { -- if (git_blob_filtered_content (contents, blob, relpath, -- check_for_binary_data) == 0 && -- git_buf_grow (contents, 0) == 0) { -- success = TRUE; -- } -+ success = get_blob_contents (contents, blob, relpath, -+ check_for_binary_data); - git_blob_free (blob); - } - git_tree_entry_free (entry); diff --git a/editor/geany-plugins/files/Simplify_libgit2_version_checks.patch b/editor/geany-plugins/files/Simplify_libgit2_version_checks.patch deleted file mode 100644 index b17c9dbdb4..0000000000 --- a/editor/geany-plugins/files/Simplify_libgit2_version_checks.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 668f5d07eef16e227402eab09141c738b315d94b Mon Sep 17 00:00:00 2001 -From: Colomban Wendling -Date: Sun, 5 Jun 2022 23:11:20 +0200 -Subject: [PATCH] git-changebar: Simplify libgit2 version checks - -Introduce a custom macro for libgit2 version checks for them to be both -easier to read and write. ---- - git-changebar/src/gcb-plugin.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c -index f8ce20cd6..bee8c865c 100644 ---- a/git-changebar/src/gcb-plugin.c -+++ b/git-changebar/src/gcb-plugin.c -@@ -32,11 +32,19 @@ - #include - #include - --#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) -+#ifdef LIBGIT2_VER_MINOR -+# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) \ -+ ((LIBGIT2_VER_MAJOR == (MAJOR) && LIBGIT2_VER_MINOR >= (MINOR)) || \ -+ LIBGIT2_VER_MAJOR > (MAJOR)) -+#else /* ! defined(LIBGIT2_VER_MINOR) */ -+# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) 0 -+#endif -+ -+#if ! CHECK_LIBGIT2_VERSION(0, 22) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif --#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) -+#if ! CHECK_LIBGIT2_VERSION(0, 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 +53,7 @@ - new_buffer, new_len, new_as_path, options, \ - file_cb, hunk_cb, line_cb, payload) - #endif --#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) -+#if ! CHECK_LIBGIT2_VERSION(0, 28) - # define git_buf_dispose git_buf_free - # define git_error_last giterr_last - #endif diff --git a/editor/geany-plugins/files/overview_plugin_test.patch b/editor/geany-plugins/files/overview_plugin_test.patch deleted file mode 100644 index 1e4735416f..0000000000 --- a/editor/geany-plugins/files/overview_plugin_test.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/overview/overview/overviewscintilla.c b/overview/overview/overviewscintilla.c -index 41840638..7158179e 100644 ---- a/overview/overview/overviewscintilla.c -+++ b/overview/overview/overviewscintilla.c -@@ -796,14 +796,14 @@ overview_scintilla_get_property (GObject *object, - break; - case PROP_OVERLAY_COLOR: - { -- OverviewColor color; -+ OverviewColor color = { 0 }; - overview_scintilla_get_overlay_color (self, &color); - g_value_set_boxed (value, &color); - break; - } - case PROP_OVERLAY_OUTLINE_COLOR: - { -- OverviewColor color; -+ OverviewColor color = { 0 }; - overview_scintilla_get_overlay_outline_color (self, &color); - g_value_set_boxed (value, &color); - break; diff --git a/editor/geany-plugins/pspec.xml b/editor/geany-plugins/pspec.xml index 71d2695f66..9faa400712 100644 --- a/editor/geany-plugins/pspec.xml +++ b/editor/geany-plugins/pspec.xml @@ -1,81 +1,86 @@ - - geany-plugins - https://plugins.geany.org/ - - PisiLinux Community - admins@pisilinux.org - - GPL - library - Plugins for Geany - Plugins for Geany - https://plugins.geany.org/geany-plugins/geany-plugins-2.0.tar.bz2 - - intltool - cppcheck - vte-devel - vala-devel - ctpl-devel - check-devel - geany-devel - lua51-devel - gpgme-devel - python-devel - gnutls-devel - python3-devel - libsoup-devel - libgit2-devel - libpcre2-devel - enchant2-devel - gtkspell3-devel - webkit2gtk-devel - - - - - - - + + geany-plugins + https://plugins.geany.org/ + + PisiLinux Community + admins@pisilinux.org + + GPL + library + Plugins for Geany + Plugins for Geany + https://plugins.geany.org/geany-plugins/geany-plugins-2.1.tar.bz2 + + intltool + cppcheck + vte-devel + vala-devel + ctpl-devel + check-devel + geany-devel + lua51-devel + gpgme-devel + python-devel + gnutls-devel + python3-devel + libgit2-devel + libsoup3-devel + libpcre2-devel + enchant2-devel + gtkspell3-devel + webkit2gtk-devel + + + + + - - geany-plugins - - atk - vte - zlib - ctpl - gtk3 - cairo - pango - glib2 - geany - lua51 - gpgme - gnutls - libsoup - libxml2 - libgit2 - harfbuzz - libpcre2 - enchant2 - gtkspell3 - libassuan - gdk-pixbuf - webkit2gtk - libgpg-error - - - /usr/lib - /usr/share - /usr/share/locale - /usr/share/doc - - + + geany-plugins + + atk + vte + zlib + ctpl + gtk3 + cairo + pango + glib2 + geany + lua51 + gpgme + gnutls + libxml2 + libgit2 + libsoup3 + harfbuzz + libpcre2 + enchant2 + gtkspell3 + libassuan + gdk-pixbuf + webkit2gtk + libgpg-error + + + /usr/lib + /usr/share + /usr/share/locale + /usr/share/doc + + + + 2025-07-06 + 2.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-11-01 2.0 @@ -83,61 +88,61 @@ Mustafa Cinasal muscnsl@gmail.com - - 2022-10-07 - 1.38 - Version bump - fury - uglyside@yandex.ru - - - 2021-03-01 - 1.37 - Version bump. - fury - uglyside@yandex.ru - - - 2020-09-22 - 1.36 - Rebuild libgit2. - fury - uglyside@yandex.ru - - - 2020-09-22 - 1.36 - Rebuild. - fury - uglyside@yandex.ru - - - 2019-12-18 - 1.36 - Rebuild with gtk3. - fury - uglyside@yandex.ru - - - 2019-10-15 - 1.36 - Ver. bump - fury - uglyside@yandex.ru - - - 2019-07-05 - 1.35 - Ver. bump - fury - uglyside@yandex.ru - - - 2019-04-21 - 1.34 - build - fury - uglyside@yandex.ru - - + + 2022-10-07 + 1.38 + Version bump + fury + uglyside@yandex.ru + + + 2021-03-01 + 1.37 + Version bump. + fury + uglyside@yandex.ru + + + 2020-09-22 + 1.36 + Rebuild libgit2. + fury + uglyside@yandex.ru + + + 2020-09-22 + 1.36 + Rebuild. + fury + uglyside@yandex.ru + + + 2019-12-18 + 1.36 + Rebuild with gtk3. + fury + uglyside@yandex.ru + + + 2019-10-15 + 1.36 + Ver. bump + fury + uglyside@yandex.ru + + + 2019-07-05 + 1.35 + Ver. bump + fury + uglyside@yandex.ru + + + 2019-04-21 + 1.34 + build + fury + uglyside@yandex.ru + +