summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2005-05-29 22:47:15 +0000
committerMark Loeser <halcy0n@gentoo.org>2005-05-29 22:47:15 +0000
commit0d5a79d91e703d7cc4f8e64d61ecb4c928fcdfd7 (patch)
treebd7e68d79c173823fefc4f0a09738a15f861bc26 /gnome-base
parentStable on amd64. (diff)
downloadgentoo-2-0d5a79d91e703d7cc4f8e64d61ecb4c928fcdfd7.tar.gz
gentoo-2-0d5a79d91e703d7cc4f8e64d61ecb4c928fcdfd7.tar.bz2
gentoo-2-0d5a79d91e703d7cc4f8e64d61ecb4c928fcdfd7.zip
gcc4 patch; #94321
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-libs/ChangeLog6
-rw-r--r--gnome-base/gnome-libs/Manifest5
-rw-r--r--gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch13
-rw-r--r--gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild4
4 files changed, 24 insertions, 4 deletions
diff --git a/gnome-base/gnome-libs/ChangeLog b/gnome-base/gnome-libs/ChangeLog
index 7969d79d5fe0..46423e027b3f 100644
--- a/gnome-base/gnome-libs/ChangeLog
+++ b/gnome-base/gnome-libs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-libs
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.33 2005/04/11 18:20:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.34 2005/05/29 22:47:14 halcy0n Exp $
+
+ 29 May 2005; Mark Loeser <halcy0n@gentoo.org>
+ +files/gnome-libs-1.4.2-gcc4.patch, gnome-libs-1.4.2.ebuild:
+ Patch to fix compilation with GCC4 ; bug #94321
11 Apr 2005; Simon Stelling <blubb@gentoo.org> gnome-libs-1.4.2.ebuild:
fixed multilib-strict: bug 88632
diff --git a/gnome-base/gnome-libs/Manifest b/gnome-base/gnome-libs/Manifest
index fe4dc7f5a517..fabfee2a93cd 100644
--- a/gnome-base/gnome-libs/Manifest
+++ b/gnome-base/gnome-libs/Manifest
@@ -1,11 +1,12 @@
MD5 386aa049d9faf439d081630e50b1a6b7 ChangeLog 4325
MD5 1d99e796eb907223245905e3b1f3d722 gnome-libs-1.4.1.6.ebuild 1853
MD5 7bed2a056adc1898e1cc6addab07ff81 gnome-libs-1.4.1.7.ebuild 1512
-MD5 e60e5daf1e89783e8767a54952bc67f3 gnome-libs-1.4.2.ebuild 2405
+MD5 09c67966a9657274d4069994e56f3171 gnome-libs-1.4.2.ebuild 2485
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 3a9b07232c2e27a44a8b3b3a83a9d696 files/digest-gnome-libs-1.4.1.6 72
MD5 f699a38c77fa9c8d30de6e1c9d4ba7c0 files/digest-gnome-libs-1.4.1.7 72
MD5 e0991b18209dfd87a7d6f2ed771dc00b files/digest-gnome-libs-1.4.2 70
-MD5 275bc3267f2d6a2ba6f02b7db3cf28de files/no-libdb-check.diff 11481
MD5 f331a840d47fda5b17211d968f974f14 files/gnome-libs-1.4.2-gtkdoc_fixes.patch 1089
+MD5 275bc3267f2d6a2ba6f02b7db3cf28de files/no-libdb-check.diff 11481
MD5 fb16550517db1b4f3993031c0695cc31 files/gnome-libs-1.4.2-m4.patch 274
+MD5 a49f7096a16de9d5e0f310cdf845a189 files/gnome-libs-1.4.2-gcc4.patch 530
diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch
new file mode 100644
index 000000000000..3f4105964e01
--- /dev/null
+++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch
@@ -0,0 +1,13 @@
+diff -urN ../tmp-orig/gnome-libs-1.4.2/gtk-xmhtml/XmHTMLI.h ./gtk-xmhtml/XmHTMLI.h
+--- ../tmp-orig/gnome-libs-1.4.2/gtk-xmhtml/XmHTMLI.h 1999-07-29 03:26:28.000000000 +0200
++++ ./gtk-xmhtml/XmHTMLI.h 2004-12-22 18:02:43.408331024 +0100
+@@ -1058,9 +1058,6 @@
+ #include "gtk-xmhtml-p.h"
+
+ void gtk_xmhtml_set_outline (GtkXmHTML *html, int flag);
+-void my_x_query_colors(GdkColormap *colormap,
+- GdkColor *colors,
+- gint ncolors);
+ void
+ gtk_xmhtml_set_colors (GtkXmHTML *html,
+ Pixel foreground,
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
index cac8da07bf69..a2f0ad32779b 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.29 2005/04/29 01:15:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.30 2005/05/29 22:47:14 halcy0n Exp $
inherit eutils libtool multilib
@@ -30,6 +30,8 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-m4.patch
# Correct problems with documentation. See bug #44439.
epatch "${FILESDIR}"/${P}-gtkdoc_fixes.patch
+ # Fix compilation with GCC4 ; bug #94321
+ epatch "${FILESDIR}"/${P}-gcc4.patch
}
src_compile() {