| 1 |
tetromino 13/05/01 03:22:51 |
| 2 |
|
| 3 |
Modified: ChangeLog gtk+-1.2.10-r12.ebuild |
| 4 |
Removed: gtk+-2.24.12.ebuild |
| 5 |
Log: |
| 6 |
Fix gtk+-1.2.10-r12's build failure with automake-1.13 (bug #467520, thanks to Ted Tanberry) and remove obsolete version. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.661 x11-libs/gtk+/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.661&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.661&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.660&r2=1.661 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
| 20 |
retrieving revision 1.660 |
| 21 |
retrieving revision 1.661 |
| 22 |
diff -u -r1.660 -r1.661 |
| 23 |
--- ChangeLog 23 Apr 2013 14:08:22 -0000 1.660 |
| 24 |
+++ ChangeLog 1 May 2013 03:22:51 -0000 1.661 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for x11-libs/gtk+ |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.660 2013/04/23 14:08:22 jer Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.661 2013/05/01 03:22:51 tetromino Exp $ |
| 30 |
+ |
| 31 |
+ 01 May 2013; Alexandre Rostovtsev <tetromino@g.o> |
| 32 |
+ gtk+-1.2.10-r12.ebuild, -gtk+-2.24.12.ebuild, |
| 33 |
+ +files/gtk+-1.2.10-automake-1.13.patch, -files/gtk+-2.24.10-gold.patch: |
| 34 |
+ Fix gtk+-1.2.10-r12's build failure with automake-1.13 (bug #467520, thanks |
| 35 |
+ to Ted Tanberry) and remove obsolete version. |
| 36 |
|
| 37 |
23 Apr 2013; Jeroen Roovers <jer@g.o> gtk+-2.24.17.ebuild: |
| 38 |
Stable for HPPA (bug #466510). |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.17 x11-libs/gtk+/gtk+-1.2.10-r12.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild?rev=1.17&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild?rev=1.17&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild?r1=1.16&r2=1.17 |
| 47 |
|
| 48 |
Index: gtk+-1.2.10-r12.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v |
| 51 |
retrieving revision 1.16 |
| 52 |
retrieving revision 1.17 |
| 53 |
diff -u -r1.16 -r1.17 |
| 54 |
--- gtk+-1.2.10-r12.ebuild 25 Sep 2012 15:19:35 -0000 1.16 |
| 55 |
+++ gtk+-1.2.10-r12.ebuild 1 May 2013 03:22:51 -0000 1.17 |
| 56 |
@@ -1,7 +1,8 @@ |
| 57 |
-# Copyright 1999-2012 Gentoo Foundation |
| 58 |
+# Copyright 1999-2013 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.16 2012/09/25 15:19:35 tetromino Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.17 2013/05/01 03:22:51 tetromino Exp $ |
| 62 |
|
| 63 |
+EAPI=4 |
| 64 |
GNOME_TARBALL_SUFFIX="gz" |
| 65 |
inherit gnome.org eutils toolchain-funcs autotools |
| 66 |
|
| 67 |
@@ -19,7 +20,7 @@ |
| 68 |
MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi" |
| 69 |
IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" |
| 70 |
|
| 71 |
-RDEPEND="=dev-libs/glib-1.2* |
| 72 |
+RDEPEND=">=dev-libs/glib-1.2:1 |
| 73 |
x11-libs/libXi |
| 74 |
x11-libs/libXt" |
| 75 |
DEPEND="${RDEPEND} |
| 76 |
@@ -27,9 +28,7 @@ |
| 77 |
x11-proto/xextproto |
| 78 |
nls? ( sys-devel/gettext dev-util/intltool )" |
| 79 |
|
| 80 |
-src_unpack() { |
| 81 |
- unpack ${P}.tar.gz |
| 82 |
- cd "${S}" |
| 83 |
+src_prepare() { |
| 84 |
epatch "${FILESDIR}"/${P}-m4.patch |
| 85 |
epatch "${FILESDIR}"/${P}-automake.patch |
| 86 |
epatch "${FILESDIR}"/${P}-cleanup.patch |
| 87 |
@@ -37,10 +36,11 @@ |
| 88 |
epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch |
| 89 |
epatch "${FILESDIR}"/${P}-as-needed.patch |
| 90 |
sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198 |
| 91 |
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520 |
| 92 |
eautoreconf |
| 93 |
} |
| 94 |
|
| 95 |
-src_compile() { |
| 96 |
+src_configure() { |
| 97 |
local myconf= |
| 98 |
use nls || myconf="${myconf} --disable-nls" |
| 99 |
strip-linguas ${MY_AVAILABLE_LINGUAS} |
| 100 |
@@ -55,13 +55,15 @@ |
| 101 |
--sysconfdir=/etc \ |
| 102 |
--with-xinput=xfree \ |
| 103 |
--with-x \ |
| 104 |
- ${myconf} || die |
| 105 |
+ ${myconf} |
| 106 |
+} |
| 107 |
|
| 108 |
- emake CC="$(tc-getCC)" || die |
| 109 |
+src_compile() { |
| 110 |
+ emake CC="$(tc-getCC)" |
| 111 |
} |
| 112 |
|
| 113 |
src_install() { |
| 114 |
- make install DESTDIR="${D}" || die |
| 115 |
+ default |
| 116 |
|
| 117 |
dodoc AUTHORS ChangeLog* HACKING |
| 118 |
dodoc NEWS* README* TODO |
Archives