diff options
| author |   Karol Wojtaszek <sekretarz@gentoo.org> | 2004-08-25 06:39:22 +0000 |
|---|---|---|
| committer | Karol Wojtaszek <sekretarz@gentoo.org> | 2004-08-25 06:39:22 +0000 |
| commit | 4517a8c6534861b06fc3866abb75348aca3c1f0e (patch) | |
| tree | a7c754f3d254ed3794604cc7cdadd4fa0d769351 /gnome-extra | |
| parent | new ebuild added (diff) | |
| download | historical-4517a8c6534861b06fc3866abb75348aca3c1f0e.tar.gz historical-4517a8c6534861b06fc3866abb75348aca3c1f0e.tar.bz2 historical-4517a8c6534861b06fc3866abb75348aca3c1f0e.zip | |
Fixing compile problems with gcc-34. Bug #52037
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/gtkhtml/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/Manifest | 5 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch | 11 | ||||
| -rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild | 11 |
4 files changed, 28 insertions, 5 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index bd9f8686173e..0d5f3af55217 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.41 2004/06/24 22:06:53 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.42 2004/08/25 06:39:22 sekretarz Exp $ + + 25 Aug 2004; Karol Wojtaszek <sekretarz@gentoo.org> + gtkhtml-1.1.10-r1.ebuild: + Fixing compile problems with gcc-34. Bug #52037 25 Mar 2004; Martin Holzer <mholzer@gentoo.org> gtkhtml-1.1.10.ebuild: fixing depend. see 45343 diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest index d73ffb22c95c..b3eb4e745cc4 100644 --- a/gnome-extra/gtkhtml/Manifest +++ b/gnome-extra/gtkhtml/Manifest @@ -1,6 +1,7 @@ MD5 593c1f3eb6427b68defa458574541da9 gtkhtml-1.1.10.ebuild 4062 -MD5 7a7fe27dd7fd2590d1b4e1f87b45672b gtkhtml-1.1.10-r1.ebuild 4090 -MD5 4fcf2bba79840b0ab6ec2a361d1250a2 ChangeLog 5770 +MD5 38ba514ac42d50a81ff0284c6623315c gtkhtml-1.1.10-r1.ebuild 4177 +MD5 3c635656fff7fb845d147e99044d792d ChangeLog 5904 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 bc6bf91c4d69c7c6933885588f46eab3 files/gtkhtml-gcc34.patch 484 MD5 beee6dc1f9b01326aec9a28c8959c395 files/digest-gtkhtml-1.1.10-r1 68 MD5 2da7540b316c5dfdd790869fdb2f4070 files/digest-gtkhtml-1.1.10 133 diff --git a/gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch b/gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch new file mode 100644 index 000000000000..020301260140 --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-gcc34.patch @@ -0,0 +1,11 @@ +diff -ur gtkhtml-1.1.10-orig/components/html-editor/popup.c gtkhtml-1.1.10/components/html-editor/popup.c +--- gtkhtml-1.1.10-orig/components/html-editor/popup.c 2004-05-25 00:27:37.463103516 -0400 ++++ gtkhtml-1.1.10/components/html-editor/popup.c 2004-05-25 00:28:20.916203966 -0400 +@@ -496,6 +496,7 @@ + ADD_PROP (PARAGRAPH); + break; + default: ++ break; + } + if (obj->parent && obj->parent->parent && HTML_IS_TABLE_CELL (obj->parent->parent)) { + if (cd->format_html) { diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild index 9b944538abb5..999beb077408 100644 --- a/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-1.1.10-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 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.5 2004/07/14 15:55:08 agriffis Exp $ +# $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 $ -inherit gnome.org libtool +inherit gnome.org libtool eutils MY_PV="`echo ${PV} | cut -d. -f1,2`" DESCRIPTION="Lightweight HTML rendering/printing/editing engine." @@ -31,6 +31,13 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext >=dev-util/intltool-0.11 )" +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${PN}-gcc34.patch +} + src_compile() { elibtoolize |