update to 2.20.3 changes: -bugfixes -translation updatesdiff -r1.161 -r1.162 pkgsrc/devel/glib2/Makefile
(drochner)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.161 2009/06/03 12:40:32 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.162 2009/06/05 16:08:25 drochner Exp $ | |
2 | 2 | |||
3 | # When updating glib2, please apply patch-ak to configure.in | 3 | # When updating glib2, please apply patch-ak to configure.in | |
4 | # Then run a matching version of autoconf to regen patch-aa. | 4 | # Then run a matching version of autoconf to regen patch-aa. | |
5 | DISTNAME= glib-2.20.2 | 5 | DISTNAME= glib-2.20.3 | |
6 | PKGNAME= ${DISTNAME:S/glib/glib2/} | 6 | PKGNAME= ${DISTNAME:S/glib/glib2/} | |
7 | CATEGORIES= devel | 7 | CATEGORIES= devel | |
8 | MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.20/ \ | 8 | MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.20/ \ | |
9 | ${MASTER_SITE_GNOME:=sources/glib/2.20/} | 9 | ${MASTER_SITE_GNOME:=sources/glib/2.20/} | |
10 | EXTRACT_SUFX= .tar.bz2 | 10 | EXTRACT_SUFX= .tar.bz2 | |
11 | 11 | |||
12 | MAINTAINER= pkgsrc-users@NetBSD.org | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | |
13 | HOMEPAGE= http://developer.gnome.org/doc/API/2.0/glib/glib.html | 13 | HOMEPAGE= http://developer.gnome.org/doc/API/2.0/glib/glib.html | |
14 | COMMENT= Some useful routines for C programming (glib2) | 14 | COMMENT= Some useful routines for C programming (glib2) | |
15 | LICENSE= gnu-lgpl-v2 | 15 | LICENSE= gnu-lgpl-v2 | |
16 | 16 | |||
17 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 17 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
18 | PKG_DESTDIR_SUPPORT= user-destdir | 18 | PKG_DESTDIR_SUPPORT= user-destdir |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.44 2009/03/15 13:32:31 jmcneill Exp $ | 1 | @comment $NetBSD: PLIST,v 1.45 2009/06/05 16:08:25 drochner Exp $ | |
2 | bin/glib-genmarshal | 2 | bin/glib-genmarshal | |
3 | bin/glib-gettextize | 3 | bin/glib-gettextize | |
4 | bin/glib-mkenums | 4 | bin/glib-mkenums | |
5 | bin/gobject-query | 5 | bin/gobject-query | |
6 | bin/gtester | 6 | bin/gtester | |
7 | bin/gtester-report | 7 | bin/gtester-report | |
8 | include/glib/gio-unix-2.0/gio/gdesktopappinfo.h | 8 | include/glib/gio-unix-2.0/gio/gdesktopappinfo.h | |
9 | include/glib/gio-unix-2.0/gio/gunixinputstream.h | 9 | include/glib/gio-unix-2.0/gio/gunixinputstream.h | |
10 | include/glib/gio-unix-2.0/gio/gunixmounts.h | 10 | include/glib/gio-unix-2.0/gio/gunixmounts.h | |
11 | include/glib/gio-unix-2.0/gio/gunixoutputstream.h | 11 | include/glib/gio-unix-2.0/gio/gunixoutputstream.h | |
12 | include/glib/glib-2.0/gio/gappinfo.h | 12 | include/glib/glib-2.0/gio/gappinfo.h | |
13 | include/glib/glib-2.0/gio/gasyncresult.h | 13 | include/glib/glib-2.0/gio/gasyncresult.h | |
14 | include/glib/glib-2.0/gio/gbufferedinputstream.h | 14 | include/glib/glib-2.0/gio/gbufferedinputstream.h | |
@@ -411,26 +411,27 @@ share/gtk-doc/html/gobject/tools-refdb.h | @@ -411,26 +411,27 @@ share/gtk-doc/html/gobject/tools-refdb.h | |||
411 | share/gtk-doc/html/gobject/tools-vala.html | 411 | share/gtk-doc/html/gobject/tools-vala.html | |
412 | share/gtk-doc/html/gobject/up.png | 412 | share/gtk-doc/html/gobject/up.png | |
413 | share/locale/am/LC_MESSAGES/glib20.mo | 413 | share/locale/am/LC_MESSAGES/glib20.mo | |
414 | share/locale/ar/LC_MESSAGES/glib20.mo | 414 | share/locale/ar/LC_MESSAGES/glib20.mo | |
415 | share/locale/as/LC_MESSAGES/glib20.mo | 415 | share/locale/as/LC_MESSAGES/glib20.mo | |
416 | share/locale/az/LC_MESSAGES/glib20.mo | 416 | share/locale/az/LC_MESSAGES/glib20.mo | |
417 | share/locale/be/LC_MESSAGES/glib20.mo | 417 | share/locale/be/LC_MESSAGES/glib20.mo | |
418 | share/locale/be@latin/LC_MESSAGES/glib20.mo | 418 | share/locale/be@latin/LC_MESSAGES/glib20.mo | |
419 | share/locale/bg/LC_MESSAGES/glib20.mo | 419 | share/locale/bg/LC_MESSAGES/glib20.mo | |
420 | share/locale/bn/LC_MESSAGES/glib20.mo | 420 | share/locale/bn/LC_MESSAGES/glib20.mo | |
421 | share/locale/bn_IN/LC_MESSAGES/glib20.mo | 421 | share/locale/bn_IN/LC_MESSAGES/glib20.mo | |
422 | share/locale/bs/LC_MESSAGES/glib20.mo | 422 | share/locale/bs/LC_MESSAGES/glib20.mo | |
423 | share/locale/ca/LC_MESSAGES/glib20.mo | 423 | share/locale/ca/LC_MESSAGES/glib20.mo | |
424 | share/locale/ca@valencia/LC_MESSAGES/glib20.mo | |||
424 | share/locale/cs/LC_MESSAGES/glib20.mo | 425 | share/locale/cs/LC_MESSAGES/glib20.mo | |
425 | share/locale/cy/LC_MESSAGES/glib20.mo | 426 | share/locale/cy/LC_MESSAGES/glib20.mo | |
426 | share/locale/da/LC_MESSAGES/glib20.mo | 427 | share/locale/da/LC_MESSAGES/glib20.mo | |
427 | share/locale/de/LC_MESSAGES/glib20.mo | 428 | share/locale/de/LC_MESSAGES/glib20.mo | |
428 | share/locale/dz/LC_MESSAGES/glib20.mo | 429 | share/locale/dz/LC_MESSAGES/glib20.mo | |
429 | share/locale/el/LC_MESSAGES/glib20.mo | 430 | share/locale/el/LC_MESSAGES/glib20.mo | |
430 | share/locale/en_CA/LC_MESSAGES/glib20.mo | 431 | share/locale/en_CA/LC_MESSAGES/glib20.mo | |
431 | share/locale/en_GB/LC_MESSAGES/glib20.mo | 432 | share/locale/en_GB/LC_MESSAGES/glib20.mo | |
432 | share/locale/eo/LC_MESSAGES/glib20.mo | 433 | share/locale/eo/LC_MESSAGES/glib20.mo | |
433 | share/locale/es/LC_MESSAGES/glib20.mo | 434 | share/locale/es/LC_MESSAGES/glib20.mo | |
434 | share/locale/et/LC_MESSAGES/glib20.mo | 435 | share/locale/et/LC_MESSAGES/glib20.mo | |
435 | share/locale/eu/LC_MESSAGES/glib20.mo | 436 | share/locale/eu/LC_MESSAGES/glib20.mo | |
436 | share/locale/fa/LC_MESSAGES/glib20.mo | 437 | share/locale/fa/LC_MESSAGES/glib20.mo |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.116 2009/05/26 15:42:29 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.117 2009/06/05 16:08:25 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (glib-2.20.2.tar.bz2) = 2c1f27bc4fb942ba93ccf934635879ffe0524f45 | 3 | SHA1 (glib-2.20.3.tar.bz2) = 9cc9dc579f790d87dacc21413aec6600b9eccfce | |
4 | RMD160 (glib-2.20.2.tar.bz2) = 5ab7863c97025bd5c1aa7659442aaee3020176ce | 4 | RMD160 (glib-2.20.3.tar.bz2) = 75a1bede14759d3b7bc5ca320d2a094d242bc6dc | |
5 | Size (glib-2.20.2.tar.bz2) = 5019345 bytes | 5 | Size (glib-2.20.3.tar.bz2) = 5008689 bytes | |
6 | SHA1 (patch-aa) = e8d533e6279a537fc536f61ef397165518c4bcd7 | 6 | SHA1 (patch-aa) = e8d533e6279a537fc536f61ef397165518c4bcd7 | |
7 | SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 | 7 | SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 | |
8 | SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 | 8 | SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 | |
9 | SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 | 9 | SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 | |
10 | SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 | 10 | SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 | |
11 | SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c | 11 | SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c | |
12 | SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b | 12 | SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b | |
13 | SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e | 13 | SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e | |
14 | SHA1 (patch-ai) = 9880d47e9eedca4eb81b20d0bd3e4ef04ad4e679 | 14 | SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f | |
15 | SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0 | 15 | SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0 | |
16 | SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e | 16 | SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e | |
17 | SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 | 17 | SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 | |
18 | SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff | 18 | SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff | |
19 | SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 | 19 | SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 |
@@ -1,43 +1,18 @@ | @@ -1,43 +1,18 @@ | |||
1 | $NetBSD: patch-ai,v 1.17 2009/05/20 13:07:36 wiz Exp $ | 1 | $NetBSD: patch-ai,v 1.18 2009/06/05 16:08:25 drochner Exp $ | |
2 | 2 | |||
3 | http://bugzilla.gnome.org/show_bug.cgi?id=583321 | 3 | http://bugzilla.gnome.org/show_bug.cgi?id=583321 | |
4 | http://bugzilla.gnome.org/show_bug.cgi?id=583324 | |||
5 | 4 | |||
6 | --- glib/gmain.c.orig 2008-11-24 06:45:23.000000000 +0100 | 5 | --- glib/gmain.c.orig 2009-05-29 07:18:56.000000000 +0200 | |
7 | +++ glib/gmain.c | 6 | +++ glib/gmain.c | |
8 | @@ -2720,13 +2720,13 @@ g_main_context_iterate (GMainContext *co | 7 | @@ -3713,7 +3713,11 @@ g_child_watch_source_init_multi_threaded | |
9 | { | |||
10 | gboolean got_ownership; | |||
11 | ||||
12 | + LOCK_CONTEXT (context); | |||
13 | + | |||
14 | g_return_val_if_fail (g_thread_supported (), FALSE); | |||
15 | ||||
16 | if (!block) | |||
17 | return FALSE; | |||
18 | ||||
19 | - LOCK_CONTEXT (context); | |||
20 | - | |||
21 | if (!context->cond) | |||
22 | context->cond = g_cond_new (); | |||
23 | ||||
24 | @@ -2736,7 +2736,6 @@ g_main_context_iterate (GMainContext *co | |||
25 | ||||
26 | if (!got_ownership) | |||
27 | { | |||
28 | - UNLOCK_CONTEXT (context); | |||
29 | return FALSE; | |||
30 | } | |||
31 | } | |||
32 | @@ -4039,7 +4038,11 @@ g_child_watch_source_init_multi_threaded | |||
33 | 8 | |||
34 | action.sa_handler = g_child_watch_signal_handler; | 9 | action.sa_handler = g_child_watch_signal_handler; | |
35 | sigemptyset (&action.sa_mask); | 10 | sigemptyset (&action.sa_mask); | |
36 | +#ifdef SA_RESTART | 11 | +#ifdef SA_RESTART | |
37 | action.sa_flags = SA_RESTART | SA_NOCLDSTOP; | 12 | action.sa_flags = SA_RESTART | SA_NOCLDSTOP; | |
38 | +#else /* QNX */ | 13 | +#else /* QNX */ | |
39 | + action.sa_flags = SA_NOCLDSTOP; | 14 | + action.sa_flags = SA_NOCLDSTOP; | |
40 | +#endif | 15 | +#endif | |
41 | sigaction (SIGCHLD, &action, NULL); | 16 | sigaction (SIGCHLD, &action, NULL); | |
42 | } | 17 | } | |
43 | 18 |