summaryrefslogtreecommitdiff
path: root/devel/glib2
diff options
context:
space:
mode:
authorprlw1 <prlw1>2014-10-01 12:14:42 +0000
committerprlw1 <prlw1>2014-10-01 12:14:42 +0000
commitb54a4a1ca9bf6b78b88301518783286f3f3f093e (patch)
tree30b58ec812d6ad05a2aef6518bd7e6590f2559fa /devel/glib2
parent4c106743db33ef2cc634a320d5f200f0b38e3e67 (diff)
downloadpkgsrc-b54a4a1ca9bf6b78b88301518783286f3f3f093e.tar.gz
Fix ABI break (2 enums change value) when I added NetBSD credential support
Diffstat (limited to 'devel/glib2')
-rw-r--r--devel/glib2/Makefile3
-rw-r--r--devel/glib2/distinfo4
-rw-r--r--devel/glib2/patches/patch-gio_gioenums.h20
3 files changed, 15 insertions, 12 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 06bbfcf9d61..32279b18617 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.221 2014/09/05 20:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.222 2014/10/01 12:14:42 prlw1 Exp $
.include "Makefile.common"
+PKGREVISION= 1
CATEGORIES= devel gnome
COMMENT= Some useful routines for C programming (glib2)
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 1f4ae02690f..30023ec4ce7 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.202 2014/09/14 23:35:23 prlw1 Exp $
+$NetBSD: distinfo,v 1.203 2014/10/01 12:14:42 prlw1 Exp $
SHA1 (glib-2.40.0.tar.xz) = 44e1442ed4d1bf3fa89138965deb35afc1335a65
RMD160 (glib-2.40.0.tar.xz) = c50eed34bf8df127b959af27b02d6036934f758e
@@ -25,7 +25,7 @@ SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
SHA1 (patch-gio_gcredentials.c) = 67aade3aafa64827c4075c9cc487dc20ebbd1cab
SHA1 (patch-gio_gcredentialsprivate.h) = d2e47198728b328b18131e9806815153a95a89b1
SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
-SHA1 (patch-gio_gioenums.h) = 4c3c8b11af2da6202b0b81e2430e2eaaaa5d2d54
+SHA1 (patch-gio_gioenums.h) = 2e42c935f836a24e859194394f44927ba8f6d4ae
SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
SHA1 (patch-gio_gsocket.c) = 64479463d8dd48f707adaef29af0e48f4143c266
SHA1 (patch-gio_gunixcredentialsmessage.c) = ad4d56ac750e1822324c58c5e34e8f46ea1b58ac
diff --git a/devel/glib2/patches/patch-gio_gioenums.h b/devel/glib2/patches/patch-gio_gioenums.h
index 1698f96340b..7bd67819e40 100644
--- a/devel/glib2/patches/patch-gio_gioenums.h
+++ b/devel/glib2/patches/patch-gio_gioenums.h
@@ -1,23 +1,25 @@
-$NetBSD: patch-gio_gioenums.h,v 1.1 2014/09/05 20:49:55 prlw1 Exp $
+$NetBSD: patch-gio_gioenums.h,v 1.2 2014/10/01 12:14:42 prlw1 Exp $
gcredentials: add NetBSD support
https://bugzilla.gnome.org/show_bug.cgi?id=728256
--- gio/gioenums.h.orig 2014-03-24 18:50:42.000000000 +0000
+++ gio/gioenums.h
-@@ -1352,6 +1352,7 @@ typedef enum
- * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type.
- * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>.
+@@ -1354,6 +1354,7 @@ typedef enum
* @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
-+ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
* @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
* @G_CREDENTIALS_TYPE_SOLARIS_UCRED: The native credentials type is a <type>ucred_t</type>. Added in 2.40.
++ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
+ *
+ * Enumeration describing different kinds of native credential types.
*
-@@ -1364,6 +1365,7 @@ typedef enum
- G_CREDENTIALS_TYPE_INVALID,
+@@ -1365,7 +1366,8 @@ typedef enum
G_CREDENTIALS_TYPE_LINUX_UCRED,
G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-+ G_CREDENTIALS_TYPE_NETBSD_UNPCBID,
G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
- G_CREDENTIALS_TYPE_SOLARIS_UCRED
+- G_CREDENTIALS_TYPE_SOLARIS_UCRED
++ G_CREDENTIALS_TYPE_SOLARIS_UCRED,
++ G_CREDENTIALS_TYPE_NETBSD_UNPCBID
} GCredentialsType;
+
+ /**