From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B3C5158089 for ; Wed, 4 Oct 2023 15:29:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3E3C2BC04F; Wed, 4 Oct 2023 15:28:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A48242BC04F for ; Wed, 4 Oct 2023 15:28:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5B82335D4D for ; Wed, 4 Oct 2023 15:28:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E590983 for ; Wed, 4 Oct 2023 15:28:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1696432244.14a99c5debae88a163d657ec2ffe65d19202bba7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/cairo-clock/files/, x11-misc/cairo-clock/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch X-VCS-Directories: x11-misc/cairo-clock/ x11-misc/cairo-clock/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 14a99c5debae88a163d657ec2ffe65d19202bba7 X-VCS-Branch: master Date: Wed, 4 Oct 2023 15:28:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9a470198-1241-46e1-a694-f86993af0278 X-Archives-Hash: 41f0a3e98a76ae21c0a397247e7a5a09 commit: 14a99c5debae88a163d657ec2ffe65d19202bba7 Author: Sam James gentoo org> AuthorDate: Wed Oct 4 14:50:59 2023 +0000 Commit: Sam James gentoo 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 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