summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/glib2/Makefile11
-rw-r--r--devel/glib2/PLIST10
-rw-r--r--devel/glib2/distinfo13
-rw-r--r--devel/glib2/patches/patch-aa18
-rw-r--r--devel/glib2/patches/patch-ag15
-rw-r--r--devel/glib2/patches/patch-ah10
6 files changed, 48 insertions, 29 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index cf6070391e6..0a8b9f9cd51 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.100 2006/07/02 14:22:35 markd Exp $
+# $NetBSD: Makefile,v 1.101 2006/07/03 21:01:53 wiz Exp $
-DISTNAME= glib-2.10.3
-PKGREVISION= 1
+DISTNAME= glib-2.12.0
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.10/ \
- ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
- ${MASTER_SITE_GNOME:=sources/glib/2.10/}
+MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.12/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.12/ \
+ ${MASTER_SITE_GNOME:=sources/glib/2.12/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= wiz@NetBSD.org
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 5b8e717735d..e414c0083c3 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2006/04/17 07:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.32 2006/07/03 21:01:53 wiz Exp $
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@@ -10,6 +10,8 @@ include/glib/glib-2.0/glib/garray.h
include/glib/glib-2.0/glib/gasyncqueue.h
include/glib/glib-2.0/glib/gatomic.h
include/glib/glib-2.0/glib/gbacktrace.h
+include/glib/glib-2.0/glib/gbase64.h
+include/glib/glib-2.0/glib/gbookmarkfile.h
include/glib/glib-2.0/glib/gcache.h
include/glib/glib-2.0/glib/gcompletion.h
include/glib/glib-2.0/glib/gconvert.h
@@ -98,7 +100,9 @@ share/doc/glib/glib-Asynchronous-Queues.html
share/doc/glib/glib-Atomic-Operations.html
share/doc/glib/glib-Automatic-String-Completion.html
share/doc/glib/glib-Balanced-Binary-Trees.html
+share/doc/glib/glib-Base64-Encoding.html
share/doc/glib/glib-Basic-Types.html
+share/doc/glib/glib-Bookmark-file-parser.html
share/doc/glib/glib-Byte-Arrays.html
share/doc/glib/glib-Byte-Order-Macros.html
share/doc/glib/glib-Caches.html
@@ -175,6 +179,7 @@ share/doc/glib/ix04.html
share/doc/glib/ix05.html
share/doc/glib/ix06.html
share/doc/glib/ix07.html
+share/doc/glib/ix08.html
share/doc/glib/left.png
share/doc/glib/mainloop-states.gif
share/doc/glib/right.png
@@ -234,6 +239,7 @@ share/doc/gobject/ix04.html
share/doc/gobject/ix05.html
share/doc/gobject/ix06.html
share/doc/gobject/ix07.html
+share/doc/gobject/ix08.html
share/doc/gobject/left.png
share/doc/gobject/pr01.html
share/doc/gobject/pt01.html
@@ -263,7 +269,6 @@ share/locale/cs/LC_MESSAGES/glib20.mo
share/locale/cy/LC_MESSAGES/glib20.mo
share/locale/da/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
-share/locale/dz/LC_MESSAGES/glib20.mo
share/locale/el/LC_MESSAGES/glib20.mo
share/locale/en_CA/LC_MESSAGES/glib20.mo
share/locale/en_GB/LC_MESSAGES/glib20.mo
@@ -298,7 +303,6 @@ share/locale/nb/LC_MESSAGES/glib20.mo
share/locale/ne/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
-share/locale/no/LC_MESSAGES/glib20.mo
share/locale/or/LC_MESSAGES/glib20.mo
share/locale/pa/LC_MESSAGES/glib20.mo
share/locale/pl/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 7b3e4a1ff67..b2de6cfe814 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.62 2006/05/29 17:06:49 drochner Exp $
+$NetBSD: distinfo,v 1.63 2006/07/03 21:01:54 wiz Exp $
-SHA1 (glib-2.10.3.tar.bz2) = bba1dea73c4426f6a130c82e0b7a07b78dfc73ce
-RMD160 (glib-2.10.3.tar.bz2) = da56e238f4f6e9c6e7c08d4e53f75128b5178047
-Size (glib-2.10.3.tar.bz2) = 2774011 bytes
-SHA1 (patch-aa) = 3c9357a4cb2ea86726cac754edea419089b79bd9
+SHA1 (glib-2.12.0.tar.bz2) = 3a5afb427bf7ea064b47ecd9316603ddd07de1f1
+RMD160 (glib-2.12.0.tar.bz2) = 05c42ad616b3cb4aec3831d30414516c70142a4f
+Size (glib-2.12.0.tar.bz2) = 2862476 bytes
+SHA1 (patch-aa) = e8e2c1f3084a58de26a5033a269a9c2bd5c74d65
SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
-SHA1 (patch-ah) = b77a04abeb3fa70e7f8cd5a46aeb6a55f6f18851
+SHA1 (patch-ag) = 312ca380107765534b80e9f6c27f98cc2f24e449
+SHA1 (patch-ah) = aac1edb4b40a7c82e04d78d96b33ff9f4321eb45
SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 0551420917c..85d335732ac 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.23 2006/03/08 07:25:04 wiz Exp $
+$NetBSD: patch-aa,v 1.24 2006/07/03 21:01:54 wiz Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=140329
http://bugzilla.gnome.org/show_bug.cgi?id=141256
---- configure.orig 2006-03-07 17:42:20.000000000 +0000
+--- configure.orig 2006-07-02 18:48:07.000000000 +0000
+++ configure
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
@@ -14,7 +14,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
ac_subst_files=''
# Initialize some variables set by options.
-@@ -33149,6 +33149,7 @@ else
+@@ -32207,6 +32207,7 @@ else
fi
G_MODULE_NEED_USCORE=0
G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -22,7 +22,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
G_MODULE_HAVE_DLERROR=0
if test -z "$G_MODULE_IMPL"; then
case "$host" in
-@@ -33802,6 +33803,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -32860,6 +32861,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
else
G_MODULE_BROKEN_RTLD_GLOBAL=0
fi
@@ -95,7 +95,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5
echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6
if test "${glib_cv_uscore+set}" = set; then
-@@ -34367,9 +34434,34 @@ if test x"$have_threads" != xno; then
+@@ -33422,9 +33489,34 @@ if test x"$have_threads" != xno; then
# skip cygwin and darwin -pthread or -pthreads test
;;
*)
@@ -132,7 +132,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -34458,10 +34550,12 @@ rm -f core *.core gmon.out bb.out confte
+@@ -33513,10 +33605,12 @@ rm -f core *.core gmon.out bb.out confte
fi
CFLAGS="$glib_save_CFLAGS"
if test $glib_flag_works = yes ; then
@@ -147,7 +147,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
;;
esac
fi
-@@ -34514,6 +34608,15 @@ fi
+@@ -33569,6 +33663,15 @@ fi
fi
@@ -163,7 +163,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
# if we are not finding the localtime_r function, then we probably are
# not using the proper multithread flag
-@@ -36467,6 +36570,10 @@ case $host in
+@@ -35522,6 +35625,10 @@ case $host in
*)
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
;;
@@ -174,7 +174,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
esac
-@@ -40741,6 +40848,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -39796,6 +39905,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t
s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t
s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t
diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag
new file mode 100644
index 00000000000..375a55cd2f4
--- /dev/null
+++ b/devel/glib2/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.8 2006/07/03 21:01:54 wiz Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=346494
+
+--- glib/gconvert.c.orig 2006-05-10 00:44:49.000000000 +0000
++++ glib/gconvert.c
+@@ -88,7 +88,7 @@ try_to_aliases (const char **to_aliases,
+ return FALSE;
+ }
+
+-extern const char **_g_charset_get_aliases (const char *canonical_name) G_GNUC_INTERNAL;
++extern const char ** G_GNUC_INTERNAL _g_charset_get_aliases (const char *canonical_name);
+
+ /**
+ * g_iconv_open:
diff --git a/devel/glib2/patches/patch-ah b/devel/glib2/patches/patch-ah
index e4681e8ab2b..b981106ad61 100644
--- a/devel/glib2/patches/patch-ah
+++ b/devel/glib2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2006/03/08 07:25:04 wiz Exp $
+$NetBSD: patch-ah,v 1.6 2006/07/03 21:01:54 wiz Exp $
---- glib/gutils.c.orig 2006-03-01 14:18:55.000000000 +0000
+--- glib/gutils.c.orig 2006-06-13 22:46:52.000000000 +0000
+++ glib/gutils.c
-@@ -2467,7 +2467,7 @@ g_get_system_data_dirs (void)
+@@ -2472,7 +2472,7 @@ g_get_system_data_dirs (void)
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.5 2006/03/08 07:25:04 wiz Exp $
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-@@ -2521,7 +2521,7 @@ g_get_system_config_dirs (void)
+@@ -2526,7 +2526,7 @@ g_get_system_config_dirs (void)
conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
if (!conf_dirs || !conf_dirs[0])
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.5 2006/03/08 07:25:04 wiz Exp $
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
-@@ -2602,7 +2602,7 @@ unalias_lang (char *lang)
+@@ -2607,7 +2607,7 @@ unalias_lang (char *lang)
int i;
if (!alias_table)
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-18 02:21:27 +0000