summaryrefslogtreecommitdiff
path: root/x11/gnome-libs
diff options
context:
space:
mode:
authorkristerw <kristerw>2005-11-25 14:40:44 +0000
committerkristerw <kristerw>2005-11-25 14:40:44 +0000
commit1f1138f43931cdc4c9e9749f1a855e9e571444cb (patch)
tree640601925af1ce9d67abbb308bf6f543d1ed1643 /x11/gnome-libs
parentbf87edd25d90b3692d27c0c661164e4c5b1ce92b (diff)
downloadpkgsrc-1f1138f43931cdc4c9e9749f1a855e9e571444cb.tar.gz
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 (limited to 'x11/gnome-libs')
-rw-r--r--x11/gnome-libs/distinfo3
-rw-r--r--x11/gnome-libs/patches/patch-al13
2 files changed, 15 insertions, 1 deletions
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index b64156b6c72..f7ea10be62c 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -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-ah) = d0725757c6132e777c7d5d45453c7a744b51de2f
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 --git a/x11/gnome-libs/patches/patch-al b/x11/gnome-libs/patches/patch-al
new file mode 100644
index 00000000000..74f86fb2a74
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-al
@@ -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,