Changes 2.34.2:
* Bug fixes: 649302 Add support for GNU/FreeBSD 672924 Add annotations for g_filename_from_uri() 685995 Crash in g_menu_exporter_name_vanished 686091 Invalid reads in g_bytes_unref_to_data 686185 g_date_time_format Transcoding Fails on OSX 686213 Half open TCP sockets remain open after soup... 686662 introduce explicitly-sized enum types, depre... 686786 g_socket_get_available_bytes() returns wrong... 687089 g_dbus_connection_export_menu_model(): fix a... 687540 In Trash folder, Nautilus misinterprets "\n"... 687541 GSignalQuery param_types field needs array a... 687600 gfileutils.c performs invalid cast of (varar... 687801 tests/buffered-input-stream: Fix size of par...
This commit is contained in:
parent
8fecabd34c
commit
c8c97463ec
11 changed files with 64 additions and 40 deletions
18
devel/gdbus-codegen/hacks.mk
Normal file
18
devel/gdbus-codegen/hacks.mk
Normal file
|
@ -0,0 +1,18 @@
|
|||
# $NetBSD: hacks.mk,v 1.1 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
.if !defined(GDBUS_CODEGEN_HACKS_MK)
|
||||
GDBUS_CODEGEN_HACKS_MK= # defined
|
||||
|
||||
.if ${OPSYS} == "Darwin"
|
||||
CHECK_BUILTIN.libiconv:= yes
|
||||
. include "../../converters/libiconv/builtin.mk"
|
||||
CHECK_BUILTIN.libiconv:= no
|
||||
PKG_HACKS+= darwin-iconv
|
||||
SUBST_CLASSES+= iconv
|
||||
SUBST_STAGE.iconv= pre-configure
|
||||
SUBST_MESSAGE.iconv= Changing libiconv_open to iconv_open.
|
||||
SUBST_FILES.iconv= configure
|
||||
SUBST_SED.iconv= -e 's,libiconv_open,iconv_open,g'
|
||||
.endif
|
||||
|
||||
.endif
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.24 2012/10/31 11:17:00 asau Exp $
|
||||
# $NetBSD: Makefile.common,v 1.25 2012/11/13 21:23:07 adam Exp $
|
||||
#
|
||||
# used by devel/glib2/Makefile
|
||||
# used by devel/gdbus-codegen/Makefile
|
||||
|
@ -6,7 +6,7 @@
|
|||
|
||||
# When updating this package, please apply patch-ak to configure.in and
|
||||
# then run a matching version of autoconf to regen patch-aa.
|
||||
DISTNAME= glib-2.34.1
|
||||
DISTNAME= glib-2.34.2
|
||||
PKGNAME= ${DISTNAME:S/glib/glib2/}
|
||||
CATEGORIES= # empty; redefined in Makefile
|
||||
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/${PKGVERSION_NOREV:R}/ \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.71 2012/10/19 17:54:57 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.72 2012/11/13 21:23:07 adam Exp $
|
||||
bin/gdbus
|
||||
bin/gio-querymodules
|
||||
bin/glib-compile-resources
|
||||
|
@ -271,8 +271,8 @@ lib/pkgconfig/gthread-2.0.pc
|
|||
share/aclocal/glib-2.0.m4
|
||||
share/aclocal/glib-gettext.m4
|
||||
share/aclocal/gsettings.m4
|
||||
share/gdb/auto-load/libglib-2.0.so.0.3400.1-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3400.1-gdb.py
|
||||
share/gdb/auto-load/libglib-2.0.so.0.3400.2-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3400.2-gdb.py
|
||||
share/glib-2.0/gdb/glib.py
|
||||
share/glib-2.0/gdb/gobject.py
|
||||
share/glib-2.0/gettext/mkinstalldirs
|
||||
|
|
|
@ -1,26 +1,23 @@
|
|||
$NetBSD: distinfo,v 1.178 2012/10/19 17:54:57 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.179 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
SHA1 (glib-2.34.1.tar.xz) = 3d61e3bc941bb2b77569b5c01c509b70277cc09c
|
||||
RMD160 (glib-2.34.1.tar.xz) = 41f6d447ff300161838df36a719c5feb5f44c614
|
||||
Size (glib-2.34.1.tar.xz) = 6363332 bytes
|
||||
SHA1 (glib-gio-kqueue-2.32.4-v3.patch) = e849a2b306caa17aeffae1a4a480999681e98b5b
|
||||
RMD160 (glib-gio-kqueue-2.32.4-v3.patch) = 38c00a1ea75a5176720fcc4bc8160d1d9b0c3895
|
||||
Size (glib-gio-kqueue-2.32.4-v3.patch) = 100892 bytes
|
||||
SHA1 (glib-2.34.2.tar.xz) = ad16ef038e606d422fb282a78394328de3214309
|
||||
RMD160 (glib-2.34.2.tar.xz) = 5c3d8179941011c8420f35fa8f1aaaeb9bf52650
|
||||
Size (glib-2.34.2.tar.xz) = 6367740 bytes
|
||||
SHA1 (patch-aa) = 71405ed89d2abd25edec375d52c43fe50c9f7c82
|
||||
SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
|
||||
SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
|
||||
SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
|
||||
SHA1 (patch-af) = f35ea2e6101625555252b95596ea335f4ede651e
|
||||
SHA1 (patch-af) = 45c46d5d01517563fde21ba1a2fdd7d0485932ca
|
||||
SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
|
||||
SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
|
||||
SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492
|
||||
SHA1 (patch-ai) = 037e2bb85fbc473c431bbf736dae89825236ff31
|
||||
SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
|
||||
SHA1 (patch-ak) = 2d6826e2a07852a7c093353996361547cce1d17f
|
||||
SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
|
||||
SHA1 (patch-am) = 387d1ebb481052a2f7b9c14fa916c0286efcdb97
|
||||
SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
|
||||
SHA1 (patch-an) = c93823539ba95a0e182a25714ef5024c91da3a47
|
||||
SHA1 (patch-ap) = eeabf999a65cc51bc792798e4d81fef2ad35837b
|
||||
SHA1 (patch-aq) = 42ee287341bb3569bb95959a09fcde7c94e49088
|
||||
SHA1 (patch-ap) = c5cce246d2dac62d437103d4da361da8b28c66e4
|
||||
SHA1 (patch-aq) = 62abf831880ccd0529ae0af30a735ac3d01e5084
|
||||
SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
|
||||
SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
|
||||
SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
|
||||
|
@ -32,9 +29,9 @@ SHA1 (patch-cg) = be18840e9c56bf1c2c4c2759dfc73097d463923a
|
|||
SHA1 (patch-ci) = fcf75fc77bfcdaee8911f759d63978cd627d6ebb
|
||||
SHA1 (patch-cj) = e9d10c82a30049b358003b93585280ea26e12e22
|
||||
SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
|
||||
SHA1 (patch-cl) = 973e0fa003d9200cf07bb0a6a07fa5b3e2b4cb68
|
||||
SHA1 (patch-cl) = eb00468c5c5c70dd41803a2a263204686959a415
|
||||
SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
|
||||
SHA1 (patch-cn) = 7a2f42fc1199bfc3fd2ccbd2ed1c56a7f6c0028f
|
||||
SHA1 (patch-cn) = 611ad0a210fda4b22d7efbffe6a8e0db8ee92b05
|
||||
SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
|
||||
SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
|
||||
SHA1 (patch-glib_tests_include.c) = 95f7d34e6e03849316bbfac1541eec4582b92ffc
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-af,v 1.13 2012/05/01 18:45:52 adam Exp $
|
||||
$NetBSD: patch-af,v 1.14 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
--- glib/libcharset/Makefile.in.orig 2010-09-27 16:10:13.000000000 +0000
|
||||
+++ glib/libcharset/Makefile.in
|
||||
@@ -728,18 +728,6 @@ lcov-clean:
|
||||
@@ -776,18 +776,6 @@ lcov-clean:
|
||||
# run tests in cwd as part of make check
|
||||
check-local: test-nonrecursive
|
||||
install-exec-local: all-local
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-ai,v 1.20 2012/05/01 18:45:52 adam Exp $
|
||||
$NetBSD: patch-ai,v 1.21 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583321
|
||||
|
||||
--- glib/gmain.c.orig 2011-10-14 04:03:10.000000000 +0000
|
||||
+++ glib/gmain.c
|
||||
@@ -4393,7 +4393,11 @@ ensure_unix_signal_handler_installed_unl
|
||||
@@ -4538,7 +4538,11 @@ ensure_unix_signal_handler_installed_unl
|
||||
|
||||
action.sa_handler = g_unix_signal_handler;
|
||||
sigemptyset (&action.sa_mask);
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-am,v 1.8 2012/10/06 20:44:05 prlw1 Exp $
|
||||
$NetBSD: patch-am,v 1.9 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
--- gio/tests/converter-stream.c.orig 2012-09-03 14:24:05.000000000 +0000
|
||||
+++ gio/tests/converter-stream.c
|
||||
@@ -1167,7 +1167,9 @@ main (int argc,
|
||||
@@ -1173,7 +1173,9 @@ main (int argc,
|
||||
CharsetTest charset_tests[] = {
|
||||
{ "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
|
||||
{ "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
|
||||
$NetBSD: patch-ap,v 1.4 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
--- gio/gcredentials.c.orig Tue Aug 16 00:51:06 2011
|
||||
--- gio/gcredentials.c.orig 2012-11-10 03:18:53.000000000 +0000
|
||||
+++ gio/gcredentials.c
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <sys/socket.h>
|
||||
|
@ -14,7 +14,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
|
|||
#include <gobject/gvaluecollector.h>
|
||||
@@ -90,8 +93,14 @@ struct _GCredentials
|
||||
struct ucred native;
|
||||
#elif defined(__FreeBSD__)
|
||||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
struct cmsgcred native;
|
||||
-#elif defined(__OpenBSD__)
|
||||
+#elif defined(__OpenBSD__) && !defined(__MirBSD__)
|
||||
|
@ -54,7 +54,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
|
|||
+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
|
||||
if (credentials->native.uid == other_credentials->native.uid)
|
||||
ret = TRUE;
|
||||
#elif defined(__FreeBSD__)
|
||||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
@@ -305,7 +314,7 @@ g_credentials_get_native (GCredentials
|
||||
|
||||
ret = NULL;
|
||||
|
@ -80,7 +80,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
|
|||
- memcpy (&credentials->native, native, sizeof (struct ucred));
|
||||
+ memcpy (&credentials->native, native, sizeof (credentials->native));
|
||||
}
|
||||
#elif defined(__FreeBSD__)
|
||||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
if (native_type != G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED)
|
||||
@@ -433,7 +442,7 @@ g_credentials_get_unix_user (GCredential
|
||||
g_return_val_if_fail (G_IS_CREDENTIALS (credentials), -1);
|
||||
|
@ -89,7 +89,7 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
|
|||
-#ifdef __linux__
|
||||
+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
|
||||
ret = credentials->native.uid;
|
||||
#elif defined(__FreeBSD__)
|
||||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
ret = credentials->native.cmcred_euid;
|
||||
@@ -479,7 +488,7 @@ g_credentials_set_unix_user (GCredential
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
@ -99,4 +99,4 @@ $NetBSD: patch-ap,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
|
|||
+#if defined(__linux__) || defined(__NetBSD__) || defined(__MirBSD__)
|
||||
credentials->native.uid = uid;
|
||||
ret = TRUE;
|
||||
#elif defined(__FreeBSD__)
|
||||
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
|
||||
$NetBSD: patch-aq,v 1.5 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
--- gio/gsocket.c.orig 2012-05-01 00:06:39.000000000 +0000
|
||||
--- gio/gsocket.c.orig 2012-11-10 03:27:29.000000000 +0000
|
||||
+++ gio/gsocket.c
|
||||
@@ -37,6 +37,9 @@
|
||||
#include <signal.h>
|
||||
|
@ -12,7 +12,16 @@ $NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
|
|||
|
||||
#ifndef G_OS_WIN32
|
||||
# include <fcntl.h>
|
||||
@@ -4301,7 +4304,7 @@ g_socket_get_credentials (GSocket *soc
|
||||
@@ -2381,7 +2384,7 @@ g_socket_check_connect_result (GSocket
|
||||
gssize
|
||||
g_socket_get_available_bytes (GSocket *socket)
|
||||
{
|
||||
-#ifndef G_OS_WIN32
|
||||
+#ifdef G_OS_WIN32
|
||||
gulong avail = 0;
|
||||
#else
|
||||
gint avail = 0;
|
||||
@@ -4311,7 +4314,7 @@ g_socket_get_credentials (GSocket *soc
|
||||
|
||||
ret = NULL;
|
||||
|
||||
|
@ -21,7 +30,7 @@ $NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
|
|||
{
|
||||
socklen_t optlen;
|
||||
#if defined(__linux__)
|
||||
@@ -4336,6 +4339,35 @@ g_socket_get_credentials (GSocket *soc
|
||||
@@ -4346,6 +4349,35 @@ g_socket_get_credentials (GSocket *soc
|
||||
&native_creds);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-cl,v 1.8 2012/07/24 18:23:38 drochner Exp $
|
||||
$NetBSD: patch-cl,v 1.9 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
--- gio/Makefile.am.orig 2012-07-14 20:33:13.000000000 +0000
|
||||
+++ gio/Makefile.am
|
||||
|
@ -11,7 +11,7 @@ $NetBSD: patch-cl,v 1.8 2012/07/24 18:23:38 drochner Exp $
|
|||
|
||||
if OS_UNIX
|
||||
SUBDIRS += xdgmime
|
||||
@@ -715,13 +715,6 @@ gdbus_LDADD = libgio-2.0.la \
|
||||
@@ -722,13 +722,6 @@ gdbus_LDADD = libgio-2.0.la \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-cn,v 1.2 2012/05/01 18:45:53 adam Exp $
|
||||
$NetBSD: patch-cn,v 1.3 2012/11/13 21:23:07 adam Exp $
|
||||
|
||||
The mem-overflow test contains a declaration of an empty struct, which breaks
|
||||
on at least SunPro cc, and presumably some other non-gcc compilers. Skip this
|
||||
|
@ -7,7 +7,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
|
|||
|
||||
--- glib/tests/Makefile.am.orig 2011-06-05 23:18:49.000000000 +0000
|
||||
+++ glib/tests/Makefile.am
|
||||
@@ -76,9 +76,6 @@ hostutils_LDADD = $(progs_ldadd)
|
||||
@@ -77,9 +77,6 @@ hostutils_LDADD = $(progs_ldadd)
|
||||
TEST_PROGS += gvariant
|
||||
gvariant_LDADD = $(progs_ldadd)
|
||||
|
||||
|
|
Loading…
Reference in a new issue