[gentoo-commits] repo/gentoo:master commit in: x11-plugins/astime/files/, x11-plugins/astime/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/astime/files/, x11-plugins/astime/

[Michael Orlitzky]

commit:     93581e09c196fd78eaeb9b01e0d45c2c00ff60bf
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 23:55:10 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 00:08:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93581e09

x11-plugins/astime: new EAPI=6 revision that respects LDFLAGS.

This new revision is based on the ebuild submitted by Michael
Mair-Keimberger, with additional updates for EAPI=6. I have also
simplified the patch that we apply; now it contains only the addition
of LDFLAGS to the linker command. By side-stepping upstream's "make
install" target, we avoid having to patch in DESTDIR and all of that.
Doing so actually simplifies src_install() a bit, as it can be reduced
to a dobin, newman, and dodoc.

Gentoo-Bug: 337428

Package-Manager: portage-2.2.28

 x11-plugins/astime/astime-2.8-r2.ebuild        | 39 ++++++++++++++++++++++++++
 x11-plugins/astime/files/respect-ldflags.patch | 11 ++++++++
 2 files changed, 50 insertions(+)

diff --git a/x11-plugins/astime/astime-2.8-r2.ebuild b/x11-plugins/astime/astime-2.8-r2.ebuild
new file mode 100644
index 00000000..fc3803a
--- /dev/null
+++ b/x11-plugins/astime/astime-2.8-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Analogue clock utility for X Windows"
+HOMEPAGE="http://www.tigr.net/"
+SRC_URI="${HOMEPAGE}afterstep/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="jpeg"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg:0 )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+PATCHES=( "${FILESDIR}/respect-ldflags.patch" )
+
+src_configure() {
+	econf $(use_enable jpeg)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin "${PN}"
+	newman "${PN}.man" "${PN}.1"
+	einstalldocs
+}

diff --git a/x11-plugins/astime/files/respect-ldflags.patch b/x11-plugins/astime/files/respect-ldflags.patch
new file mode 100644
index 00000000..0932559
--- /dev/null
+++ b/x11-plugins/astime/files/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

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/astime/files/, x11-plugins/astime/

[Viorel Munteanu]

commit:     d475d108d33110a89a72332e35543c2448315be0
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Mon Sep 18 12:28:06 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 06:09:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d475d108

x11-plugins/astime: revbump, fix build for clang16

EAPI bump
Fix homepage

Closes: https://bugs.gentoo.org/874714
Closes: https://bugs.gentoo.org/882175
Closes: https://bugs.gentoo.org/898458
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32902
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 x11-plugins/astime/astime-2.8-r3.ebuild            | 48 ++++++++++++++++++++++
 .../astime-2.8-fix-implicit-function-decl.patch    | 17 ++++++++
 ...time-2.8-remove-double-config.h-autotools.patch | 27 ++++++++++++
 3 files changed, 92 insertions(+)

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..1c7add6ea8eb
--- /dev/null
+++ b/x11-plugins/astime/astime-2.8-r3.ebuild
@@ -0,0 +1,48 @@
+# 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/libXpm
+	x11-libs/libSM
+	jpeg? ( media-libs/libjpeg-turbo:0 )"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${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 <pascal.jaeger@leimstift.de> (2023-09-18)
+
+--- a/astime_x.c
++++ b/astime_x.c
+@@ -11,6 +11,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <math.h>
+ #include <time.h>
+ 

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 <pascal.jaeger@leimstift.de> (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