[gentoo-commits] repo/gentoo:master commit in: x11-misc/cairo-clock/files/, x11-misc/cairo-clock/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/cairo-clock/files/, x11-misc/cairo-clock/

[David Seifert]

commit:     5a2369ba50c77d52d20e5553e993c88ec2fc449f
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Feb 27 09:21:58 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 20:43:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2369ba

x11-misc/cairo-clock: EAPI bump 4 -> 6, fix #452106

Gentoo-Bug: https://bugs.gentoo.org/452106

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4091

 x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild      |  4 ++--
 ...ck-0.3.4.ebuild => cairo-clock-0.3.4-r1.ebuild} | 17 +++++++++++------
 .../files/cairo-clock-0.3.4-desktop.patch          | 18 ++++++++++++++++++
 .../files/cairo-clock-0.3.4-linker.patch           | 22 ++++++++++++++++++++++
 4 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
index e2471b3ae89..c4609d99d9c 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -6,7 +6,7 @@ EAPI=2
 inherit autotools base
 
 DESCRIPTION="An analog clock displaying the system-time"
-HOMEPAGE="http://macslow.thepimp.net/?page_id=23"
+HOMEPAGE="https://launchpad.net/cairo-clock"
 SRC_URI="http://macslow.thepimp.net/projects/${PN}/${PN}_${PV}-1.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
similarity index 66%
rename from x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild
rename to x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
index 786624c702d..beeae3cafbb 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="An analog clock displaying the system-time"
-HOMEPAGE="http://macslow.net/?page_id=23"
+HOMEPAGE="https://launchpad.net/cairo-clock"
 SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -23,9 +25,12 @@ DEPEND="${DEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-DOCS=( AUTHORS NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-linker.patch
+)
 
 src_prepare() {
-	# cc: error: unrecognized option '--export-dynamic'
-	sed -i -e '/cairo_clock_LDFLAGS/s:=.*:= -rdynamic:' src/Makefile.in || die
+	default
+	eautoreconf
 }

diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-desktop.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-desktop.patch
new file mode 100644
index 00000000000..5228776a00e
--- /dev/null
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-desktop.patch
@@ -0,0 +1,18 @@
+diff -u desktop/cairo-clock.desktop desktop2/cairo-clock.desktop
+--- a/desktop/cairo-clock.desktop
++++ b/desktop/cairo-clock.desktop
+@@ -37,4 +37,4 @@
+ Comment[zh_TW]=一個超好用的類比時鐘
+ Exec=cairo-clock
+ Icon=cairo-clock
+-Categories=GNOME;Application;Utility;
++Categories=GNOME;Utility;
+diff -u desktop/cairo-clock.desktop.in desktop2/cairo-clock.desktop.in
+--- a/desktop/cairo-clock.desktop.in
++++ b/desktop/cairo-clock.desktop.in
+@@ -5,4 +5,4 @@
+ _Comment=a super fine analog clock
+ Exec=cairo-clock
+ Icon=cairo-clock
+-Categories=GNOME;Application;Utility;
++Categories=GNOME;Utility;

diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-linker.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-linker.patch
new file mode 100644
index 00000000000..bdd1a7bc8b1
--- /dev/null
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-linker.patch
@@ -0,0 +1,22 @@
+From 9e1575324da26ef15143ab2dd38f61af222576b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mirco=20M=C3=BCller?= <macslow@gmail.com>
+Date: Thu, 9 Feb 2017 01:02:03 +0100
+Subject: [PATCH] Updated linker-options so ld is happy.
+
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7057198..fd88852 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = cairo_clock
+ transform = s/_/-/g
+ 
+-cairo_clock_LDFLAGS = -Wl, --export-dynamic
++cairo_clock_LDFLAGS = -Wl,-export-dynamic
+ 
+ cairo_clock_LDADD =	\
+ 	$(GLIB_LIBS)	\

[gentoo-commits] repo/gentoo:master commit in: x11-misc/cairo-clock/files/, x11-misc/cairo-clock/

[Sam James]

commit:     14a99c5debae88a163d657ec2ffe65d19202bba7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  4 14:50:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 15:10:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14a99c5d

x11-misc/cairo-clock: don't redefine _FORTIFY_SOURCE

Closes: https://bugs.gentoo.org/898240
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild   | 49 ++++++++++++++++++++++
 .../files/cairo-clock-0.3.4-fortify-source.patch   | 16 +++++++
 2 files changed, 65 insertions(+)

diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild
new file mode 100644
index 000000000000..fa63e6bff82c
--- /dev/null
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An analog clock displaying the system-time"
+HOMEPAGE="https://launchpad.net/cairo-clock"
+SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.8
+	>=gnome-base/libglade-2.6
+	>=gnome-base/librsvg-2.14
+	>=x11-libs/cairo-1.2
+	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/pango-1.10
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for F_S patch
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-linker.patch
+	"${FILESDIR}"/${P}-fortify-source.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	gzip -d "${ED}"/usr/share/man/man1/cairo-clock.1.gz || die
+}

diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch
new file mode 100644
index 000000000000..c10461b47f35
--- /dev/null
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch
@@ -0,0 +1,16 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/898240
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,9 @@ CLOCK_DEFINES='-DDATA_DIR="\"$(datadir)\"" -DPKGDATA_DIR="\"$(pkgdatadir)\""'
+ AC_SUBST([CLOCK_DEFINES])
+ 
+ dnl CFLAGS
+-CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0 -D_FORTIFY_SOURCE=2"
++CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0"
++
++AX_ADD_FORTIFY_SOURCE
+ 
+ AC_CONFIG_FILES([
+ 	Makefile