pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/glib2 Make _g_charset_get_aliases match an exter...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fd0147c528e
branches:  trunk
changeset: 509220:3fd0147c528e
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Mar 06 19:38:15 2006 +0000

description:
Make _g_charset_get_aliases match an extern declaration so that this builds
correctly under amd64.  From martijnb%atlas.ipv6.stack.nl@localhost in PR pkg/32987.

diffstat:

 devel/glib2/distinfo         |   3 ++-
 devel/glib2/patches/patch-ai |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r a00ecb9f47bf -r 3fd0147c528e devel/glib2/distinfo
--- a/devel/glib2/distinfo      Mon Mar 06 19:32:06 2006 +0000
+++ b/devel/glib2/distinfo      Mon Mar 06 19:38:15 2006 +0000
@@ -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-af) = 192998d1e2188c0210d7a471786495b758c437ae
 SHA1 (patch-ag) = 8d8f815c0a4bc54edace835205a07d389e6e4261
 SHA1 (patch-ah) = 1445636945d7c830077a68ccde96124c9cafeb4e
+SHA1 (patch-ai) = 2b4dd79f220722285ee808fdcf51a2aae869380b
 SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff -r a00ecb9f47bf -r 3fd0147c528e devel/glib2/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-ai      Mon Mar 06 19:38:15 2006 +0000
@@ -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 ();



Home | Main Index | Thread Index | Old Index