summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2005-05-29 22:29:30 +0000
committerMark Loeser <halcy0n@gentoo.org>2005-05-29 22:29:30 +0000
commit2704fe566d798e1e741faa1915c4bf19782c5d79 (patch)
treeeec7eb66a7b1468ee7b18e94251df64fd91dc678 /gnome-base
parentmore KEYWORDS (diff)
downloadgentoo-2-2704fe566d798e1e741faa1915c4bf19782c5d79.tar.gz
gentoo-2-2704fe566d798e1e741faa1915c4bf19782c5d79.tar.bz2
gentoo-2-2704fe566d798e1e741faa1915c4bf19782c5d79.zip
gcc34 patch, bug #79307
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-core/ChangeLog8
-rw-r--r--gnome-base/gnome-core/Manifest15
-rw-r--r--gnome-base/gnome-core/files/gnome-core-1.4.2-gcc34.patch417
-rw-r--r--gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild9
4 files changed, 437 insertions, 12 deletions
diff --git a/gnome-base/gnome-core/ChangeLog b/gnome-base/gnome-core/ChangeLog
index 3f5e7454b9cf..17ed979ff63a 100644
--- a/gnome-base/gnome-core/ChangeLog
+++ b/gnome-base/gnome-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-core
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/ChangeLog,v 1.24 2004/06/24 21:56:46 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/ChangeLog,v 1.25 2005/05/29 22:29:30 halcy0n Exp $
+
+ 29 May 2005; Mark Loeser <halcy0n@gentoo.org>
+ +files/gnome-core-1.4.2-gcc34.patch, gnome-core-1.4.2-r1.ebuild:
+ GCC 3.4 compilation fix; bug #79307
03 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnome-core-1.4.0.8.ebuild,
gnome-core-1.4.1.ebuild, gnome-core-1.4.2-r1.ebuild,
diff --git a/gnome-base/gnome-core/Manifest b/gnome-base/gnome-core/Manifest
index 4be4648835b5..22cb22628017 100644
--- a/gnome-base/gnome-core/Manifest
+++ b/gnome-base/gnome-core/Manifest
@@ -1,15 +1,16 @@
+MD5 0c46ac560c29e3a7f90028a21ab6e87d ChangeLog 2649
MD5 c8af051f1efeea015f3f5660fb510b59 gnome-core-1.4.0.8.ebuild 2456
MD5 add7f10e3182dbe6c679c508d79d0a67 gnome-core-1.4.1.ebuild 2362
-MD5 386546681fe067327c76ea5e5d36d0fd gnome-core-1.4.2-r1.ebuild 2352
+MD5 950a83f95876addc0d747cfa2b10e6a3 gnome-core-1.4.2-r1.ebuild 2438
MD5 dfb6444f2db1e0e63f3250997322e79a gnome-core-1.4.2.ebuild 2297
-MD5 0c46ac560c29e3a7f90028a21ab6e87d ChangeLog 2649
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 ffb294abbe384b73e1038dd1d3c7a14f files/start.gnome 39
+MD5 1123b95db582c759e9690ed96a6fa5ff files/Gnome 2383
+MD5 0471910aaa15413b1324a48f181d3bb8 files/digest-gnome-core-1.4.0.8 71
MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-core-1.4.1 70
MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-core-1.4.2 70
MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-core-1.4.2-r1 70
-MD5 1123b95db582c759e9690ed96a6fa5ff files/Gnome 2383
-MD5 7bb900a10ddfc5318418e7ee976d3dd4 files/gnome-core-es-doc.patch 1201
-MD5 0471910aaa15413b1324a48f181d3bb8 files/digest-gnome-core-1.4.0.8 71
-MD5 66322a190c2812cd7e7ed0ee7bc672b1 files/gnome-core-1.4.1-configure.in.patch 282
-MD5 ffb294abbe384b73e1038dd1d3c7a14f files/start.gnome 39
MD5 66322a190c2812cd7e7ed0ee7bc672b1 files/gnome-core-1.4.0.8-configure.in.patch 282
+MD5 66322a190c2812cd7e7ed0ee7bc672b1 files/gnome-core-1.4.1-configure.in.patch 282
+MD5 7bb900a10ddfc5318418e7ee976d3dd4 files/gnome-core-es-doc.patch 1201
+MD5 130d1b13c61a5028d8c58a7dedee210d files/gnome-core-1.4.2-gcc34.patch 16680
diff --git a/gnome-base/gnome-core/files/gnome-core-1.4.2-gcc34.patch b/gnome-base/gnome-core/files/gnome-core-1.4.2-gcc34.patch
new file mode 100644
index 000000000000..d8cfd94f3054
--- /dev/null
+++ b/gnome-base/gnome-core/files/gnome-core-1.4.2-gcc34.patch
@@ -0,0 +1,417 @@
+diff -ur gnome-core-1.4.2-orig/applets/desk-guide/deskguide_applet.c gnome-core-1.4.2/applets/desk-guide/deskguide_applet.c
+--- gnome-core-1.4.2-orig/applets/desk-guide/deskguide_applet.c 2005-02-22 03:57:46.304302821 -0500
++++ gnome-core-1.4.2/applets/desk-guide/deskguide_applet.c 2005-02-22 03:59:51.348022944 -0500
+@@ -343,7 +343,7 @@
+ return tmp_value ? item->tmp_value : item->value;
+ }
+
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to find config value for <%s>", path);
++ g_warning ("%s(): unable to find config value for <%s>", G_GNUC_PRETTY_FUNCTION, path);
+
+ return NULL;
+ }
+@@ -470,10 +470,10 @@
+ if (GTK_BIN (gp_container)->child)
+ gtk_widget_destroy (GTK_BIN (gp_container)->child);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): missing container child");
++ g_warning ("%s(): missing container child", G_GNUC_PRETTY_FUNCTION);
+ }
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): missing container");
++ g_warning ("%s(): missing container", G_GNUC_PRETTY_FUNCTION );
+ }
+
+ static void
+diff -ur gnome-core-1.4.2-orig/applets/desk-guide/gstc.c gnome-core-1.4.2/applets/desk-guide/gstc.c
+--- gnome-core-1.4.2-orig/applets/desk-guide/gstc.c 2005-02-22 03:58:35.568768375 -0500
++++ gnome-core-1.4.2/applets/desk-guide/gstc.c 2005-02-22 03:53:21.793436099 -0500
+@@ -172,7 +172,7 @@
+ }
+ if (ci >= 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't add known window %ld to %ld",
++ g_warning ("%s(): can't add known window %ld to %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild,
+ GSTC_PARENT_XWINDOW (sparent));
+ return;
+@@ -207,7 +207,7 @@
+ /* sanity checks */
+ if (ci < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't remove unknown window %ld",
++ g_warning ("%s(): can't remove unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild);
+ return;
+ }
+@@ -249,13 +249,13 @@
+ /* sanity checks */
+ if (ci < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack unknown window %ld",
++ g_warning ("%s(): can't restack unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild);
+ return;
+ }
+ if (xbelow && bi < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack window %ld on top of unknown window %ld",
++ g_warning ("%s(): can't restack window %ld on top of unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild,
+ xbelow);
+ return;
+@@ -297,10 +297,10 @@
+ {
+ case CreateNotify:
+ if (xevent->xcreatewindow.parent != xparent)
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): now what is THIS? "
++ g_warning ("%s(): now what is THIS? "
+ "i receive a SubstructureNotify XCreateWindowEvent "
+ "for a *foreign* child (%ld)??? X is on drugs!",
+- xevent->xcreatewindow.window);
++ G_GNUC_PRETTY_FUNCTION, xevent->xcreatewindow.window);
+ else
+ gstc_parent_add_child (sparent, xevent->xcreatewindow.window);
+ break;
+diff -ur gnome-core-1.4.2-orig/applets/desk-guide/gwmh.c gnome-core-1.4.2/applets/desk-guide/gwmh.c
+--- gnome-core-1.4.2-orig/applets/desk-guide/gwmh.c 2005-02-22 03:58:35.570768434 -0500
++++ gnome-core-1.4.2/applets/desk-guide/gwmh.c 2005-02-22 03:53:21.797436218 -0500
+@@ -230,7 +230,7 @@
+ /* setup the root window event monitor */
+ window = gdk_window_ref_from_xid (GDK_ROOT_WINDOW ());
+ if (!window)
+- g_error (G_GNUC_PRETTY_FUNCTION "(): root window id %ld invalid? bad bad...",
++ g_error ("%s(): root window id %ld invalid? bad bad...", G_GNUC_PRETTY_FUNCTION,
+ GDK_ROOT_WINDOW ());
+ gdk_window_add_filter (window,
+ root_event_monitor,
+@@ -390,13 +390,13 @@
+ }
+ if (!abort && bytes_after_return)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?",
++ g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", G_GNUC_PRETTY_FUNCTION,
+ prop_buffer_lengh);
+ abort++;
+ }
+ if (!abort && expected_format && expected_format != format_returned)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?",
++ g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?", G_GNUC_PRETTY_FUNCTION,
+ expected_format, format_returned);
+ abort++;
+ }
+@@ -1586,7 +1586,7 @@
+ g_return_if_fail (id > 0);
+
+ if (!g_hook_destroy (&gwmh_desk_hook_list, id))
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)",
++ g_warning ("%s(): unable to remove notifier (%d)", G_GNUC_PRETTY_FUNCTION,
+ id);
+ }
+
+@@ -1596,7 +1596,7 @@
+ g_return_if_fail (id > 0);
+
+ if (!g_hook_destroy (&gwmh_task_hook_list, id))
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)",
++ g_warning ("%s(): unable to remove notifier (%d)", G_GNUC_PRETTY_FUNCTION,
+ id);
+ }
+
+@@ -1624,7 +1624,7 @@
+ if (hook)
+ g_hook_destroy_link (&gwmh_desk_hook_list, hook);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)",
++ g_warning ("%s(): unable to remove notifier <%p> (%p)",G_GNUC_PRETTY_FUNCTION,
+ func, func_data);
+ }
+
+@@ -1643,7 +1643,7 @@
+ if (hook)
+ g_hook_destroy_link (&gwmh_task_hook_list, hook);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)",
++ g_warning ("%s(): unable to remove notifier <%p> (%p)", G_GNUC_PRETTY_FUNCTION,
+ func, func_data);
+ }
+
+diff -ur gnome-core-1.4.2-orig/applets/tasklist/gstc.c gnome-core-1.4.2/applets/tasklist/gstc.c
+--- gnome-core-1.4.2-orig/applets/tasklist/gstc.c 2005-02-22 03:57:46.401305707 -0500
++++ gnome-core-1.4.2/applets/tasklist/gstc.c 2005-02-22 04:01:57.858787533 -0500
+@@ -172,7 +172,7 @@
+ }
+ if (ci >= 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't add known window %ld to %ld",
++ g_warning ("%s(): can't add known window %ld to %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild,
+ GSTC_PARENT_XWINDOW (sparent));
+ return;
+@@ -207,7 +207,7 @@
+ /* sanity checks */
+ if (ci < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't remove unknown window %ld",
++ g_warning ("%s(): can't remove unknown window %ld", G_GNUC_PRETTY_FUNCTION ,
+ xchild);
+ return;
+ }
+@@ -249,13 +249,13 @@
+ /* sanity checks */
+ if (ci < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack unknown window %ld",
++ g_warning ("%s(): can't restack unknown window %ld", G_GNUC_PRETTY_FUNCTION ,
+ xchild);
+ return;
+ }
+ if (xbelow && bi < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack window %ld on top of unknown window %ld",
++ g_warning ("%s(): can't restack window %ld on top of unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild,
+ xbelow);
+ return;
+@@ -297,10 +297,10 @@
+ {
+ case CreateNotify:
+ if (xevent->xcreatewindow.parent != xparent)
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): now what is THIS? "
++ g_warning ("%s(): now what is THIS? "
+ "i receive a SubstructureNotify XCreateWindowEvent "
+ "for a *foreign* child (%ld)??? X is on drugs!",
+- xevent->xcreatewindow.window);
++ G_GNUC_PRETTY_FUNCTION, xevent->xcreatewindow.window);
+ else
+ gstc_parent_add_child (sparent, xevent->xcreatewindow.window);
+ break;
+diff -ur gnome-core-1.4.2-orig/applets/tasklist/gwmh.c gnome-core-1.4.2/applets/tasklist/gwmh.c
+--- gnome-core-1.4.2-orig/applets/tasklist/gwmh.c 2005-02-22 03:57:46.402305736 -0500
++++ gnome-core-1.4.2/applets/tasklist/gwmh.c 2005-02-22 04:03:17.760165559 -0500
+@@ -230,7 +230,7 @@
+ /* setup the root window event monitor */
+ window = gdk_window_ref_from_xid (GDK_ROOT_WINDOW ());
+ if (!window)
+- g_error (G_GNUC_PRETTY_FUNCTION "(): root window id %ld invalid? bad bad...",
++ g_error ("%s(): root window id %ld invalid? bad bad...", G_GNUC_PRETTY_FUNCTION,
+ GDK_ROOT_WINDOW ());
+ gdk_window_add_filter (window,
+ root_event_monitor,
+@@ -390,13 +390,13 @@
+ }
+ if (!abort && bytes_after_return)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?",
++ g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", G_GNUC_PRETTY_FUNCTION,
+ prop_buffer_lengh);
+ abort++;
+ }
+ if (!abort && expected_format && expected_format != format_returned)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?",
++ g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?", G_GNUC_PRETTY_FUNCTION,
+ expected_format, format_returned);
+ abort++;
+ }
+@@ -1586,7 +1586,7 @@
+ g_return_if_fail (id > 0);
+
+ if (!g_hook_destroy (&gwmh_desk_hook_list, id))
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)",
++ g_warning ("%s(): unable to remove notifier (%d)", G_GNUC_PRETTY_FUNCTION,
+ id);
+ }
+
+@@ -1596,7 +1596,7 @@
+ g_return_if_fail (id > 0);
+
+ if (!g_hook_destroy (&gwmh_task_hook_list, id))
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)",
++ g_warning ("%s(): unable to remove notifier (%d)", G_GNUC_PRETTY_FUNCTION,
+ id);
+ }
+
+@@ -1624,7 +1624,7 @@
+ if (hook)
+ g_hook_destroy_link (&gwmh_desk_hook_list, hook);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)",
++ g_warning ("%s(): unable to remove notifier <%p> (%p)", G_GNUC_PRETTY_FUNCTION,
+ func, func_data);
+ }
+
+@@ -1643,7 +1643,7 @@
+ if (hook)
+ g_hook_destroy_link (&gwmh_task_hook_list, hook);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)",
++ g_warning ("%s(): unable to remove notifier <%p> (%p)", G_GNUC_PRETTY_FUNCTION,
+ func, func_data);
+ }
+
+diff -ur gnome-core-1.4.2-orig/applets/tasklist/tasklist_icon.c gnome-core-1.4.2/applets/tasklist/tasklist_icon.c
+--- gnome-core-1.4.2-orig/applets/tasklist/tasklist_icon.c 2005-02-22 03:57:46.401305707 -0500
++++ gnome-core-1.4.2/applets/tasklist/tasklist_icon.c 2005-02-22 04:04:04.824568729 -0500
+@@ -81,16 +81,16 @@
+ if (!abort &&
+ requested_type != AnyPropertyType &&
+ requested_type != type_returned) {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Property has wrong type, probably on crack");
++ g_warning ("%s(): Property has wrong type, probably on crack", G_GNUC_PRETTY_FUNCTION );
+ abort++;
+ }
+ if (!abort && bytes_after_return) {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?",
++ g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", G_GNUC_PRETTY_FUNCTION,
+ prop_buffer_lengh);
+ abort++;
+ }
+ if (!abort && expected_format && expected_format != format_returned) {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?",
++ g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?", G_GNUC_PRETTY_FUNCTION,
+ expected_format, format_returned);
+ abort++;
+ }
+diff -ur gnome-core-1.4.2-orig/panel/gstc.c gnome-core-1.4.2/panel/gstc.c
+--- gnome-core-1.4.2-orig/panel/gstc.c 2005-02-22 03:58:35.571768464 -0500
++++ gnome-core-1.4.2/panel/gstc.c 2005-02-22 03:53:21.799436277 -0500
+@@ -172,7 +172,7 @@
+ }
+ if (ci >= 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't add known window %ld to %ld",
++ g_warning ("%s(): can't add known window %ld to %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild,
+ GSTC_PARENT_XWINDOW (sparent));
+ return;
+@@ -207,7 +207,7 @@
+ /* sanity checks */
+ if (ci < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't remove unknown window %ld",
++ g_warning ("%s(): can't remove unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild);
+ return;
+ }
+@@ -249,13 +249,13 @@
+ /* sanity checks */
+ if (ci < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack unknown window %ld",
++ g_warning ("%s(): can't restack unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild);
+ return;
+ }
+ if (xbelow && bi < 0)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): can't restack window %ld on top of unknown window %ld",
++ g_warning ("%s(): can't restack window %ld on top of unknown window %ld", G_GNUC_PRETTY_FUNCTION,
+ xchild,
+ xbelow);
+ return;
+@@ -297,10 +297,10 @@
+ {
+ case CreateNotify:
+ if (xevent->xcreatewindow.parent != xparent)
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): now what is THIS? "
++ g_warning ("%s(): now what is THIS? "
+ "i receive a SubstructureNotify XCreateWindowEvent "
+ "for a *foreign* child (%ld)??? X is on drugs!",
+- xevent->xcreatewindow.window);
++ G_GNUC_PRETTY_FUNCTION, xevent->xcreatewindow.window);
+ else
+ gstc_parent_add_child (sparent, xevent->xcreatewindow.window);
+ break;
+diff -ur gnome-core-1.4.2-orig/panel/gwmh.c gnome-core-1.4.2/panel/gwmh.c
+--- gnome-core-1.4.2-orig/panel/gwmh.c 2005-02-22 03:58:35.573768524 -0500
++++ gnome-core-1.4.2/panel/gwmh.c 2005-02-22 03:53:21.803436396 -0500
+@@ -230,7 +230,7 @@
+ /* setup the root window event monitor */
+ window = gdk_window_ref_from_xid (GDK_ROOT_WINDOW ());
+ if (!window)
+- g_error (G_GNUC_PRETTY_FUNCTION "(): root window id %ld invalid? bad bad...",
++ g_error ("%s(): root window id %ld invalid? bad bad...", G_GNUC_PRETTY_FUNCTION,
+ GDK_ROOT_WINDOW ());
+ gdk_window_add_filter (window,
+ root_event_monitor,
+@@ -390,13 +390,13 @@
+ }
+ if (!abort && bytes_after_return)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?",
++ g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", G_GNUC_PRETTY_FUNCTION,
+ prop_buffer_lengh);
+ abort++;
+ }
+ if (!abort && expected_format && expected_format != format_returned)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?",
++ g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?", G_GNUC_PRETTY_FUNCTION,
+ expected_format, format_returned);
+ abort++;
+ }
+@@ -1586,7 +1586,7 @@
+ g_return_if_fail (id > 0);
+
+ if (!g_hook_destroy (&gwmh_desk_hook_list, id))
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)",
++ g_warning ("%s(): unable to remove notifier (%d)", G_GNUC_PRETTY_FUNCTION,
+ id);
+ }
+
+@@ -1596,7 +1596,7 @@
+ g_return_if_fail (id > 0);
+
+ if (!g_hook_destroy (&gwmh_task_hook_list, id))
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier (%d)",
++ g_warning ("%s(): unable to remove notifier (%d)", G_GNUC_PRETTY_FUNCTION,
+ id);
+ }
+
+@@ -1624,7 +1624,7 @@
+ if (hook)
+ g_hook_destroy_link (&gwmh_desk_hook_list, hook);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)",
++ g_warning ("%s(): unable to remove notifier <%p> (%p)",G_GNUC_PRETTY_FUNCTION,
+ func, func_data);
+ }
+
+@@ -1643,7 +1643,7 @@
+ if (hook)
+ g_hook_destroy_link (&gwmh_task_hook_list, hook);
+ else
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): unable to remove notifier <%p> (%p)",
++ g_warning ("%s(): unable to remove notifier <%p> (%p)", G_GNUC_PRETTY_FUNCTION,
+ func, func_data);
+ }
+
+diff -ur gnome-core-1.4.2-orig/panel/xstuff.c gnome-core-1.4.2/panel/xstuff.c
+--- gnome-core-1.4.2-orig/panel/xstuff.c 2005-02-22 03:58:35.575768583 -0500
++++ gnome-core-1.4.2/panel/xstuff.c 2005-02-22 03:53:21.805436456 -0500
+@@ -322,19 +322,19 @@
+ requested_type != AnyPropertyType &&
+ requested_type != type_returned)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Property has wrong type, probably on crack");
++ g_warning ("%s(): Property has wrong type, probably on crack", G_GNUC_PRETTY_FUNCTION);
+ abort++;
+ }
+ if (!abort && bytes_after_return)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Eeek, property has more than %u bytes, stored on harddisk?",
++ g_warning ("%s(): Eeek, property has more than %u bytes, stored on harddisk?", G_GNUC_PRETTY_FUNCTION,
+ prop_buffer_lengh);
+ abort++;
+ }
+ if (!abort && expected_format && expected_format != format_returned)
+ {
+- g_warning (G_GNUC_PRETTY_FUNCTION "(): Expected format (%u) unmatched (%d), programmer was drunk?",
+- expected_format, format_returned);
++ g_warning ("%s(): Expected format (%u) unmatched (%d), programmer was drunk?",
++ G_GNUC_PRETTY_FUNCTION, expected_format, format_returned);
+ abort++;
+ }
+ if (!abort && prop_data && nitems_return && format_returned)
diff --git a/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild b/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild
index bcfa3d5b454b..810a0226adf4 100644
--- a/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild
+++ b/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild
@@ -1,10 +1,10 @@
-# 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-base/gnome-core/gnome-core-1.4.2-r1.ebuild,v 1.12 2004/07/14 15:08:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.2-r1.ebuild,v 1.13 2005/05/29 22:29:30 halcy0n Exp $
IUSE="kde nls cups"
-inherit libtool gnome.org
+inherit libtool gnome.org eutils
DESCRIPTION="Core components of the GNOME desktop environment"
HOMEPAGE="http://www.gnome.org/"
@@ -39,6 +39,9 @@ src_unpack() {
cd ${S}
+ # >=gcc 3.4 compile fix; bug #79307
+ epatch "${FILESDIR}"/"${P}"-gcc34.patch
+
# libpng-1.2.5 fix
cp configure.in configure.in.old
sed -e "s:-lz:\`libpng-config --libs\`:" configure.in.old \