gentoo auto-resync : 17:02:2025 - 00:13:57

5 files changed, 39 insertions, 181 deletions

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 344c92ef09ec..6623e8834891 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,9 +1,7 @@
-AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
-AUX geany-plugins-1.38-webkit2gtk-4.1.patch 811 BLAKE2B 1c682cd813350cc61d53fe72609aac7ef212bb4710f0925bc55f5da6f9241c3709d7183d25478024ac8883633ff3605b5b4e5e5c90005a09eb653c701059909a SHA512 4b02c9a13e57ded452d52ff10c0f81ddc56bc193e0301c0805ef154792125fe9f9b6a5c35e81d9535407a67b12a268f5e1eb122b24580c6cf5ad92b0de2b1479
 AUX geany-plugins-2.0-gcc14.patch 380 BLAKE2B 11f10bf77c00e6db4397fb7ca769763891c1d2182e240aaa6139e379e1edf8f6bd69fa060b489368af9116e7a55b08d1bc7792ae2981a9f1b4e4185379fb7fc5 SHA512 45ac7d7729dd99eb824c34b740b6f101f04962736b6152ee13fec1c5a5a8f8c6154e8c732e94a89aef0969756a0d10be2656dbdb023e33b5f8e587cbf7c6374e
+AUX geany-plugins-2.0-gcc15.patch 900 BLAKE2B 073d70f8f15317ac77ef9d2ab695d5459d41b194ba4f7e14f332b47efde9ee6f2542fb36d9acd511b343fdd917c98fc51fa28fbe52f060fdffaec688984a1002 SHA512 95ccbed92c639329ee79990b27a9534cabf91f341648ff895261ca60c33d2a33ba293b27813171cedbf229300951773dae3ba25c9367804a3659619c2a6f3229
 AUX geany-plugins-2.0-webkit2gtk-4.1.patch 1341 BLAKE2B 33613eee4f4f547d5eeecb13872e1fef85e934d25c74c93fa52915aaa14f02baac9e941215f617d5a29230a4eb68169d6b655444044f1b89d85371ba06000b6a SHA512 8cf132a9eb7d0054645a50aec9be847e743a888aa3fc5f349272c64aa158c3f1ab811e2d814aa8aa0e1f4b34d074c9095f18acf343005deee5356291a4347ec3
-DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 DIST geany-plugins-2.0.tar.bz2 3181264 BLAKE2B 6175f91a3a7effa081393e9397336e0f5f59846fdadd0e31584f237c14863016cc4ab1b17745e1e2804ad88161dc7e43aef97a2332a5c18a7f1baf10d2ea42ba SHA512 48d575459e5c9f905b8809796ea89a05f6e082a1bb1d29c9f44dd5de607a64ad65a27d18348312702d25cfbb80ea0348b9e806f8c0fe649ea558b5b4ccd84818
-EBUILD geany-plugins-1.38-r410.ebuild 3208 BLAKE2B 894283262a9a73fd2748522dae234622e7388f89e21defe808559b9aea1e46dc42284c8bbe2edd9e8c23fe8dc36810f910b3941cb5a0e0a5a06b7b19bb074349 SHA512 c7d6994c0b0119c2d8e4dbdd96161de225f6ea1c2a6dafc1c5b4eed3cede8b9a83adf0f67a600d9634ad8407514e6da5e287e5ed785ef16ac5c22136b36e091c
 EBUILD geany-plugins-2.0-r1.ebuild 2900 BLAKE2B 4446915724c95e4ace8a1d662daaf22d87d99e86a14a29b34649cb85b31491c57a10ce9b6c141951d7adbd7597426deb2005abd992f07b83799b5022cd9c5d96 SHA512 1b50bdc99488c00ec1c7d0dd1a0f9665c1cef9784f450de863dbace8e68d0f928aa00e11092cac254c64dc804366306ae919d6bf07c139a9a712dbcdfb3dd01b
+EBUILD geany-plugins-2.0-r2.ebuild 2937 BLAKE2B 108d1e880bcd17b3e6dbc54e50fcab2ce0f4d9512af9c300d16a28ebab6e52482b7467aadeeeb7d65e1b1eb0faed1bfbe29a1941ec4160591e6776bc50de468f SHA512 b409414a5ec354adde8e90613796affc18e360bd0ce1ec6eb4a632f1485ed9ad63cb6bbbcf3d7be3ac1f7965ab1aac39de74c28674c318f9c0aa609441413dc1
 MISC metadata.xml 1143 BLAKE2B 71996899973fa713a167cd6acab9c21ef46efef1b12bd997867ae2553c3a739e6a1c0395d8c712e11dcb280ba299885c3a69c1b642650d70e8f8565249dd7e14 SHA512 8fbfdb5fc84b37fbd33924d12beea933231c191db6b9c51e9f22bc37b3169b04d063a7537e008bebb2bac394de8b040c8116b5ae439c9dfc348ce9fe5b8d8da0
diff --git a/dev-util/geany-plugins/files/geany-plugins-1.38-libgit2-1.4.patch b/dev-util/geany-plugins/files/geany-plugins-1.38-libgit2-1.4.patch
deleted file mode 100644
index 87034471d09e..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-1.38-libgit2-1.4.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-# https://github.com/geany/geany-plugins/commit/668f5d07eef16e227402eab09141c738b315d94b
-# https://github.com/geany/geany-plugins/commit/5d9f1bc6d010e6b4c6a21af8a39b90922f89a82c
---- a/git-changebar/src/gcb-plugin.c
-+++ b/git-changebar/src/gcb-plugin.c
-@@ -32,11 +32,19 @@
- #include <geany.h>
- #include <document.h>
- 
--#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
-@@ -211,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
-   }
- }
- 
-@@ -248,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,
-@@ -271,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/dev-util/geany-plugins/files/geany-plugins-1.38-webkit2gtk-4.1.patch b/dev-util/geany-plugins/files/geany-plugins-1.38-webkit2gtk-4.1.patch
deleted file mode 100644
index ad543af6587f..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-1.38-webkit2gtk-4.1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/markdown.m4 b/build/markdown.m4
-index 6c1f53a6..39bea2a6 100644
---- a/build/markdown.m4
-+++ b/build/markdown.m4
-@@ -49,13 +49,13 @@ AC_DEFUN([GP_CHECK_MARKDOWN],
-     GTK_VERSION=2.16
-     WEBKIT_VERSION=1.1.13
- 
--    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0],
-+    GP_CHECK_GTK3([webkit_package=webkit2gtk-4.1],
-                   [webkit_package=webkit-1.0])
-     GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN],
-                          [$GP_GTK_PACKAGE >= ${GTK_VERSION}
-                           $webkit_package >= ${WEBKIT_VERSION}
-                           gthread-2.0])
--    AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0])
-+    AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.1])
- 
-     GP_COMMIT_PLUGIN_STATUS([Markdown])
- 
diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch
new file mode 100644
index 000000000000..d30e496bbf02
--- /dev/null
+++ b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch
@@ -0,0 +1,27 @@
+# https://github.com/geany/geany-plugins/pull/1389
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile     *kf,
+                       const gchar  *key,
+                       gpointer      value)
+ {
+-  gboolean *bool = value;
++  gboolean *boolean = value;
+   
+-  *bool = utils_get_setting_boolean (kf, group, key, *bool);
++  *boolean = utils_get_setting_boolean (kf, group, key, *boolean);
+ }
+ 
+ static void
+@@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile      *kf,
+                        const gchar   *key,
+                        gconstpointer  value)
+ {
+-  const gboolean *bool = value;
++  const gboolean *boolean = value;
+   
+-  g_key_file_set_boolean (kf, group, key, *bool);
++  g_key_file_set_boolean (kf, group, key, *boolean);
+ }
+ 
+ /* loads @filename in @kf and return %FALSE if failed, emitting a warning
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild b/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild
index 72532b531671..e92ded0945d8 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
-LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic lua-single
+inherit autotools lua-single
 
 DESCRIPTION="A collection of different plugins for Geany"
 HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope workbench"
+IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope webhelper workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 DEPEND="
 	dev-libs/glib:2
-	>=dev-util/geany-1.37[-gtk2(-)]
+	>=dev-util/geany-2.0
 	x11-libs/gtk+:3
 	ctags? ( dev-util/ctags )
 	debugger? ( x11-libs/vte:2.91 )
@@ -36,6 +35,7 @@ DEPEND="
 		)
 	pretty-printer? ( dev-libs/libxml2:2 )
 	scope? ( x11-libs/vte:2.91 )
+	webhelper? ( net-libs/webkit-gtk:4.1 )
 	workbench? ( dev-libs/libgit2:= )
 "
 RDEPEND="${DEPEND}
@@ -46,7 +46,8 @@ BDEPEND="virtual/pkgconfig
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-libgit2-1.4.patch"
+	"${FILESDIR}/${P}-gcc14.patch"
+	"${FILESDIR}/${P}-gcc15.patch"
 	"${FILESDIR}/${P}-webkit2gtk-4.1.patch"
 )
 
@@ -60,10 +61,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# -DLUA_COMPAT_OPENLIB=1 is required to enable the
-	# deprecated (in 5.1) luaL_openlib API (#878529)
-	use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
-
 	local myeconfargs=(
 		--disable-cppcheck
 		--disable-extra-c-warnings
@@ -107,18 +104,13 @@ src_configure() {
 		$(use_enable pretty-printer)
 		$(use_enable scope)
 		$(use_enable enchant spellcheck)
+		$(use_enable webhelper)
 		$(use_enable workbench)
 		# GeanyGenDoc requires ctpl which isn’t yet in portage
 		--disable-geanygendoc
 		# Require libsoup-2.4 which conflicts with webkit2gtk-4.1
 		--disable-geniuspaste
 		--disable-updatechecker
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
 	)
 
 	econf "${myeconfargs[@]}"