diff options
| -rw-r--r-- | gnome-extra/gtkhtml/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch | 20 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild | 13 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild | 13 |
4 files changed, 10 insertions, 43 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index 3f4d8e588baf..81f4670bbf74 100644 --- a/gnome-extra/gtkhtml/ChangeLog +++ b/gnome-extra/gtkhtml/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gtkhtml # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.87 2007/02/07 14:26:40 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.88 2007/02/16 16:57:45 dang Exp $ + + 16 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> + -files/gtkhtml-3.0.7-libtool.patch, gtkhtml-3.0.10.ebuild, + gtkhtml-3.0.10-r1.ebuild: + Remove libtool patch; the bug it was working around is fixed; bug #165524 *gtkhtml-3.12.3 (07 Feb 2007) diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch deleted file mode 100644 index 4839a3f1f2ab..000000000000 --- a/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libtool~ 2003-07-11 10:21:31.000000000 +0100 -+++ libtool 2003-07-11 10:22:33.000000000 +0100 -@@ -1859,7 +1859,7 @@ - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - # PKGW -- dependency_libs= -+ #dependency_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - case "$tmp_libs " in -@@ -1976,7 +1976,7 @@ - - tmp_libs= - #PKGW -- dependency_libs= -+ #dependency_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild index 45471c2b8877..b1c31059c94e 100644 --- a/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10-r1.ebuild,v 1.2 2007/02/16 16:57:45 dang Exp $ inherit gnome2 eutils @@ -41,12 +41,3 @@ src_unpack() { # bug 54244, patch for cjk input methods epatch ${FILESDIR}/${PN}-fix_preedit.patch } - -src_compile() { - gnome2_src_configure - - EPATCH_OPTS="${S}/libtool" - epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch - - emake || die "make failed" -} diff --git a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild index ccf54992486d..a76d804df545 100644 --- a/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild,v 1.1 2006/01/12 22:34:20 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.0.10.ebuild,v 1.2 2007/02/16 16:57:45 dang Exp $ inherit gnome2 eutils @@ -37,12 +37,3 @@ src_unpack() { # bug 101970 epatch ${FILESDIR}/${P}-no-extern-cluealigned.diff } - -src_compile() { - gnome2_src_configure - - EPATCH_OPTS="${S}/libtool" - epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch - - emake || die "make failed" -} |