commit: 962bbf8aa56fb65795c6e52c252dd14cb55f9661 Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> AuthorDate: Mon Aug 11 18:51:36 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 6 15:41:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962bbf8a
app-admin/gam-server: fix build with gcc-14 and clang Also: * update HOMEPAGE * drop outdated blocker to apiece pkgcheck (it is not in portage since the migration to git) Closes: https://bugs.gentoo.org/509696 Closes: https://bugs.gentoo.org/870574 Closes: https://bugs.gentoo.org/920356 Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43415 Signed-off-by: Sam James <sam <AT> gentoo.org> ...er-0.1.10-fix-build-with-gcc-14-and-clang.patch | 59 ++++++++++++++++++++++ app-admin/gam-server/gam-server-0.1.10-r3.ebuild | 8 +-- app-admin/gam-server/metadata.xml | 3 ++ 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/app-admin/gam-server/files/gam-server-0.1.10-fix-build-with-gcc-14-and-clang.patch b/app-admin/gam-server/files/gam-server-0.1.10-fix-build-with-gcc-14-and-clang.patch new file mode 100644 index 000000000000..f3b8d78568c7 --- /dev/null +++ b/app-admin/gam-server/files/gam-server-0.1.10-fix-build-with-gcc-14-and-clang.patch @@ -0,0 +1,59 @@ +Fix build with gcc-14 and clang + +Origin: Combiened from original patches posted to Gentoo bugzilla +Author: David Betancur Vallejo <[email protected]> +Bug: https://bugs.gentoo.org/509696 +Bug: https://bugs.gentoo.org/870574 +Bug: https://bugs.gentoo.org/920356 +--- a/server/gam_connection.c 2007-07-04 09:36:49.000000000 -0400 ++++ b/server/gam_connection.c 2025-06-10 23:55:11.300403185 -0400 +@@ -19,6 +19,7 @@ + #include "gam_inotify.h" + #endif + #include "fam.h" ++#include "gam_excludes.h" + + /************************************************************************ + * * +--- a/server/gam_eq.c 2007-07-04 09:36:49.000000000 -0400 ++++ b/server/gam_eq.c 2025-06-10 23:57:02.457123587 -0400 +@@ -124,7 +124,7 @@ + { + gboolean done_work = FALSE; + if (!eq) +- return; ++ return done_work; + + #ifdef GAM_EQ_VERBOSE + GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn)); +--- a/server/gam_inotify.c 2025-06-10 23:58:55.040118509 -0400 ++++ b/server/gam_inotify.c 2025-06-10 23:58:47.249981960 -0400 +@@ -30,6 +30,7 @@ + #include "gam_server.h" + #include "gam_subscription.h" + #include "gam_inotify.h" ++#include "gam_poll_basic.h" + + /* Transforms a inotify event to a gamin event. */ + static GaminEventType +--- a/server/gam_listener.c 2007-07-04 09:36:49.000000000 -0400 ++++ b/server/gam_listener.c 2025-06-10 23:39:04.914127952 -0400 +@@ -25,6 +25,7 @@ + #include "gam_server.h" + #include "gam_error.h" + #include "gam_pidname.h" ++#include "gam_excludes.h" + #ifdef ENABLE_INOTIFY + #include "gam_inotify.h" + #endif +--- a/server/gam_server.h 2025-06-10 23:52:52.003110180 -0400 ++++ b/server/gam_server.h 2025-06-10 23:52:07.096202211 -0400 +@@ -79,6 +79,8 @@ + gboolean gam_poll_remove_all_for (GamListener *listener); + GaminEventType gam_poll_file (GamNode *node); + ++extern void gam_error_init(void); ++ + #ifdef __cplusplus + } + #endif diff --git a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild index 338ed77160cd..9864a1140048 100644 --- a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild +++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild @@ -9,7 +9,7 @@ GNOME_TARBALL_SUFFIX="bz2" inherit autotools flag-o-matic gnome.org DESCRIPTION="Library providing the FAM File Alteration Monitor API" -HOMEPAGE="https://www.gnome.org/~veillard/gamin/"; +HOMEPAGE="https://gitlab.gnome.org/Archive/gamin"; SRC_URI="${SRC_URI} mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz"; # pkg.m4 for eautoreconf @@ -21,8 +21,7 @@ IUSE="debug" RDEPEND=">=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 - !app-admin/fam - !<app-admin/gamin-0.1.10" + !app-admin/fam" DEPEND="${RDEPEND}" @@ -47,6 +46,9 @@ src_prepare() { # Fix deadlocks with glib-2.32, bug #413331, upstream #667230 eapply "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch" + # Fix build with gcc-14 and clang bug #559464 #870574 #920356 + eapply "${FILESDIR}/${P}-fix-build-with-gcc-14-and-clang.patch" + # Drop DEPRECATED flags sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml index d0b58801b31a..0bb22508ead5 100644 --- a/app-admin/gam-server/metadata.xml +++ b/app-admin/gam-server/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>[email protected]</email> </maintainer> + <upstream> + <remote-id type="gnome-gitlab">Archive/gamin</remote-id> + </upstream> </pkgmetadata>
