summaryrefslogtreecommitdiff
path: root/devel/glib2/patches/patch-aq
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2012-05-01 18:45:51 +0000
committeradam <adam@pkgsrc.org>2012-05-01 18:45:51 +0000
commita1389d0a9619e8f81d111c6a32c34615dc84189b (patch)
tree1540a3b8598c3d7a7db409df4a6edbf1cdd26a4f /devel/glib2/patches/patch-aq
parent7492f79ff2015768bce78e7ec887149c5c2d5677 (diff)
downloadpkgsrc-a1389d0a9619e8f81d111c6a32c34615dc84189b.tar.gz
Changes 2.32.2:
* GApplication: can now have a NULL application ID * g_clear_object: fix warnings when using it on C++ (due to lack of ability to implicitly cast void*) * GDBus: - add our own implementation of the message bus for use on Windows only - fix up a few bugs that use of this bus uncovered in GDBus - escape nonce files in dbus addressess (think 'c:\') - support initial underscores in dbus codegen namespace (for private) * Fix misdetection of GNUstep as Cocoa (for the MacOS GSettings backend) * make sure configure fails if AC_CHECK_ALIGNOF cannot detect the alignment * GAppInfo: overwrite the DISPLAY only if it is set in the launch context * glib/tests/date: force US locale running the GDateTime tests * GSocketControlMessage: Don't warn about unknown messages * Resources: - fix broken use of GVDB on big endian machines - set a 'display name' so that pretty file names appear in Gtk CSS warning messages * GMainContext: - block child sources when blocking the parent - introduce more testcases for child sources * Translations updates: Brazilian Portuguese French Galician Italian Lithuanian Polish Polish Serbian Simplified Chinese Spanish * Bug fixed: 619026 avoid warning in gutils.h when using gcc with -Wconversion 669260 Open/Save dialog hangs waiting for data with libsoup 671249 GApplication: Allow a null application_id? 672786 goa-daemon: action in notification doesn't work 673409 g_resource_lookup_data may return stale data pointer 674172 glib-2.32.1 misdetects GNUstep as Cocoa 674345 cssprovider: Make sure to print out file name in css warnings 674483 broken configure results when cross-compiling with gcc >= 4.5
Diffstat (limited to 'devel/glib2/patches/patch-aq')
-rw-r--r--devel/glib2/patches/patch-aq20
1 files changed, 10 insertions, 10 deletions
diff --git a/devel/glib2/patches/patch-aq b/devel/glib2/patches/patch-aq
index 0afd22501ea..c680a98da74 100644
--- a/devel/glib2/patches/patch-aq
+++ b/devel/glib2/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
+$NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
---- gio/gsocket.c.orig Sun Mar 11 21:43:04 2012
+--- gio/gsocket.c.orig 2012-05-01 00:06:39.000000000 +0000
+++ gio/gsocket.c
@@ -37,6 +37,9 @@
#include <signal.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
#ifndef G_OS_WIN32
# include <fcntl.h>
-@@ -3556,7 +3559,7 @@ g_socket_get_credentials (GSocket *soc
+@@ -4301,7 +4304,7 @@ g_socket_get_credentials (GSocket *soc
ret = NULL;
@@ -21,12 +21,10 @@ $NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
{
socklen_t optlen;
#if defined(__linux__)
-@@ -3589,6 +3592,35 @@ g_socket_get_credentials (GSocket *soc
- G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
- #endif
+@@ -4336,6 +4339,35 @@ g_socket_get_credentials (GSocket *soc
&native_creds);
-+ }
-+ }
+ }
+ }
+#elif defined(__NetBSD__) && defined(LOCAL_PEEREID)
+ {
+ struct unpcbid cred;
@@ -54,6 +52,8 @@ $NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
+ g_credentials_set_native (ret,
+ G_CREDENTIALS_TYPE_LINUX_UCRED,
+ &native_creds);
- }
- }
++ }
++ }
#else
+ g_set_error_literal (error,
+ G_IO_ERROR,