commit:     94ae89d1b044c24138d5c8903df68e9654a5462f
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Fri Jan 31 08:08:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 08:52:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ae89d1

x11-misc/trayer-srg: fix build with modern C

Missing argument in function declaration in header.
Drops old, unpatched revision.

Closes: https://bugs.gentoo.org/944020
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40394
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/trayer-srg-1.1.8-fix-define.patch        | 13 ++++++++
 x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild     | 38 ----------------------
 x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild     |  7 ++--
 3 files changed, 18 insertions(+), 40 deletions(-)

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..a7d74142df61 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

Reply via email to