commit:     3868202ad2fec9957137657d5709d162bd4b37a6
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Fri Feb 21 19:27:29 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 19:37:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3868202a

dev-util/geany-plugins: Fix test failure with gcc-15

Closes: https://bugs.gentoo.org/950007
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-2.0-gcc15.patch => geany-plugins-2.0-gcc15-r1.patch} | 16 ++++++++++++++++
 dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild       |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

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-r1.patch
similarity index 69%
rename from dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch
rename to dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch
index d30e496bbf02..0f9feab30499 100644
--- a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch
+++ b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch
@@ -25,3 +25,19 @@
  }
  
  /* loads @filename in @kf and return %FALSE if failed, emitting a warning
+# 
https://github.com/geany/geany-plugins/commit/109ad6e6a2cfa31deb33ebfcef838ba337ff208f
+--- a/geanyprj/src/unittests.c
++++ b/geanyprj/src/unittests.c
+@@ -25,12 +25,6 @@ file_teardown(void)
+       system("rm -rf test_list_dir");
+ }
+ 
+-gboolean
+-true(G_GNUC_UNUSED const gchar * arg)
+-{
+-      return TRUE;
+-}
+-
+ START_TEST(test_get_file_list)
+ {
+       GSList *files = get_file_list("test_list_dir", NULL, NULL, NULL);

diff --git a/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild 
b/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild
index e92ded0945d8..080c9323b9df 100644
--- a/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild
@@ -47,7 +47,7 @@ BDEPEND="virtual/pkgconfig
 
 PATCHES=(
        "${FILESDIR}/${P}-gcc14.patch"
-       "${FILESDIR}/${P}-gcc15.patch"
+       "${FILESDIR}/${P}-gcc15-r1.patch"
        "${FILESDIR}/${P}-webkit2gtk-4.1.patch"
 )
 

Reply via email to