gentoo auto-resync : 05:12:2022 - 03:04:53

3 files changed, 63 insertions, 0 deletions

diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index ca47700a4880..d84a6efac86e 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -1,8 +1,10 @@
 AUX trayer-1.0-as-needed-and-pre-stripped.patch 300 BLAKE2B d941ab99841ed60de03866e53be1ea517dd6a7fc10bd10aed053b8ef378cd85e2b65e5da1fa1cb0701970d6d3a287777ed292118486d48af7de0bb32999f4f65 SHA512 5dac4a877f32fa63d18013c8c67666520ceac51de55a2e42c5f03db60487e82b7aac2f43e07ba40e7f2ff48e7fca56f11eee6eb90759db37cd0722164f14cc9f
 AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 745 BLAKE2B 8fc70b5b9bf8d0764e0da5138cb89a57874e5987f2531ea72837aeaf152db98312d774bb1c7692c3e935ccf90133c05f3dd5bdaac1db0092bdaa528c0a401db7 SHA512 48efbf9de7c608fa4981e658eb815ef5d40e113ef85363bd09db7ed8a09ea807b38b359380f8f5499e4e9e996cd1a6d3f26dce4a5348a654aa67a6a6d0e75d73
 AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a808c16b0ca6400face67330b0e3feeeb633a25f8e6ecc542f3fba59d9b48b2673c3162e4c3797fd29b32aba77af110d6432f44 SHA512 b17ea529431e36e82c5aaab6548410a1f839d978ece5ca42ac90732ca899012b9b871a5b9a37d3b2ee05238222c02b1ac4c6edbdb70f6a04e39267fce1c2fba0
+AUX trayer-1.0-fix-incompatible-pointer-types.patch 331 BLAKE2B 35416ddcbf32588ab4c238b4fdeb3e559a4313730aa53a5ec19093a3f6c47f1311e50b5f37467aa7637e9e2b35537d9358bcc7f16ee141ecd0d762424f8b312e SHA512 ba7bb5fe0d310e346ee3520387363f6a4b5a8bbbfcd9fb69f467311b5fbfbe91c56dff5c75d633fa2ebfebaec45a760dfdbdae50639c0b84ee5d47bb1ce4d85e
 AUX trayer-1.0-fno-common.patch 167 BLAKE2B 31ec6428dc5732fba6f165e71483573668dd6efa658785cbe6d1f7a52cf030ee1ce288ced90b673210b49302c57cb62471f95d3be16a41d350d3273064f64027 SHA512 9a15a1905e33676bef0eee7426a07223a8ee59089ab63888e35c8035b1c7dcdeabdffd59e9df55369b7e1475cda1b341725fc9e3dfae31dd26101fb7c922da55
 AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
 DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
 EBUILD trayer-1.0-r4.ebuild 1035 BLAKE2B bd09726103477c85a99d17cfcac65a00c0a139869a3fdd1178b8e662750663d329c6bc79c9f9213e59af7f391534faff42a9a7aca320c04798f5d000bd34d529 SHA512 462d5a2667996c6ee532e992d734a9c3d850fabf86be33b6f707daa450277afe42604669395f9c58a8fbe7a558e1303cb92a7014275363025f4b4319022b7484
+EBUILD trayer-1.0-r5.ebuild 1096 BLAKE2B bac5980b5918c77f59634534bfa307ec04b6049ea6685f7cf282c8309f98f8c9ffe90874a68b52d6cc5926e5d17d4fb4158906bdf4de2c2cab6f64cee30a5a8d SHA512 e0392ab83e61f4bb20fea8f96377203f706a4addfd6aa70bf8409ec8e1dae5ff85c8eb8329f70c1ee9e3b13fa01eb51c1a21ea2566f74281aaa7d515cfe09ed7
 MISC metadata.xml 221 BLAKE2B 2bdd4cc2d7f7a4fb627addf3608926b0ec64c4e8f5b764c625482fa803b883ccc5a4d89ce3f0190bbd5772ed719455c46ffd6c4674adcff6044642ce50d8592d SHA512 4d656cd01a75b528e757bfda686503d56ec9753562c6c52fedbd1f897285fd6cce36da0beba020875e29b8e240821456a4ebf26ccda72b8aac6456d8aa8b6a8c
diff --git a/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..e2d750641214
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
@@ -0,0 +1,19 @@
+Clang16 will not allow incompatible pointer types by default.
+
+Bug: https://bugs.gentoo.org/881081
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/plugin.h
++++ b/plugin.h
+@@ -9,6 +9,8 @@
+ #include <stdio.h>
+ #include "panel.h"
+ 
++struct _plugin;
++
+ typedef struct {
+     /* common */
+     char *fname;
+-- 
+2.38.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild
new file mode 100644
index 000000000000..051d15d92456
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
+SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+	"${FILESDIR}"/${P}-dont-include-libXmu.patch
+	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-fix-incompatible-pointer-types.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray
+	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+	dobin trayer
+	doman "${FILESDIR}"/trayer.1
+	einstalldocs
+}