From 71b4df869b7bef5d82c5434288cc0ebc9af7dd3a Mon Sep 17 00:00:00 2001 From: Daniel Jahre Date: Sat, 24 Dec 2005 14:56:18 +0000 Subject: [PATCH] Daniel Jahre: added a patch for gnome-libs14 to compile with gcc4 [2005121416214223584] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6799 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../remove-multiple-function-definition.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/gnome14/gnome-libs14/remove-multiple-function-definition.patch diff --git a/package/gnome14/gnome-libs14/remove-multiple-function-definition.patch b/package/gnome14/gnome-libs14/remove-multiple-function-definition.patch new file mode 100644 index 000000000..563a933e0 --- /dev/null +++ b/package/gnome14/gnome-libs14/remove-multiple-function-definition.patch @@ -0,0 +1,36 @@ +--- ./gtk-xmhtml/colors.c.vanilla 2005-12-13 18:31:33.000000000 +0100 ++++ ./gtk-xmhtml/colors.c 2005-12-14 16:11:46.000000000 +0100 +@@ -292,33 +292,6 @@ + #define BMASK 0xc0 + #define BSHIFT 6 + +-/* XXX: This function does an XQueryColors() the hard way, because there is +- * no corresponding function in Gdk. +- */ +-#ifndef WITH_MOTIF +-static void +-my_x_query_colors(GdkColormap *colormap, +- GdkColor *colors, +- gint ncolors) +-{ +- XColor *xcolors; +- gint i; +- +- xcolors = g_new(XColor, ncolors); +- for (i = 0; i < ncolors; i++) +- xcolors[i].pixel = colors[i].pixel; +- +- XQueryColors(gdk_display, GDK_COLORMAP_XCOLORMAP(colormap), xcolors, ncolors); +- +- for (i = 0; i < ncolors; i++) { +- colors[i].red = xcolors[i].red; +- colors[i].green = xcolors[i].green; +- colors[i].blue = xcolors[i].blue; +- } +- +- g_free(xcolors); +-} +-#endif + /***** + * Name: tryColor + * Return Type: Boolean