gentoo auto-resync : 11:02:2025 - 00:12:37

4 files changed, 20 insertions, 42 deletions

diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index 6c89072cadbe..10f9012c0608 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,5 +1,5 @@
 AUX trayer-srg-1.1.8-avoid-prestripping-of-files.patch 418 BLAKE2B 184505920237aca82d6f8e12d73df6f80b47a35849339ebb019283f2be348b96448d9c279355761309ee5064c7a637f2e050e7d96b48e952a6735001406f6730 SHA512 e0d8d8a7251e693c44f7974231f391478847582ac9debd42939bcd3eb1c34ab50e6766ac34dde07d02bcb38320329f5a73868a510aca255df867bc8b3ab46a2a
+AUX trayer-srg-1.1.8-fix-define.patch 374 BLAKE2B 06cc1a62242813278e8c6361de3fc2c12370e286fba3d06d2da23470428544653ea1301d8cc31b740124c995326bca24c8c2a1209fc16d5a37a5c06d63a84748 SHA512 d0bda078645dab2fea10a3abfb4796a391e4c5d1a6255f11255340f3b94a9c1503b9774d531d95fcd6367224dc7b5d1126df4918d05982f8b9114a2d181e368b
 DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310
-EBUILD trayer-srg-1.1.8-r1.ebuild 733 BLAKE2B 059bb4b8896fd03bd4dfab5501afd14b12807c313649fb45de429649bb47f5df6935f0125831c7575f3156f874c83ae2b38480f844e936f917eac76e944d66d6 SHA512 e1368c5aa91c982d864f671b4072b84d5a999a191b97e696c744a9220e5a85f3055ba6f4b58ecdf5b062ba6661da5bba1ef1881377d438c5eea433af8c3edda1
-EBUILD trayer-srg-1.1.8-r2.ebuild 798 BLAKE2B ba6b4562fea2278b875b4ee86c6525d563f1e807b5b0a4cccfe2773e3e1e041587ac45590f03352bfc428039870e5c8fa693654dbcb1de2e1909a0d009876590 SHA512 78b7ed880ad8a33e5c93a19fb26eea106988d55e09fb0e474c06dd15988ef5d5f72d08958cef272adf6fb62476a960c808e4bd1662970edd53c043be15eabf35
+EBUILD trayer-srg-1.1.8-r2.ebuild 836 BLAKE2B 89f656045aeaad776d6fff72212d7d1fff286df5b7f27384876356d5d0006be1312a22ac8fcc5b92bf510dcc468ce2f7010e951006f2159cc11863121f8d1659 SHA512 a5c971839b76c1545890a4453d4405e27ad896e28048cfdb6163ac4e212c488277ed0e26e6d5ce7ff1c2aefd42fd3a34807c6dc19ce7cc75d5103f8c86a42daf
 MISC metadata.xml 501 BLAKE2B 9251421498077d5a34ae6871270f908d51362cd42971b5c1ea4583c8643f26b7e64eed15cbd8396abc6093024df850aa0814748cd76794ecae8d94514d8adc41 SHA512 78dfec041f277181951f07716211407cf4f36ddf8ee8e6b75d7b865cc10cdbfb14d898ea39ed0f012a704c448be2b22290ebb19d272bf859bf6c14780e30c8ce
diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.8-fix-define.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-fix-define.patch
new file mode 100644
index 000000000000..a58b4e9acc52
--- /dev/null
+++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-fix-define.patch
@@ -0,0 +1,13 @@
+Add missing argument in function declaration, C23
+https://bugs.gentoo.org/944020
+--- a/bg.h
++++ b/bg.h
+@@ -9,7 +9,7 @@
+ #include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+-void bg_init();
++void bg_init(Display *dpyn);
+ void bg_rootbg_changed();
+ GdkPixmap *bg_new_for_win(Window win);
+ void modify_drawable(GdkDrawable *base, GdkGC *gc, guint32 tintcolor, gint alpha);
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
deleted file mode 100644
index 857f7def615b..000000000000
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
-HOMEPAGE="https://github.com/sargon/trayer-srg"
-SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	x11-libs/gdk-pixbuf:2
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}-trayer-${PV}
-
-src_configure() {
-	./configure --prefix="${EPREFIX}" || die
-}
-
-src_compile() {
-	emake TARGET=${PN} CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
index 2676ed677f88..3a334d5db670 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-avoid-prestripping-of-files.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-avoid-prestripping-of-files.patch"
+	"${FILESDIR}/${P}-fix-define.patch"
+)
 
 src_configure() {
 	./configure --prefix="${EPREFIX}" || die