diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2005-06-10 02:23:59 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2005-06-10 02:23:59 +0000 |
| commit | 033369546fbe4f2e63f73c02cc566319c9d57a20 (patch) | |
| tree | 9e0571b31f4f463a12d6429f832f541e7e60fb8e /gnome-extra/gtkhtml | |
| parent | Tweak device node creation to handle subpaths #95593 by Milan Holzäpfel. (diff) | |
| download | historical-033369546fbe4f2e63f73c02cc566319c9d57a20.tar.gz historical-033369546fbe4f2e63f73c02cc566319c9d57a20.tar.bz2 historical-033369546fbe4f2e63f73c02cc566319c9d57a20.zip | |
gcc4 patch
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'gnome-extra/gtkhtml')
| -rw-r--r-- | gnome-extra/gtkhtml/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/Manifest | 13 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch | 13 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild | 5 |
4 files changed, 29 insertions, 10 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index 0d5f3af55217..f7e71bb60039 100644 --- a/gnome-extra/gtkhtml/ChangeLog +++ b/gnome-extra/gtkhtml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gtkhtml -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.42 2004/08/25 06:39:22 sekretarz Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.43 2005/06/10 02:23:59 halcy0n Exp $ + + 10 Jun 2005; Mark Loeser <halcy0n@gentoo.org> +files/gtkhtml-gcc4.patch, + gtkhtml-1.1.10-r1.ebuild: + Patch to fix compilation with GCC4 25 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org> gtkhtml-1.1.10-r1.ebuild: diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest index 343faa3a0159..acba226997e8 100644 --- a/gnome-extra/gtkhtml/Manifest +++ b/gnome-extra/gtkhtml/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3c635656fff7fb845d147e99044d792d ChangeLog 5904 -MD5 38ba514ac42d50a81ff0284c6623315c gtkhtml-1.1.10-r1.ebuild 4177 +MD5 ac905a99885cc4a1a6ed27eac5b7162d ChangeLog 6043 +MD5 56443f4e4e101b848dfa5f7b71dbfdcb gtkhtml-1.1.10-r1.ebuild 4212 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68 MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484 +MD5 9ccd59aedc67c72d6991971b74de2d6a files/gtkhtml-gcc4.patch 485 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFBeWC8Rkyva5PS18kRAqlmAJ9PFay/1Cx/UTnQ7NcZJFWujsf2ygCfQysk -sPXJwUkGiEjWgOcK6NnmfGw= -=ofKS +iD8DBQFCqPnQCRZPokWLroQRAsE4AKC8J8rU02MWlEPwpE7gZrKIazwsyQCff4oE +bsHsSZk79Z9fJFo+Hn7Fltw= +=7ubE -----END PGP SIGNATURE----- diff --git a/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch b/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch new file mode 100644 index 000000000000..d01353ce2e73 --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-gcc4.patch @@ -0,0 +1,13 @@ +diff -urN ../tmp-orig/gtkhtml3.1-3.1.20/src/htmlcluealigned.h ./src/htmlcluealigned.h +--- ../tmp-orig/gtkhtml3.1-3.1.20/src/htmlcluealigned.h 2001-05-21 14:47:11.000000000 +0200 ++++ ./src/htmlcluealigned.h 2004-12-23 00:11:07.458004704 +0100 +@@ -38,9 +38,6 @@ + }; + + +-extern HTMLClueAlignedClass html_cluealigned_class; +- +- + void html_cluealigned_type_init (void); + void html_cluealigned_class_init (HTMLClueAlignedClass *klass, + HTMLType type, diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild index 999beb077408..817b9ab58e5f 100644 --- a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild,v 1.6 2004/08/25 06:39:22 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild,v 1.7 2005/06/10 02:23:59 halcy0n Exp $ inherit gnome.org libtool eutils @@ -36,6 +36,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PN}-gcc34.patch + epatch ${FILESDIR}/${PN}-gcc4.patch } src_compile() { |