commit: d0936f9eaa4e3c811e8345d11fec3c1245bf1774 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sun Mar 17 19:59:32 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Mar 18 14:39:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0936f9e
xfce-base/xfce4-settings: fix undefined references Closes: https://bugs.gentoo.org/913864 Bug: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/494 Upstream-Commit: https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/f13b9ff1e5361439eafb9cffafd4d23fa6b2cb9e Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/35807 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../files/xfce4-settings-4.19.1-gmodule-libs.patch | 35 ++++++++++++++++++++++ .../xfce4-settings/xfce4-settings-4.19.1.ebuild | 15 ++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch new file mode 100644 index 000000000000..8c8f14e25f14 --- /dev/null +++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/913864 +https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/494 +https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/f13b9ff1e5361439eafb9cffafd4d23fa6b2cb9e + +From f13b9ff1e5361439eafb9cffafd4d23fa6b2cb9e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <g...@xfce.org> +Date: Tue, 28 Nov 2023 11:27:59 +0100 +Subject: [PATCH] build: Check for gmodule-2.0 (V2) + +Completes: c4a489aebce624301e7ad63ad14a97fbc46c3207 +Related: #494 +--- + xfsettingsd/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am +index 181b5e77..0a81974a 100644 +--- a/xfsettingsd/Makefile.am ++++ b/xfsettingsd/Makefile.am +@@ -158,6 +158,7 @@ libxfsettingsd_gtk_settings_sync_la_SOURCES = \ + gtk-settings-module.c + + libxfsettingsd_gtk_settings_sync_la_CFLAGS = \ ++ $(GMODULE_CFLAGS) \ + $(GTK_CFLAGS) \ + $(XFCONF_CFLAGS) + +@@ -169,6 +170,7 @@ libxfsettingsd_gtk_settings_sync_la_LDFLAGS = \ + $(PLATFORM_LDFLAGS) + + libxfsettingsd_gtk_settings_sync_la_LIBADD = \ ++ $(GMODULE_LIBS) \ + $(GTK_LIBS) \ + $(XFCONF_LIBS) + diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild index 5f2eb5cf173a..d2f2822092c8 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit python-single-r1 xdg-utils +inherit autotools python-single-r1 xdg-utils DESCRIPTION="Configuration system for the Xfce desktop environment" HOMEPAGE=" @@ -63,6 +63,17 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # https://bugs.gentoo.org/913864 + # https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/494 + "${FILESDIR}"/${PN}-4.19.1-gmodule-libs.patch +) + +src_prepare() { + default + eautomake +} + src_configure() { local myconf=( $(use_enable upower upower-glib)
