diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2011-09-24 11:48:10 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2011-09-24 11:48:10 +0000 |
| commit | 7d8ac434fcb3a1e0fe8ee881c3f90cea0b91e1a9 (patch) | |
| tree | 8563204a68ec0aab24d178287c406edef589c4a4 /x11-misc | |
| parent | Remove <herd>no-herd</herd>. (diff) | |
| download | gentoo-2-7d8ac434fcb3a1e0fe8ee881c3f90cea0b91e1a9.tar.gz gentoo-2-7d8ac434fcb3a1e0fe8ee881c3f90cea0b91e1a9.tar.bz2 gentoo-2-7d8ac434fcb3a1e0fe8ee881c3f90cea0b91e1a9.zip | |
Debian patch scavenged by Pacho Ramos enables building on GCC 4.6; closes bug #362261 by Diego Elio Pettenò.
(Portage version: 2.1.10.18/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/cairo-clock/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild | 11 | ||||
| -rw-r--r-- | x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch | 12 |
3 files changed, 28 insertions, 2 deletions
diff --git a/x11-misc/cairo-clock/ChangeLog b/x11-misc/cairo-clock/ChangeLog index 139fdb817e0c..45003f173553 100644 --- a/x11-misc/cairo-clock/ChangeLog +++ b/x11-misc/cairo-clock/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/cairo-clock # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/cairo-clock/ChangeLog,v 1.9 2011/03/02 18:41:04 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/cairo-clock/ChangeLog,v 1.10 2011/09/24 11:48:10 chainsaw Exp $ + + 24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> cairo-clock-0.3.3.ebuild, + +files/cairo-clock-0.3.3-gcc46.patch: + Debian patch scavenged by Pacho Ramos enables building on GCC 4.6; closes bug + #362261 by Diego Elio Pettenò. 02 Mar 2011; Kevin McCarthy <signals@gentoo.org> cairo-clock-0.3.3.ebuild: Reverting previous unnecessary commit 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 195c82f64542..6f0ef172c6ce 100644 --- a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild +++ b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild,v 1.5 2011/03/02 18:41:04 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild,v 1.6 2011/09/24 11:48:10 chainsaw Exp $ EAPI=2 +inherit autotools base + DESCRIPTION="An analog clock displaying the system-time." HOMEPAGE="http://macslow.thepimp.net/?page_id=23" SRC_URI="http://macslow.thepimp.net/projects/${PN}/${PN}_${PV}-1.tar.gz" @@ -12,6 +14,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~x86 ~x86-fbsd" IUSE="" +PATCHES=( "${FILESDIR}/${P}-gcc46.patch" ) RDEPEND="dev-libs/glib:2 gnome-base/libglade @@ -24,6 +27,12 @@ DEPEND="${DEPEND} dev-util/intltool sys-devel/gettext" +src_prepare() { + base_src_prepare + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS BUGS ChangeLog NEWS README TODO diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch new file mode 100644 index 000000000000..76569cc84260 --- /dev/null +++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch @@ -0,0 +1,12 @@ +diff -uNr cairo-clock-0.3.3.ORIG/src/Makefile.am cairo-clock-0.3.3/src/Makefile.am +--- cairo-clock-0.3.3.ORIG/src/Makefile.am 2011-09-24 12:42:48.862380207 +0100 ++++ cairo-clock-0.3.3/src/Makefile.am 2011-09-24 12:43:29.135381441 +0100 +@@ -1,7 +1,7 @@ + bin_PROGRAMS = cairo_clock + transform = s/_/-/g + +-cairo_clock_LDFLAGS = -Wl, --export-dynamic ++cairo_clock_LDFLAGS = -rdynamic + + cairo_clock_LDADD = \ + $(GLIB_LIBS) \ |