[pkgsrc/trunk]: pkgsrc/x11/gnome-libs One function were defined identically i...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b0fe65cc4a9
branches:  trunk
changeset: 503686:0b0fe65cc4a9
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Fri Nov 25 14:40:44 2005 +0000

description:
One function were defined identically in two files, but one of
the copies were marked static, wich makes gcc 4 error out on
what it think is inconistent declaration/definition.  Disable
the redundant static version.

diffstat:

 x11/gnome-libs/distinfo         |   3 ++-
 x11/gnome-libs/patches/patch-al |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 675e5a55497c -r 0b0fe65cc4a9 x11/gnome-libs/distinfo
--- a/x11/gnome-libs/distinfo   Fri Nov 25 13:37:30 2005 +0000
+++ b/x11/gnome-libs/distinfo   Fri Nov 25 14:40:44 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/04/27 09:11:36 wiz Exp $
+$NetBSD: distinfo,v 1.21 2005/11/25 14:40:44 kristerw Exp $
 
 SHA1 (gnome-libs-1.4.2.tar.gz) = 9925d28237f0269a2678fdcfa7ec6033dab04789
 RMD160 (gnome-libs-1.4.2.tar.gz) = 00e2dc66c0ec35a7ae62faab84d3ff2720099d76
@@ -14,6 +14,7 @@
 SHA1 (patch-ai) = 62dacbca23cfb8f5a67904ce87a2ad864f5d0ea0
 SHA1 (patch-aj) = 292c4efccc9650c8244348bdcf22c3c1cbd3ebe6
 SHA1 (patch-ak) = fa6f2db6faff3ca6427784b84acf5856be24af82
+SHA1 (patch-al) = 9aa030c76a8f9a0975f06fd5f8f2b6121ce72b46
 SHA1 (patch-an) = 528ee8254f988ade48ab2ec6bde01bfd4ca423ad
 SHA1 (patch-ao) = 31724d3e4eb9d44b6a701f4317fc5ae35c4f2f66
 SHA1 (patch-ap) = 31e535a78dfb1fe38d7a1bb0e651b9189e88bdff
diff -r 675e5a55497c -r 0b0fe65cc4a9 x11/gnome-libs/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-libs/patches/patch-al   Fri Nov 25 14:40:44 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.4 2005/11/25 14:40:45 kristerw Exp $
+
+--- gtk-xmhtml/colors.c.orig   2005-11-24 21:23:31.000000000 +0100
++++ gtk-xmhtml/colors.c        2005-11-24 21:23:59.000000000 +0100
+@@ -295,7 +295,7 @@
+ /* XXX: This function does an XQueryColors() the hard way, because there is
+  * no corresponding function in Gdk.
+  */
+-#ifndef WITH_MOTIF
++#if 0
+ static void
+ my_x_query_colors(GdkColormap *colormap,
+                 GdkColor    *colors,