From bc7e0dbdbd194a8c2e09f82e1a5a4ea5e1b556f4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Mar 2024 18:50:06 +0000 Subject: gentoo auto-resync : 18:03:2024 - 18:50:06 --- xfce-base/Manifest.gz | Bin 3051 -> 3055 bytes xfce-base/xfce4-settings/Manifest | 3 +- .../files/xfce4-settings-4.19.1-gmodule-libs.patch | 35 +++++++++++++++++++++ .../xfce4-settings/xfce4-settings-4.19.1.ebuild | 15 +++++++-- 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch (limited to 'xfce-base') diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz index 39c26d7184a6..9b94dea801ff 100644 Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest index 868c25a33544..97828f744606 100644 --- a/xfce-base/xfce4-settings/Manifest +++ b/xfce-base/xfce4-settings/Manifest @@ -1,5 +1,6 @@ +AUX xfce4-settings-4.19.1-gmodule-libs.patch 1088 BLAKE2B 27a06ebc258c0e96b2173d2b13d132ab587f2347dce42751baee98a68bcc593bc9bb193a2e52c04fd80ec20b74aaf84d1fb9e353f50d5ea60117cac401061723 SHA512 7905c57192ae5a196c5f29656de55bdcbced589ea7f5dd8236a5ab7c55a02ad841d5a027b4a40923f9655cba0c908082417e31972d452943e6f47c27e51abf93 DIST xfce4-settings-4.18.4.tar.bz2 1557097 BLAKE2B 0269ed1778becc547ba187c096d7c9938cc00f56fb1c9312c9d0eb9b5344d4785f88abadecf391724699de2cb28b35ffed057f06e85f3e098a902a4047969a9c SHA512 2f9e2de4a3a0cc59b4701b44899464532fbae8805270485d2821b65b9d78be54bb636c4cd4205de97e18c13b20912fcd1f4ca0b3baa561bf1a783829f53a06a0 DIST xfce4-settings-4.19.1.tar.bz2 2406390 BLAKE2B 3b528d7ea0a44e8a59b0e9612d116a17592db1b57932873b86f218c30721781c25cf5a0bbc3deefde6ef3370947f20033fac282b8a8fd9883ccb33a91f438750 SHA512 9d08c3dda27fcb3832b74cf32bedb4a051d46437f31b07a838f58bd324fca63ad6159558deca0b29de5d22b467c08a690d5eafef5e0581a3bc8782ba1771a937 EBUILD xfce4-settings-4.18.4.ebuild 1778 BLAKE2B 1c0962de0acc5b2681b214fe41e19338ed9323dcebd7612279f686b3c6c768ddada1c1910799118f919e93d02e236f76824d71d054c6e744039b9d92b89420ed SHA512 337d2f978affa03e4e381023dd163c7cfca701bd62cc235f8430802cfa2a9d6610c1588ed8a542b65b0406bd8270cec6eaff22493a4818ad08215f0520970e09 -EBUILD xfce4-settings-4.19.1.ebuild 2122 BLAKE2B 09dc5a3656bed23d3b600f914f7713f5ff9639e9e8dac770d137e82378a90295711f949e7d5eb82bd74dd94f7adb4fec5c2181db4c4a7fce93e8586db25f6b37 SHA512 adeaadd85f0d9cc9a7b867f6b879582ca948f3bb8f58447a4fcdde5007d9f8433fd9b2172021e91a01887352ee5c641a4bc1d4ea86578dbe853b9df680399438 +EBUILD xfce4-settings-4.19.1.ebuild 2325 BLAKE2B 9d9b377a01326cf6ccff1636f3003fab5a6e1487535659a3fe114f10b81c2f61293c195c3465992279798df3b1c3852ff892b6e177cc22c81b8c2498b063d05a SHA512 29c3822679bb849ad601d79101c7b6f941be79fb0a96b557e265c4a7b8aa455bb56b7f448072f57bc6d4307e233c6bcc7b2de0bb99b991efede9767ee7510847 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7 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?= +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) -- cgit v1.2.3