Debian patch scavenged by Pacho Ramos enables building on GCC 4.6; closes bug #362261...

Package-Manager: portage-2.1.10.18/cvs/Linux x86_64

diff --git a/x11-misc/cairo-clock/ChangeLog b/x11-misc/cairo-clock/ChangeLog
index 139fdb817e0c100a1a23e4ea0351c7367a406e9f..45003f1735538439b4de580a670f5de3e3b40962 100644 (file)
--- 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/Manifest b/x11-misc/cairo-clock/Manifest
index b56c34251cccba8df06155df1a533230ae451310..43bfa0052b68b896524ad80e3b0cd178be62e820 100644 (file)
--- a/x11-misc/cairo-clock/Manifest
+++ b/x11-misc/cairo-clock/Manifest
@@ -1,4 +1,5 @@
+AUX cairo-clock-0.3.3-gcc46.patch 423 RMD160 baae33821e8492d11a9cef7dbd9f4b567f43b3d2 SHA1 e9e1258dec4b7c084603e1c88378f2b05213ebfd SHA256 c708b3d18e3cd29357ac0a8872eceecabcec2b033034c270055c4f37bc86ec15
 DIST cairo-clock_0.3.3-1.tar.gz 1248398 RMD160 c5fa101a51884a04ade0185672276d5a828063f8 SHA1 921c1f6468c913ebbd692aeb5f2dde58be6b4006 SHA256 812ca12792940138ce4d154d1d0d7d1e37295cf06ac7caf02935d5ebf845dc4c
-EBUILD cairo-clock-0.3.3.ebuild 817 RMD160 096e38650a12da7939c39c7afd36a0f2419e8947 SHA1 226e5593ed877b43f100a6682dc646358326caec SHA256 8e585d7ccd2e84f6d6ac2e52c950bacf8be084b5c64e75192ddb245b60f2d052
-MISC ChangeLog 1410 RMD160 cf2a56426fdc5e522dea7572284d61358eff0a63 SHA1 2a1980839bd78ccd5dfd429465b5bd75b11ebe18 SHA256 97ad312d11ab9cfb7af1621d156a53bcc9c9188df23075aa2987d89c706b1f2e
+EBUILD cairo-clock-0.3.3.ebuild 1002 RMD160 a959adb63a64f049716ba10cdc028a4b0ae5f924 SHA1 4f2a5d56ad35c4ec5e77aaaad6d3af2e2f7cf295 SHA256 6b46f2ac72695cab95b9d3aca6840cce7b34fa969b046afa6abf18b5601fc178
+MISC ChangeLog 1641 RMD160 27251de072ea2ea714d527a1e9194dd7877e3b23 SHA1 05f3120088f90a3b892ccbc021488a446c058b39 SHA256 5350e4934a129cd4600c0f16a24e5e10803b03446c245cfed197e00fe0c5188b
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826

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 195c82f64542e956a2dab0de8ff8a029dda57e2d..6f0ef172c6ce1578b9e13e8d1473c0dc81f646ce 100644 (file)
--- 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 (file)
index 0000000..76569cc
--- /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)    \