summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjmmv <jmmv>2006-03-06 19:38:15 +0000
committerjmmv <jmmv>2006-03-06 19:38:15 +0000
commit108b9886b7cd12f522b26d117c3176148dcbaca8 (patch)
tree914983d92b403c4f24fa1715def0d5b0483a44f5 /devel
parent04d967599be88fd6d5c8b0339d8a0e1279992adf (diff)
downloadpkgsrc-108b9886b7cd12f522b26d117c3176148dcbaca8.tar.gz
Make _g_charset_get_aliases match an extern declaration so that this builds
correctly under amd64. From martijnb@atlas.ipv6.stack.nl in PR pkg/32987.
Diffstat (limited to 'devel')
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-ai13
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 61c5c5d6fed..20f068603b1 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2006/02/25 13:31:03 wiz Exp $
+$NetBSD: distinfo,v 1.59 2006/03/06 19:38:15 jmmv Exp $
SHA1 (glib-2.10.0.tar.bz2) = 550c22448ff99bba4ab69624b023b9786b0da101
RMD160 (glib-2.10.0.tar.bz2) = 8007ae316cf7217d5673235eb420475cef9afb3b
@@ -11,4 +11,5 @@ SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
SHA1 (patch-ag) = 8d8f815c0a4bc54edace835205a07d389e6e4261
SHA1 (patch-ah) = 1445636945d7c830077a68ccde96124c9cafeb4e
+SHA1 (patch-ai) = 2b4dd79f220722285ee808fdcf51a2aae869380b
SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
new file mode 100644
index 00000000000..c45f6c00298
--- /dev/null
+++ b/devel/glib2/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.5 2006/03/06 19:38:16 jmmv Exp $
+
+--- glib/gutf8.c.orig 2006-02-24 15:02:54.000000000 +0100
++++ glib/gutf8.c
+@@ -435,7 +435,7 @@ get_alias_hash (void)
+ /* As an abuse of the alias table, the following routines gets
+ * the charsets that are aliases for the canonical name.
+ */
+-const char **
++const char ** G_GNUC_INTERNAL
+ _g_charset_get_aliases (const char *canonical_name)
+ {
+ GHashTable *alias_hash = get_alias_hash ();