gentoo auto-resync : 21:03:2024 - 07:00:13

6 files changed, 71 insertions, 12 deletions

diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index ceb00f6e0707..e1f34dde8e86 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index 80091ada6616..08b587a3cfc4 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1,4 +1,5 @@
+AUX xfce4-kbdleds-plugin-0.2.3-x11-libs.patch 1343 BLAKE2B 9bd054317b5b616321be9fae9c4b9eded52139def6a28d72e7b8fbd695b1d2b5dc3189c1a9dc79268bb278dd98092ee0aba45fa40c63324a86ee45aab3689797 SHA512 00ee3aac203a6504f4413f6bd5947192b5538cfcdbdc22a36809f8d1f1db895b57e15f2dec26d7ed9356a050087123f45ac5cf290a9410f5f8a7ee98c8f1b1e1
 AUX xfce4-kbdleds-plugin-0.2.3-xfce-4.16.patch 1345 BLAKE2B a7dea5b5923be2bb2fcd3927968519c8381d431da344848a90fbae922eea5f591e71f18865d347ed922a6fe68f9c7ce12526fc7284e6bf80c9008cd2440f62c5 SHA512 012d34319df88a963dd9b6f303d4b69c03bab73e900e55f8b54a6822fb8a8d0fdd90c4703a019eecc9902851af7f8263c175b74f88a26a715ad5a9b5aebe2b4c
 DIST xfce4-kbdleds-plugin-0.2.3.tar.bz2 321690 BLAKE2B 847bbf675b97659c86c0668ab9ce96787866734377f3fdb49d4b5f18a3735cace66279783df92fe8cfff57ff05f4f09fa3fff23e0dc89f1b2d0fbd512e5089f5 SHA512 ddedaf430226f77d03f63f4dc31518184fd808d01c6049adbf41cacc2f46c78c3ce48c5a0450c200acda4a328d9716d54f7cc225913f4761a0526710b76f0cee
-EBUILD xfce4-kbdleds-plugin-0.2.3.ebuild 814 BLAKE2B c4dce903b13c333a75df1c700b1e3d977337786cbef2850c461b3509f38b131b1a1587e19ba23ae2673a7ce9fb42bdaa16d0202e2c7aa1ff881dd1be68c20824 SHA512 e995b59ee1a7e6c1eae29cfb1b7b88745f2ebe246afe896e54b397c6967ccdada9b9d31cfac58fe94f5df7722d063336022e018114242a5e530f474e853c7f48
+EBUILD xfce4-kbdleds-plugin-0.2.3.ebuild 1033 BLAKE2B 72089f58f6b43ebacf2c37e0b94720eb066b727829d2ef5395b7b68386f15fc01b52b901ebfe5b68916375341085a46a0336738bf5129f37f50aa1a7bf5a244f SHA512 fa2847c950808fedf150eb2da1228429272fa01296c4f5def537094965a2178777c19ac1166433b8924dea5c227b639f39ebedcc3570a201416bff0e1974ed79
 MISC metadata.xml 345 BLAKE2B 832115fcf23352d2aa50b84ba570d60d26b09331afaccd1e3b0a176cbe445e8cec9c2a91e6ecc85706edca9a7e6e49202b6fcbf9a7a89d92307b6fb1022fad66 SHA512 50fc70a4bba3b5f4962caaf29d62e8f8735ab6c5d69fd578aa2b7316faf76773d5bc46e19d88d0704e356fb58f04359cae8bae6ee0cd2ef978e203e680c05a89
diff --git a/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-x11-libs.patch b/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-x11-libs.patch
new file mode 100644
index 000000000000..37d2940dff2f
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/files/xfce4-kbdleds-plugin-0.2.3-x11-libs.patch
@@ -0,0 +1,40 @@
+https://github.com/oco2000/xfce4-kbdleds-plugin/pull/10
+https://github.com/oco2000/xfce4-kbdleds-plugin/commit/190434d67843c2ec392aa4a2cab46e8479d2d34d
+
+From 128f5cd7d042007d91b2ec7cb744e64a81468566 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 17 Mar 2024 08:37:11 -0700
+Subject: [PATCH] panel-plugin: add missing x11 linker flags
+
+The configure.ac.in has XDT_CHECK_LIBX11_REQUIRE, but fails to use the
+provided $(LIBX11_CFLAGS) and $(LIBX11_LIBS) variables in the build.
+
+While the build has -no-undefined GNU libtool will silently ignore that
+flag, but when built with slibtool instead it correctly passes
+-Wl,--no-undefined to the linker revealing this issue.
+
+Gentoo issue: https://bugs.gentoo.org/913681
+---
+ panel-plugin/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 5f355fe..bb3b225 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -22,6 +22,7 @@ libkbdleds_la_SOURCES = \
+ 	kbdleds-dialogs.h
+ 
+ libkbdleds_la_CFLAGS = \
++	$(LIBX11_CFLAGS) \
+ 	$(LIBXFCE4UTIL_CFLAGS) \
+ 	$(LIBXFCE4UI_CFLAGS) \
+ 	$(LIBXFCE4PANEL_CFLAGS) \
+@@ -35,6 +36,7 @@ libkbdleds_la_LDFLAGS = \
+        $(PLATFORM_LDFLAGS)
+ 
+ libkbdleds_la_LIBADD = \
++	$(LIBX11_LIBS) \
+ 	$(LIBXFCE4UTIL_LIBS) \
+ 	$(LIBXFCE4UI_LIBS) \
+ 	$(LIBXFCE4PANEL_LIBS)
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
index 7801acd52904..dc84417ae664 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit xdg-utils
+inherit autotools xdg-utils
 
 DESCRIPTION="A panel plug-in to show state of Caps, Num and Scroll Lock keys"
 HOMEPAGE="https://github.com/oco2000/xfce4-kbdleds-plugin"
@@ -13,18 +13,35 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 
-RDEPEND="
+DEPEND="
 	xfce-base/libxfce4ui:=
 	xfce-base/libxfce4util:=
-	xfce-base/xfce4-panel"
-DEPEND=${RDEPEND}
+	xfce-base/xfce4-panel
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
-
-# https://github.com/oco2000/xfce4-kbdleds-plugin/pull/7
-PATCHES=( "${FILESDIR}/${P}-xfce-4.16.patch" )
+	virtual/pkgconfig
+"
+# for eautoreconf
+BDEPEND+="
+	dev-build/xfce4-dev-tools
+"
+
+PATCHES=(
+	# https://github.com/oco2000/xfce4-kbdleds-plugin/pull/7
+	"${FILESDIR}/${P}-xfce-4.16.patch"
+	# https://github.com/oco2000/xfce4-kbdleds-plugin/pull/10
+	"${FILESDIR}/${P}-x11-libs.patch" #913681
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_install() {
 	default
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 25262948775b..71b32c9e8dca 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-xkb-plugin-0.8.3.tar.bz2 864177 BLAKE2B 4c4c5ab781265e50ddb14210566f608e2798f881d4b06e7e8f121c466ea0eebb694cf394b0bec747b7a5f1f99962ee1d014f29f077ef877e8063c23934eff1b4 SHA512 02ae82a1e01b7cc54154545c6ff42a450a81ba44697620ebb716a663300ea08fbf6ccafc5fd4d710791f142e1c249f17b613d90ffd99025ad97dfa0230ee55b2
-EBUILD xfce4-xkb-plugin-0.8.3.ebuild 1241 BLAKE2B af16d7039cc65d6c133646140681779db0a39cf2b4ba5d069fcdfa12f5799394e57820102f50b0be0c7116f2915dabf829ceea65400a72bc8acbb3b32ae13bdd SHA512 6fec88467150262bbff1d06b39dc4aedcce8fe1a142b623e1faba97c8e54562c01c64b2262a1196f8fad85c8f12af65f8733db87faa5f9bbfaaa925349e9f7cd
+EBUILD xfce4-xkb-plugin-0.8.3.ebuild 1265 BLAKE2B 7b86b1b7de3fbf3fd856bee95800f1154418c0e8f53c5f17358a2c04f78dd9b0b3f459cf5ee370eaeb5050a689b4060643a0b4291b291b8551c206a70bcf0215 SHA512 bf94c897a46155a2e9878d8fb71234731917461a56d808558a0d83edb70d4cf3682bc90fe67f41204d2c2645e54feb6f3b8d70114817fcdf0711a63e64103f97
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
index 189676d4dc45..58acff9b2d21 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux
 IUSE="libnotify"
 
 DEPEND="
+	>=dev-libs/glib-2.50.0
 	gnome-base/librsvg
 	x11-libs/gtk+:3
 	x11-libs/libwnck:3