package/gnome1/gnome-libs14/remove_duplicate_definition.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gnome-libs14/remove_duplicate_definition.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 taken from fedora core 4
  18
  19 diff -urN gnome-libs-1.4.2.orig/gtk-xmhtml/colors.c gnome-libs-1.4.2/gtk-xmhtml/colors.c
  20 --- gnome-libs-1.4.2.orig/gtk-xmhtml/colors.c   2002-08-06 23:25:41.000000000 +0200
  21 +++ gnome-libs-1.4.2/gtk-xmhtml/colors.c        2005-09-05 13:57:38.410340500 +0200
  22 @@ -292,33 +292,6 @@
  23  #define BMASK          0xc0
  24  #define BSHIFT         6
  25
  26 -/* XXX: This function does an XQueryColors() the hard way, because there is
  27 - * no corresponding function in Gdk.
  28 - */
  29 -#ifndef WITH_MOTIF
  30 -static void
  31 -my_x_query_colors(GdkColormap *colormap,
  32 -                 GdkColor    *colors,
  33 -                 gint         ncolors)
  34 -{
  35 -       XColor *xcolors;
  36 -       gint    i;
  37 -
  38 -       xcolors = g_new(XColor, ncolors);
  39 -       for (i = 0; i < ncolors; i++)
  40 -               xcolors[i].pixel = colors[i].pixel;
  41 -
  42 -       XQueryColors(gdk_display, GDK_COLORMAP_XCOLORMAP(colormap), xcolors, ncolors);
  43 -
  44 -       for (i = 0; i < ncolors; i++) {
  45 -               colors[i].red   = xcolors[i].red;
  46 -               colors[i].green = xcolors[i].green;
  47 -               colors[i].blue  = xcolors[i].blue;
  48 -       }
  49 -
  50 -       g_free(xcolors);
  51 -}
  52 -#endif
  53  /*****
  54  * Name:                tryColor
  55  * Return Type:         Boolean