Wed Oct 1 12:14:42 2014 UTC ()
Fix ABI break (2 enums change value) when I added NetBSD credential support


(prlw1)
diff -r1.221 -r1.222 pkgsrc/devel/glib2/Makefile
diff -r1.202 -r1.203 pkgsrc/devel/glib2/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-gio_gioenums.h
cvs diff -r1.221 -r1.222 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2014/09/05 20:51:44 1.221
+++ pkgsrc/devel/glib2/Makefile 2014/10/01 12:14:42 1.222
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.221 2014/09/05 20:51:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.222 2014/10/01 12:14:42 prlw1 Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
 5PKGREVISION= 1
5CATEGORIES= devel gnome 6CATEGORIES= devel gnome
6 7
7COMMENT= Some useful routines for C programming (glib2) 8COMMENT= Some useful routines for C programming (glib2)
8 9
9USE_TOOLS+= msgfmt perl:run readlink 10USE_TOOLS+= msgfmt perl:run readlink
10 11
11PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 12PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
12PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 13PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
13PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in 14PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
14PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in 15PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
15PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in 16PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
16PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in 17PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
17PKGCONFIG_OVERRIDE+= gio-2.0.pc.in 18PKGCONFIG_OVERRIDE+= gio-2.0.pc.in
cvs diff -r1.202 -r1.203 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2014/09/14 23:35:23 1.202
+++ pkgsrc/devel/glib2/distinfo 2014/10/01 12:14:42 1.203
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: distinfo,v 1.202 2014/09/14 23:35:23 prlw1 Exp $ 1$NetBSD: distinfo,v 1.203 2014/10/01 12:14:42 prlw1 Exp $
2 2
3SHA1 (glib-2.40.0.tar.xz) = 44e1442ed4d1bf3fa89138965deb35afc1335a65 3SHA1 (glib-2.40.0.tar.xz) = 44e1442ed4d1bf3fa89138965deb35afc1335a65
4RMD160 (glib-2.40.0.tar.xz) = c50eed34bf8df127b959af27b02d6036934f758e 4RMD160 (glib-2.40.0.tar.xz) = c50eed34bf8df127b959af27b02d6036934f758e
5Size (glib-2.40.0.tar.xz) = 7016228 bytes 5Size (glib-2.40.0.tar.xz) = 7016228 bytes
6SHA1 (patch-aa) = 0d30b40995e539f772afedda2724fa3181fe0019 6SHA1 (patch-aa) = 0d30b40995e539f772afedda2724fa3181fe0019
7SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544 7SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
9SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 9SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
10SHA1 (patch-af) = 6da2f31b5052a9b1d02b9a87f47896be238a88bd 10SHA1 (patch-af) = 6da2f31b5052a9b1d02b9a87f47896be238a88bd
11SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5 11SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5
12SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7 12SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
13SHA1 (patch-ak) = f5699914c2fe212316a27c64dd129ea7dde594f0 13SHA1 (patch-ak) = f5699914c2fe212316a27c64dd129ea7dde594f0
14SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5 14SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
15SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293 15SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
16SHA1 (patch-an) = 8dfc12cf0c8f3b8c7948fe3b2543a56e0cacec98 16SHA1 (patch-an) = 8dfc12cf0c8f3b8c7948fe3b2543a56e0cacec98
17SHA1 (patch-ba) = 28b2a3341e8a6d5beb023e173c3353d2697ba49b 17SHA1 (patch-ba) = 28b2a3341e8a6d5beb023e173c3353d2697ba49b
18SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac 18SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
19SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871 19SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
20SHA1 (patch-cd) = 0d574419257a604ca19e18a43aa42ec6e9a36c78 20SHA1 (patch-cd) = 0d574419257a604ca19e18a43aa42ec6e9a36c78
21SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2 21SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
22SHA1 (patch-cl) = 871e1ca59f697eddd6692702fc7d63a2df826afc 22SHA1 (patch-cl) = 871e1ca59f697eddd6692702fc7d63a2df826afc
23SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93 23SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
24SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78 24SHA1 (patch-cn) = 0cb2fa14b2d3f0ff66f5d5f32e79a36c71a99b78
25SHA1 (patch-gio_gcredentials.c) = 67aade3aafa64827c4075c9cc487dc20ebbd1cab 25SHA1 (patch-gio_gcredentials.c) = 67aade3aafa64827c4075c9cc487dc20ebbd1cab
26SHA1 (patch-gio_gcredentialsprivate.h) = d2e47198728b328b18131e9806815153a95a89b1 26SHA1 (patch-gio_gcredentialsprivate.h) = d2e47198728b328b18131e9806815153a95a89b1
27SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa 27SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
28SHA1 (patch-gio_gioenums.h) = 4c3c8b11af2da6202b0b81e2430e2eaaaa5d2d54 28SHA1 (patch-gio_gioenums.h) = 2e42c935f836a24e859194394f44927ba8f6d4ae
29SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 29SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
30SHA1 (patch-gio_gsocket.c) = 64479463d8dd48f707adaef29af0e48f4143c266 30SHA1 (patch-gio_gsocket.c) = 64479463d8dd48f707adaef29af0e48f4143c266
31SHA1 (patch-gio_gunixcredentialsmessage.c) = ad4d56ac750e1822324c58c5e34e8f46ea1b58ac 31SHA1 (patch-gio_gunixcredentialsmessage.c) = ad4d56ac750e1822324c58c5e34e8f46ea1b58ac
32SHA1 (patch-gio_tests_credentials.c) = b26089f372d4fe3903e536867caacf52b1aa45d5 32SHA1 (patch-gio_tests_credentials.c) = b26089f372d4fe3903e536867caacf52b1aa45d5
33SHA1 (patch-glib_gmessages.c) = 623ee56d9a11e4d97981ee3011f8717c5a2a9403 33SHA1 (patch-glib_gmessages.c) = 623ee56d9a11e4d97981ee3011f8717c5a2a9403
34SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888 34SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
35SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3 35SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
cvs diff -r1.1 -r1.2 pkgsrc/devel/glib2/patches/Attic/patch-gio_gioenums.h (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-gio_gioenums.h 2014/09/05 20:49:55 1.1
+++ pkgsrc/devel/glib2/patches/Attic/patch-gio_gioenums.h 2014/10/01 12:14:42 1.2
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1$NetBSD: patch-gio_gioenums.h,v 1.1 2014/09/05 20:49:55 prlw1 Exp $ 1$NetBSD: patch-gio_gioenums.h,v 1.2 2014/10/01 12:14:42 prlw1 Exp $
2 2
3gcredentials: add NetBSD support 3gcredentials: add NetBSD support
4https://bugzilla.gnome.org/show_bug.cgi?id=728256 4https://bugzilla.gnome.org/show_bug.cgi?id=728256
5 5
6--- gio/gioenums.h.orig 2014-03-24 18:50:42.000000000 +0000 6--- gio/gioenums.h.orig 2014-03-24 18:50:42.000000000 +0000
7+++ gio/gioenums.h 7+++ gio/gioenums.h
8@@ -1352,6 +1352,7 @@ typedef enum 8@@ -1354,6 +1354,7 @@ typedef enum
9 * @G_CREDENTIALS_TYPE_INVALID: Indicates an invalid native credential type. 
10 * @G_CREDENTIALS_TYPE_LINUX_UCRED: The native credentials type is a <type>struct ucred</type>. 
11 * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>. 9 * @G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED: The native credentials type is a <type>struct cmsgcred</type>.
12+ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>. 
13 * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30. 10 * @G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED: The native credentials type is a <type>struct sockpeercred</type>. Added in 2.30.
14 * @G_CREDENTIALS_TYPE_SOLARIS_UCRED: The native credentials type is a <type>ucred_t</type>. Added in 2.40. 11 * @G_CREDENTIALS_TYPE_SOLARIS_UCRED: The native credentials type is a <type>ucred_t</type>. Added in 2.40.
 12+ * @G_CREDENTIALS_TYPE_NETBSD_UNPCBID: The native credentials type is a <type>struct unpcbid</type>.
 13 *
 14 * Enumeration describing different kinds of native credential types.
15 * 15 *
16@@ -1364,6 +1365,7 @@ typedef enum 16@@ -1365,7 +1366,8 @@ typedef enum
17 G_CREDENTIALS_TYPE_INVALID, 
18 G_CREDENTIALS_TYPE_LINUX_UCRED, 17 G_CREDENTIALS_TYPE_LINUX_UCRED,
19 G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED, 18 G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
20+ G_CREDENTIALS_TYPE_NETBSD_UNPCBID, 
21 G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED, 19 G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
22 G_CREDENTIALS_TYPE_SOLARIS_UCRED 20- G_CREDENTIALS_TYPE_SOLARIS_UCRED
 21+ G_CREDENTIALS_TYPE_SOLARIS_UCRED,
 22+ G_CREDENTIALS_TYPE_NETBSD_UNPCBID
23 } GCredentialsType; 23 } GCredentialsType;
 24
 25 /**