From 5a2a5572ac35843b9cd1c9369bd96e117647d24f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Oct 2023 09:55:38 +0100 Subject: gentoo auto-resync : 16:10:2023 - 09:55:38 --- x11-plugins/Manifest.gz | Bin 26922 -> 26925 bytes x11-plugins/astime/Manifest | 7 ++- x11-plugins/astime/astime-2.8-r2.ebuild | 4 +- x11-plugins/astime/astime-2.8-r3.ebuild | 56 +++++++++++++++++++++ .../astime-2.8-fix-implicit-function-decl.patch | 17 +++++++ ...time-2.8-remove-double-config.h-autotools.patch | 27 ++++++++++ .../astime/files/astime-2.8-respect-ldflags.patch | 11 ++++ x11-plugins/astime/files/respect-ldflags.patch | 11 ---- 8 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 x11-plugins/astime/astime-2.8-r3.ebuild create mode 100644 x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch create mode 100644 x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch create mode 100644 x11-plugins/astime/files/astime-2.8-respect-ldflags.patch delete mode 100644 x11-plugins/astime/files/respect-ldflags.patch (limited to 'x11-plugins') diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz index aaaf366ee3a6..37056e04c159 100644 Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ diff --git a/x11-plugins/astime/Manifest b/x11-plugins/astime/Manifest index d55b5f8ecc37..f3332944b3a4 100644 --- a/x11-plugins/astime/Manifest +++ b/x11-plugins/astime/Manifest @@ -1,4 +1,7 @@ -AUX respect-ldflags.patch 402 BLAKE2B 959b2ed794c9fe673d48125f55322df2c2abbc3342cba6b395727e0fcf2e96d498c2a8dece91101258f75e11096e722257e63e68b5c4df7cfa330dba207489c8 SHA512 8aed924b8b45b8a0b6760f8b97e4d633819167b317063cb5ae1c7a87e0f79bed583f7f05dc288db889ce9c24dacd921a994c4ea7a7a508068b09d813b4b46c3d +AUX astime-2.8-fix-implicit-function-decl.patch 399 BLAKE2B f115752d6d0a834d4de437606e625c58a58229054700f329d19c934aec2f2a1fce91a276c13f99124f9a3da3957af7e0d763789b4e3f0f4f4884ddac7b5177b3 SHA512 99a6672a70d2727fe7e35a5be8a9a1046b6f8e4bd9e71359d8dc661e398d2c0320803d4a50e1fcced2b6bf6efbf58f2b43bf0deae25b7ca2467ec944f8809650 +AUX astime-2.8-remove-double-config.h-autotools.patch 812 BLAKE2B 6a149e296792b4770bba60de2add1cd9820c187e662654a5f2a55590e4edf587edab47238a25a3406cfaebd9488847ea39d2d1193eca296ae9e3a35f601af388 SHA512 955237e1cc494e6c046342a4b0507028d07b705e7a41d64cf695a7f6e1ff6608429966c7adeb5a31c934c4c770d711311489f17520978645930029b04ed10284 +AUX astime-2.8-respect-ldflags.patch 402 BLAKE2B 959b2ed794c9fe673d48125f55322df2c2abbc3342cba6b395727e0fcf2e96d498c2a8dece91101258f75e11096e722257e63e68b5c4df7cfa330dba207489c8 SHA512 8aed924b8b45b8a0b6760f8b97e4d633819167b317063cb5ae1c7a87e0f79bed583f7f05dc288db889ce9c24dacd921a994c4ea7a7a508068b09d813b4b46c3d DIST astime-2.8.tar.gz 49679 BLAKE2B 3c0aeee5ae2202b682c6cc0c08704f047e9d1204802fbbfaac78dee2821aa59924fd08cab1ded0167be65c05877ef2a8fe527c3371a2e1a871cd3eb18767ae8f SHA512 e1bd185343c5c55cc6e4fc64599c71a8a523f02eb3d8aa0e4f69d8fbf9038d217a8b9fa943916a97759fa2c9827cab6159c1b497fa78b366f3641b46dd71e792 -EBUILD astime-2.8-r2.ebuild 685 BLAKE2B fe8df88ac26f8af0ced466eddf238a6d88320bea37709145246c519ad8f2b2eb31a6c2dc17f15274fc0246fced6086e08cabbb3421bc39458a1d42e6e569c00c SHA512 6218d6787065302bcb07de7fdbd79501341f11a58a33cb7da6db491a262150f7b895aff532d7a4868de14a8d3a7c351928d70f03e8a2b42fcbff130376175df4 +EBUILD astime-2.8-r2.ebuild 690 BLAKE2B c4d64777fa7284108e2a1995ccd330e4bacbc502f2eed4d72241317de098b514c6bc99b69327f816cb4dabd4865bc5f66b71ce22b27a79bdaafc40cbfa44a845 SHA512 9b6498e4fea8c7451b927eace16abfc37a48acce8df8fd1004c9be395f2e3c0765181ced09b35ef6325be3b7896cac27334e4c4ddbe2b1ccaabb437115c92a72 +EBUILD astime-2.8-r3.ebuild 1079 BLAKE2B 3ee3c76b880489a2a94f2f7ae0427c5d1383a5d0d5371195f8060ec8c28ffaed39d1ffb2c8880a83be84e52952121804f2fd7e7c74ed14ad6f556bcb6970cc59 SHA512 8ea0ad3e01ce95de97e2401839cdf739f6760a7945748f865da0d56e93ef0781ab67cb6a238d6da33564185fc540f350adafb7c2b3d5363fc1ca0a2896c63bd1 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild b/x11-plugins/astime/astime-2.8-r2.ebuild index 030c08793e3d..423b8d075323 100644 --- a/x11-plugins/astime/astime-2.8-r2.ebuild +++ b/x11-plugins/astime/astime-2.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND="x11-libs/libXpm DEPEND="${RDEPEND} x11-base/xorg-proto" -PATCHES=( "${FILESDIR}/respect-ldflags.patch" ) +PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch" ) src_configure() { econf $(use_enable jpeg) diff --git a/x11-plugins/astime/astime-2.8-r3.ebuild b/x11-plugins/astime/astime-2.8-r3.ebuild new file mode 100644 index 000000000000..418ad38751ca --- /dev/null +++ b/x11-plugins/astime/astime-2.8-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Analogue clock utility for X Windows" +HOMEPAGE="https://tigr.net/afterstep/applets/ http://www.afterstep.org/" +SRC_URI="http://www.tigr.net/afterstep/download/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="jpeg" + +RDEPEND=" + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm + jpeg? ( media-libs/libjpeg-turbo:= ) +" + +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${P}-respect-ldflags.patch" + "${FILESDIR}/${P}-remove-double-config.h-autotools.patch" + "${FILESDIR}/${P}-fix-implicit-function-decl.patch" +) + +src_prepare() { + default + cd "${S}/autoconf" || die + eautoreconf + cp "${S}/autoconf/configure" "${S}/" || die +} + +src_configure() { + econf $(use_enable jpeg) --with-xpm-library=/usr/$(get_libdir) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin "${PN}" + newman "${PN}.man" "${PN}.1" + einstalldocs +} diff --git a/x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch b/x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch new file mode 100644 index 000000000000..2db4db842685 --- /dev/null +++ b/x11-plugins/astime/files/astime-2.8-fix-implicit-function-decl.patch @@ -0,0 +1,17 @@ +File uses implicit declaration of a library function. This is not allow with clang16s default settings. + +Bug: https://bugs.gentoo.org/882175 +Patch has been sent to upstream via mail + +# Pascal Jäger (2023-09-18) + +--- a/astime_x.c ++++ b/astime_x.c +@@ -11,6 +11,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch b/x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch new file mode 100644 index 000000000000..bcfba897fcb8 --- /dev/null +++ b/x11-plugins/astime/files/astime-2.8-remove-double-config.h-autotools.patch @@ -0,0 +1,27 @@ +In order to do a full eautoreconf we need to remove the double declarations of config.h in configure.in + +Bug: https://bugs.gentoo.org/874714 +Bug: https://bugs.gentoo.org/898458 +Patch has been sent to upstream via mail + +# Pascal Jäger (2023-09-18) + +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -60,7 +60,6 @@ AC_PATH_XTRA + AC_CHECK_HEADERS(sys/wait.h sys/time.h) + AC_CHECK_HEADERS(sys/statvfs.h sys/vfs.h sys/mount.h ustat.h) + AC_CHECK_HEADERS(machine/soundcard.h linux/soundcard.h linux/radio.h) +-AC_CONFIG_HEADER(config.h) + + dnl# Check for X + +@@ -120,8 +119,6 @@ AC_SUBST(with_afterdir) + + dnl# Write results + +-AC_CONFIG_HEADER(config.h) +- + dnl# Common parts of the Makefile + MAKEFILEDEFINES=./autoconf/Makefile.defines + MAKEFILECOMMON=./autoconf/Makefile.common diff --git a/x11-plugins/astime/files/astime-2.8-respect-ldflags.patch b/x11-plugins/astime/files/astime-2.8-respect-ldflags.patch new file mode 100644 index 000000000000..09325594f242 --- /dev/null +++ b/x11-plugins/astime/files/astime-2.8-respect-ldflags.patch @@ -0,0 +1,11 @@ +--- a/autoconf/Makefile.common.in 1999-05-02 17:12:39.000000000 +0200 ++++ b/autoconf/Makefile.common.in 2013-03-24 16:16:27.494987496 +0100 +@@ -34,7 +33,7 @@ + done + + $(PROG): $(OBJS) +- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) ++ $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS) + + .c.o: + $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c diff --git a/x11-plugins/astime/files/respect-ldflags.patch b/x11-plugins/astime/files/respect-ldflags.patch deleted file mode 100644 index 09325594f242..000000000000 --- a/x11-plugins/astime/files/respect-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/autoconf/Makefile.common.in 1999-05-02 17:12:39.000000000 +0200 -+++ b/autoconf/Makefile.common.in 2013-03-24 16:16:27.494987496 +0100 -@@ -34,7 +33,7 @@ - done - - $(PROG): $(OBJS) -- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) -+ $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@) $(LDFLAGS) - - .c.o: - $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -- cgit v1.2.3