diff options
Diffstat (limited to 'x11-plugins')
-rw-r--r-- | x11-plugins/Manifest.gz | bin | 26100 -> 26110 bytes | |||
-rw-r--r-- | x11-plugins/wmbinclock/Manifest | 4 | ||||
-rw-r--r-- | x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch | 77 | ||||
-rw-r--r-- | x11-plugins/wmbinclock/wmbinclock-0.51-r1.ebuild (renamed from x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild) | 19 | ||||
-rw-r--r-- | x11-plugins/wmsystray/Manifest | 2 | ||||
-rw-r--r-- | x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch | 55 | ||||
-rw-r--r-- | x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild | 47 |
7 files changed, 194 insertions, 10 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz Binary files differindex 1ef16acaa5d0..f7cb50546e23 100644 --- a/x11-plugins/Manifest.gz +++ b/x11-plugins/Manifest.gz diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest index 40ad0f2903e7..7ded6bb4ebfd 100644 --- a/x11-plugins/wmbinclock/Manifest +++ b/x11-plugins/wmbinclock/Manifest @@ -1,6 +1,6 @@ AUX wmbinclock-0.5-gcc-10.patch 1092 BLAKE2B 3955dcc6ac5e123bbab3e390278a88ce1038519d2d6437e67fc5784495faeb1def9658d93ba8825e46130c7e99fd362f51661b01156aeeea6f1aaf2118b91535 SHA512 86d93d7a68a8ac41eb446e3836aac5c6477814869e6b4795df521b442eabc344344dc1a5c51211ef5a74eed334bc4ca2ba443339221b81ca1e7e219acf63be66 -DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695 +AUX wmbinclock-0.5-gcc-14.patch 1801 BLAKE2B 8b72ebea5f9b859cba63f8b2bbbd4a8a31323d5987fc5d43eac3933cdaa432e25abebcfa3062b7ed1e81a5f9873841014d46f8863c65d52c0bc8d48e58cbaf49 SHA512 e50abfebd450be091201cf443f670691e76516ccb9e1d2b1ac4eafa97ee8786571c1e08598c81b0015278f902934adc10d79db39fc8f0efa8f5f4cf2697eafc4 DIST wmbinclock-0.51.tar.gz 11501 BLAKE2B f727a9497a452525bf08daf1a30e8485ca85777a0b938c45634a779cd1adb92afd172ec9455b46e832761d8a45df7a57a4bd93ebbeaa4637da5edb6087f7e30c SHA512 343ac121c93801d69beeef6b4e5ca52020229f61ac723de9b7ee7bea3fb50c51d793b217f848ba9672eb97ec1b70629186e29c27f907798af9d33d5a4faea069 -EBUILD wmbinclock-0.5-r1.ebuild 732 BLAKE2B 00e14cf50953fb63b64a561893f8218f7741d47f2ecd00684e14ee31c6ff35b3af0290fb4ba0f5b00b655cee8befa53accd997cc23c48142993160ad598cc2c5 SHA512 3158421fef786e9f2554faee07c3a625f65f332e8ea53799f5bf4b4652de5650ae44436a4c88c63c5201c8930f17da73326e9a6827708d67b347250d6732bef7 +EBUILD wmbinclock-0.51-r1.ebuild 763 BLAKE2B 25d7d61caf6df7ca7b657e4da56f1d23a4078cbe57e723a1d30b99c2488e192fb023e8b1c41a19ebba6544d809b37bd6a8ef00629a73ad2775a995823ebc3866 SHA512 db9d931f22885b5845efac23ce543f1de302fe535e29f4086f515229fb5ba04372aa68ca7d09831bdadb6ce7284789ee5e220271a69af077925af88c8df811f1 EBUILD wmbinclock-0.51.ebuild 720 BLAKE2B 572830dd499a43779ad3f022449c79c305a87b13645d7f320e870764c8b751164d2898577e70775ad2c228520838c599bdbebce49a16b5740b1a3fdfb862674e SHA512 b6ba19fa5cd924940d435de034f00c35e45bc89a6db9a143579d9e4ad4c0494e64840a03992aefb2800ddd45956c91b38b5ef6c0f227cad577b652161cfde5de MISC metadata.xml 537 BLAKE2B 755ad53b17327828a1877c0a9f911cea571cbd90e2368075061fa09e41d69d72be397b11a010239e85855da4b2f711fad1a8ab3993c2af2fe0e24c148eda4722 SHA512 75f5cd11f71309afb91277e84bd9f3e849aaa86b8069cb66acb1073409dd1c32a3b3903b388d5486053fe0cc42710019dd0c8cbd649cd28ba4e8794f8fa8eadb diff --git a/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch new file mode 100644 index 000000000000..80e8b99dbf54 --- /dev/null +++ b/x11-plugins/wmbinclock/files/wmbinclock-0.5-gcc-14.patch @@ -0,0 +1,77 @@ +https://bugs.gentoo.org/877109 +fix type confusion +also add fix glib feature macro for usleep +diff -ru a/wmBinClock.c b/wmBinClock.c +--- a/wmBinClock.c 2025-01-05 11:53:41.163293987 +0400 ++++ b/wmBinClock.c 2025-01-05 11:55:33.251648423 +0400 +@@ -6,6 +6,7 @@ + * Copyright (C) 2015 - Thomas Kuiper <tkuiper at inxsoft.net> and Sune Molgaard <sune at molgaard.org> (BSD license) + */ + ++#define _DEFAULT_SOURCE + #include <stdio.h> + #include <unistd.h> + #include <stdlib.h> +@@ -66,7 +67,7 @@ + int DisplayDepth; + GC NormalGC; + +-void IntToBinary(int x, int *str[]); ++void IntToBinary(int x, int str[]); + void PrintHelp(char err[]); + + int main(int argc, char *argv[]) +@@ -667,7 +668,7 @@ + } + + tmp_hour = tmworld->tm_hour; +- IntToBinary(tmp_hour, &tmp_str); ++ IntToBinary(tmp_hour, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -678,7 +679,7 @@ + } + + tmp_minute = tmworld->tm_min; +- IntToBinary(tmp_minute, &tmp_str); ++ IntToBinary(tmp_minute, tmp_str); + for (s = 0; s < 6; s++) + { + if (tmp_str[s] == 1) +@@ -688,7 +689,7 @@ + } + + tmp_second = tmworld->tm_sec; +- IntToBinary(tmp_second, &tmp_str); ++ IntToBinary(tmp_second, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -699,7 +700,7 @@ + } + + tmp_day = tmworld->tm_mday; +- IntToBinary(tmp_day, &tmp_str); ++ IntToBinary(tmp_day, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -710,7 +711,7 @@ + } + + tmp_month = tmworld->tm_mon + 1; +- IntToBinary(tmp_month, &tmp_str); ++ IntToBinary(tmp_month, tmp_str); + + for (s = 0; s < 6; s++) + { +@@ -780,7 +781,7 @@ + usleep(DELAY); + } + } +-void IntToBinary(int x, int *str[]) ++void IntToBinary(int x, int str[]) + { + int i = 0; + int counter = 0; diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.51-r1.ebuild index f74bf755749f..f95e8c142994 100644 --- a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild +++ b/x11-plugins/wmbinclock/wmbinclock-0.51-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="a nifty little binary clock dockapp" HOMEPAGE="https://www.dockapps.net/wmbinclock" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND="x11-libs/libX11 x11-libs/libXpm @@ -19,7 +19,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-base/xorg-proto" -PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.5-gcc-10.patch + "${FILESDIR}"/${PN}-0.5-gcc-14.patch +) +DOCS=( CHANGELOG README.md ) src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \ @@ -29,6 +33,5 @@ src_compile() { src_install() { dobin wmBinClock - dosym wmBinClock /usr/bin/${PN} - dodoc CHANGELOG README + einstalldocs } diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest index ebb45940fcba..595f22a17f5f 100644 --- a/x11-plugins/wmsystray/Manifest +++ b/x11-plugins/wmsystray/Manifest @@ -1,7 +1,9 @@ AUX wmsystray-0.1.1-Makefile.patch 1780 BLAKE2B aba3c3844f906d3f4afcc41c6fad4c424b11325bbf02e1a0b81886f63946caa0c607cd1d4b8158b5544e782d4a35cfb5d80d78e8a0c0fa466d1bc56ebfa7c11d SHA512 9cc1201dda867b7a45512b83231d63f90c4632bcb762895dd87f1febb1f7fbb85755c7053050dc959ed32b5352025aa9bd75d905d139ae947a43cedccb10740b AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570 +AUX wmsystray-0.1.1-implicit-function.patch 1884 BLAKE2B 9996637025d22fd22a97d21370a5d963ab68c502051e3b6602c0240bb261c47952b243105e5bafafc3124a4d58ef70b7d61604eca16304c599565bf801173c41 SHA512 e6644078b97b3f547ed853925e95a7637eef7b5635221534a771706f9407fdf18a38e69ecc3b7c2c22c54fdb0b53a62ad7f8258bdf3c46ea0a9ffd3eb82f5c1d AUX wmsystray-0.1.1-return-type.patch 476 BLAKE2B 6bee7cbfd4f78db1034fad7e7d635b3e9b7ece29909454ff6dfc82dc40da0636a2154586a52ed0e53965895d9e5019301fb0fb9247f8f0df31f1879ed71b66fc SHA512 93a19b7e462989e7333ab6e27f600c608d784a16eab8e1ea57155b0bcae95938534c0bc8df9026e3f38ba4cd362ea7509f49c396aecfb70d0de0f0d9dc87cdd7 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604 EBUILD wmsystray-0.1.1-r1.ebuild 1075 BLAKE2B 2ca01fe2ac8b9f934545fa359710f93e0156d7b76d7647c42d48e78c86fd0694bd82117a5e744ea9622fc6a444806f6f40890eb31990c0329e43f3df7e34dc9e SHA512 97e96278b6939fa590d2b71ee67e5a21a9e5c0f0decf137b1ed83c0d620bcaa7c8ba7687a3a8afa337766b3e1420b3c8cf3bbe4bdf36525cf2752b39d9e7a7d2 +EBUILD wmsystray-0.1.1-r2.ebuild 1122 BLAKE2B aafb6538848ab78b0895e80374b3b83e38f15533e8119e75f8213c332d979a2066ecba45d601f0e0c7a3d8400e1f2ebfc9215edbb081255a1f1149e99b31aff0 SHA512 944bfc28b99a12c933ec46c11729749977f1549e09e1b27cb6ebf4471cf31814c1892f589fcf40ccfa649cec8d545aae95b01b38d88450926a0842c75a1b4186 MISC metadata.xml 337 BLAKE2B ffe8ccdd01e848fe32b47e9a3ef85926a5d6ec7f0fa3289b6316036ce2b2b7f6b5de667e19dff44ab82c1d165084196b4ea3eeae46770f55caa000b92680dfd1 SHA512 7d6f8d0b4594cf4a8b22db9ad0bba4f392ced37d9dc5f7e5c579dd511c1a21689079c1b0a27ed659ab80d033fcbc9a62657d1cf65ca6d41e77192a09eebd9ea4 diff --git a/x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch b/x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch new file mode 100644 index 000000000000..4496bb47df67 --- /dev/null +++ b/x11-plugins/wmsystray/files/wmsystray-0.1.1-implicit-function.patch @@ -0,0 +1,55 @@ +bug https://bugs.gentoo.org/876346 +diff -ru a/wmsystray/systray.h b/wmsystray/systray.h +--- a/wmsystray/systray.h 2025-01-04 23:45:21.765262521 +0400 ++++ b/wmsystray/systray.h 2025-01-04 23:48:21.590340299 +0400 +@@ -36,5 +36,7 @@ + int event_is_systray_event(XEvent *ev); + int handle_systray_event(XEvent *ev); + void repaint_systray(); ++struct systray_item *find_systray_item (Window id); ++int systray_property_update (struct systray_item *item); + + #endif +diff -ru a/wmsystray/ui.c b/wmsystray/ui.c +--- a/wmsystray/ui.c 2025-01-04 23:45:21.765262521 +0400 ++++ b/wmsystray/ui.c 2025-01-04 23:49:04.894118218 +0400 +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + #include <signal.h> ++#include <unistd.h> + + #include <X11/Xlib.h> + #include <X11/Xutil.h> +diff -ru a/wmsystray/ui.h b/wmsystray/ui.h +--- a/wmsystray/ui.h 2025-01-04 23:45:21.766262516 +0400 ++++ b/wmsystray/ui.h 2025-01-04 23:48:51.661186082 +0400 +@@ -24,5 +24,6 @@ + extern Display *main_disp; + extern Window main_wind, icon_wind, sel_wind, draw_wind; + extern char * wmsystray_xpm[]; ++void draw_ui_elements(); + + #endif +--- a/xembed/xembed.c 2025-01-04 23:45:21.766262516 +0400 ++++ b/xembed/xembed.c 2025-01-04 23:46:29.884913173 +0400 +@@ -2,6 +2,8 @@ + xembed.c + ****************************************************************************/ + ++#include <string.h> ++ + #include <X11/Xlib.h> + #include <X11/Xutil.h> + #include "xembed.h" +diff -ru a/wmsystray/Makefile b/wmsystray/Makefile +--- a/wmsystray/Makefile 2025-01-05 00:02:39.013943053 +0400 ++++ b/wmsystray/Makefile 2025-01-05 00:07:41.053394062 +0400 +@@ -1,6 +1,6 @@ + include ../Rules.make + +-CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g ${EXTRACFLAGS} ++CFLAGS = ${X11CFLAGS} -DTRACE_LEVEL=${TRACE_LEVEL} -I../xembed -g -D_POSIX_C_SOURCE=199309L -D_XOPEN_SOURCE=500 ${EXTRACFLAGS} + LDFLAGS = ${X11LDFLAGS} -lXpm + + OBJS = main.o ui.o systray.o xpms.o diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild new file mode 100644 index 000000000000..d6047f1b921c --- /dev/null +++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications" +HOMEPAGE="https://github.com/bbidulock/wmsystray" +SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2" + +RDEPEND="x11-libs/libX11 + x11-libs/libXpm" +DEPEND="${RDEPEND}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +PATCHES=( + "${FILESDIR}/${P}-Makefile.patch" + "${FILESDIR}/${P}-gcc-3.4.patch" + "${FILESDIR}/${P}-return-type.patch" + "${FILESDIR}/${P}-implicit-function.patch" +) + +DOCS=( README HACKING AUTHORS ) + +src_prepare() { + default + # Fix parallel compilation + sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile || die + + # Honour Gentoo LDFLAGS, see bug #336296 + sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" EXTRACFLAGS="${CFLAGS}" +} + +src_install() { + dobin ${PN}/${PN} + doman doc/${PN}.1 + domenu "${FILESDIR}/${PN}.desktop" + einstalldocs +} |