From 8c60f012891c087ef3f26d31e8788adadfcac6ac Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 23 Mar 2012 13:19:32 +0000 Subject: [PATCH] Major update to glib2-2.31.20. Note that this is a devel version but the new stable is expected within a week or so. Committing now so that I have time to deal with the breakage and can start the upcoming gnome3 update. Please contact me _directly_ if you find any issue with it. --- devel/glib2/Makefile | 22 ++++---- devel/glib2/distinfo | 20 +++---- devel/glib2/patches/patch-gio_gunixmounts_c | 54 ++++++++++--------- .../patches/patch-gio_kqueue_kqueue-thread_c | 10 +--- .../patches/patch-gio_tests_gdbus-peer_c | 28 ---------- devel/glib2/patches/patch-glib-2_0_pc_in | 15 ++++++ devel/glib2/patches/patch-glib_gmain_c | 22 -------- .../patches/patch-glib_tests_Makefile_am | 12 ++--- .../patches/patch-gthread_tests_gwakeuptest_c | 21 -------- devel/glib2/pkg/PLIST-docs | 41 ++++++++++---- devel/glib2/pkg/PLIST-main | 40 +++++++++++--- 11 files changed, 137 insertions(+), 148 deletions(-) delete mode 100644 devel/glib2/patches/patch-gio_tests_gdbus-peer_c create mode 100644 devel/glib2/patches/patch-glib-2_0_pc_in delete mode 100644 devel/glib2/patches/patch-glib_gmain_c delete mode 100644 devel/glib2/patches/patch-gthread_tests_gwakeuptest_c diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index f58c8ab6fcf..7dfe1bc7da4 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.155 2012/03/12 07:21:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.156 2012/03/23 13:19:32 ajacoutot Exp $ COMMENT-main= general-purpose utility library COMMENT-docs= glib2 documentation -VERSION= 2.30.3 +VERSION= 2.31.20 DISTNAME= glib-${VERSION} EXTRACT_SUFX= .tar.xz @@ -16,11 +16,11 @@ HOMEPAGE= http://www.gtk.org/ MAINTAINER= Antoine Jacoutot -SHARED_LIBS += glib-2.0 2992.0 # 2992.0 -SHARED_LIBS += gmodule-2.0 2992.0 # 2992.0 -SHARED_LIBS += gthread-2.0 2992.0 # 2992.0 -SHARED_LIBS += gobject-2.0 2992.0 # 2992.0 -SHARED_LIBS += gio-2.0 2992.0 # 2992.0 +SHARED_LIBS += glib-2.0 3200.0 # 3120.0 +SHARED_LIBS += gmodule-2.0 3200.0 # 3120.0 +SHARED_LIBS += gthread-2.0 3200.0 # 3120.0 +SHARED_LIBS += gobject-2.0 3200.0 # 3120.0 +SHARED_LIBS += gio-2.0 3200.0 # 3120.0 # LGPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -78,7 +78,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ CONFIGURE_ARGS += --disable-maintainer-mode CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -pthread" + LDFLAGS="-L${LOCALBASE}/lib" ### kqueue(1) backend ################################################## AUTOMAKE_VERSION= 1.11 @@ -86,8 +86,10 @@ AUTOCONF_VERSION= 2.68 BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} \ devel/libtool -MASTER_SITES0= http://dmitrymatveev.co.uk/files/ -PATCHFILES= glib-gio-kqueue-2.28.8-v3.patch:0 +#MASTER_SITES0= http://dmitrymatveev.co.uk/files/ +MASTER_SITES0= http://distfiles.bsdfrog.org/ +PATCH_DIST_STRIP= -p2 +PATCHFILES= glib-gio-kqueue-2.28.8-v3.1.patch:0 AUTO_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ AUTOCONF_VERSION=${AUTOCONF_VERSION} post-patch: diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 46444b64463..bd623758b35 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,10 +1,10 @@ -MD5 (glib-2.30.3.tar.xz) = D5+jKcbBAS0P2GGtPYpFIA== -MD5 (glib-gio-kqueue-2.28.8-v3.patch) = UJgRcpBOLZXErtqPv+4kyA== -RMD160 (glib-2.30.3.tar.xz) = CIewji//dcMl7R+xEjuq9C3Jd5s= -RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ukhZ1DNttQustr2qzple52EwaoU= -SHA1 (glib-2.30.3.tar.xz) = 7JfdZZhi3KBdGAk6bqbDCdz/DN0= -SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = 1QvuFM5yIBw+wrgtDkmMiCj72MI= -SHA256 (glib-2.30.3.tar.xz) = 5suyfHHERZkzRueF6GCcx1zqKUHjIxLlRIcv66Vy3Sc= -SHA256 (glib-gio-kqueue-2.28.8-v3.patch) = pNcpl5J9m/6gD4TkCW0ubP9N7DpTJDtFWs2Ztcj5N30= -SIZE (glib-2.30.3.tar.xz) = 5642448 -SIZE (glib-gio-kqueue-2.28.8-v3.patch) = 89920 +MD5 (glib-2.31.20.tar.xz) = FuGWTpk7BlxwMVfbFyGNKg== +MD5 (glib-gio-kqueue-2.28.8-v3.1.patch) = mtUYsYvi2qyMfX0aEve2Tw== +RMD160 (glib-2.31.20.tar.xz) = ITyJ09nrNmU5SpLJSQ4mQdS+VV0= +RMD160 (glib-gio-kqueue-2.28.8-v3.1.patch) = jPRRpGn6Ev2nlviPrJkDlIZCGFw= +SHA1 (glib-2.31.20.tar.xz) = dxGBM/cVc+NQQ0Ps4FRWQby3jNM= +SHA1 (glib-gio-kqueue-2.28.8-v3.1.patch) = koqgrfnOK9tWzlJiEhpn3MFEBns= +SHA256 (glib-2.31.20.tar.xz) = NHXh2GbEYqNridS66RGBUTw5CtCvJfRFYYMh2h4CLCo= +SHA256 (glib-gio-kqueue-2.28.8-v3.1.patch) = FVB8klsUKHi8TAorZgxB9kxQz/YdAPXuqFq7iP8YBKg= +SIZE (glib-2.31.20.tar.xz) = 6069744 +SIZE (glib-gio-kqueue-2.28.8-v3.1.patch) = 92493 diff --git a/devel/glib2/patches/patch-gio_gunixmounts_c b/devel/glib2/patches/patch-gio_gunixmounts_c index 2d3d09648de..4bc4af33c32 100644 --- a/devel/glib2/patches/patch-gio_gunixmounts_c +++ b/devel/glib2/patches/patch-gio_gunixmounts_c @@ -1,22 +1,22 @@ -$OpenBSD: patch-gio_gunixmounts_c,v 1.5 2011/09/27 06:05:28 ajacoutot Exp $ +$OpenBSD: patch-gio_gunixmounts_c,v 1.6 2012/03/23 13:19:32 ajacoutot Exp $ https://bugzilla.gnome.org/show_bug.cgi?id=583330 From FreeBSD: poll the list of mounted filesystems since we can't rely on checking for mtab updates like other systems. ---- gio/gunixmounts.c.orig Wed Sep 21 21:17:06 2011 -+++ gio/gunixmounts.c Tue Sep 27 07:52:34 2011 -@@ -153,6 +153,9 @@ struct _GUnixMountMonitor { - - GFileMonitor *fstab_monitor; +--- gio/gunixmounts.c.orig Tue Feb 21 01:10:54 2012 ++++ gio/gunixmounts.c Fri Mar 16 12:38:35 2012 +@@ -156,6 +156,9 @@ struct _GUnixMountMonitor { GFileMonitor *mtab_monitor; + + GSource *proc_mounts_watch_source; + + guint mount_poller_source; + GList *mount_poller_mounts; }; struct _GUnixMountMonitorClass { -@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_monitor = NULL; +@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_monitor = NULL; static GList *_g_get_unix_mounts (void); static GList *_g_get_unix_mount_points (void); @@ -25,7 +25,7 @@ on checking for mtab updates like other systems. G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); #define MOUNT_POLL_INTERVAL 4000 -@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor +@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor #endif #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) @@ -33,7 +33,7 @@ on checking for mtab updates like other systems. #include #include #include -@@ -240,11 +246,14 @@ g_unix_is_mount_path_system_internal (const char *moun +@@ -243,11 +249,14 @@ g_unix_is_mount_path_system_internal (const char *moun "/", /* we already have "Filesystem root" in Nautilus */ "/bin", "/boot", @@ -48,7 +48,7 @@ on checking for mtab updates like other systems. "/live/cow", "/live/image", "/media", -@@ -255,7 +264,12 @@ g_unix_is_mount_path_system_internal (const char *moun +@@ -258,7 +267,12 @@ g_unix_is_mount_path_system_internal (const char *moun "/srv", "/tmp", "/usr", @@ -61,7 +61,7 @@ on checking for mtab updates like other systems. "/var", "/var/crash", "/var/local", -@@ -1111,6 +1125,10 @@ get_mounts_timestamp (void) +@@ -1122,6 +1136,10 @@ get_mounts_timestamp (void) if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -72,7 +72,7 @@ on checking for mtab updates like other systems. return 0; } -@@ -1253,6 +1271,13 @@ g_unix_mount_monitor_finalize (GObject *object) +@@ -1267,6 +1285,13 @@ g_unix_mount_monitor_finalize (GObject *object) g_object_unref (monitor->mtab_monitor); } @@ -86,8 +86,8 @@ on checking for mtab updates like other systems. the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1333,6 +1358,51 @@ mtab_file_changed (GFileMonitor *monitor, - g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); +@@ -1358,6 +1383,51 @@ proc_mounts_changed (GIOChannel *channel, + return TRUE; } +static gboolean @@ -138,16 +138,20 @@ on checking for mtab updates like other systems. static void g_unix_mount_monitor_init (GUnixMountMonitor *monitor) { -@@ -1354,6 +1424,12 @@ g_unix_mount_monitor_init (GUnixMountMonitor *monitor) - g_object_unref (file); - - g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); -+ } -+ else -+ { -+ monitor->mount_poller_mounts = _g_get_unix_mounts (); -+ mount_poller_time = (guint64)time (NULL); -+ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor); +@@ -1406,10 +1476,16 @@ g_unix_mount_monitor_init (GUnixMountMonitor *monitor) + } + else + { ++#if defined __linux__ + file = g_file_new_for_path (mtab_path); + monitor->mtab_monitor = g_file_monitor_file (file, 0, NULL, NULL); + g_object_unref (file); + g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); ++#else ++ monitor->mount_poller_mounts = _g_get_unix_mounts (); ++ mount_poller_time = (guint64)time (NULL); ++ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor); ++#endif + } } } - diff --git a/devel/glib2/patches/patch-gio_kqueue_kqueue-thread_c b/devel/glib2/patches/patch-gio_kqueue_kqueue-thread_c index 0b3c55ff7f5..ae680907f54 100644 --- a/devel/glib2/patches/patch-gio_kqueue_kqueue-thread_c +++ b/devel/glib2/patches/patch-gio_kqueue_kqueue-thread_c @@ -1,14 +1,6 @@ -$OpenBSD: patch-gio_kqueue_kqueue-thread_c,v 1.2 2012/03/12 07:21:06 ajacoutot Exp $ +$OpenBSD: patch-gio_kqueue_kqueue-thread_c,v 1.3 2012/03/23 13:19:32 ajacoutot Exp $ --- gio/kqueue/kqueue-thread.c.orig Mon Mar 12 07:46:36 2012 +++ gio/kqueue/kqueue-thread.c Mon Mar 12 07:46:36 2012 -@@ -21,6 +21,7 @@ - *******************************************************************************/ - - #include "config.h" -+#include - #include - #include - #include @@ -228,8 +229,11 @@ _kqueue_thread_func (void *arg) if (ret == -1) diff --git a/devel/glib2/patches/patch-gio_tests_gdbus-peer_c b/devel/glib2/patches/patch-gio_tests_gdbus-peer_c deleted file mode 100644 index 55cc06cd49f..00000000000 --- a/devel/glib2/patches/patch-gio_tests_gdbus-peer_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-gio_tests_gdbus-peer_c,v 1.3 2011/10/08 15:14:17 ajacoutot Exp $ - -From c739a5df14ff5ee8cf262ce6e1cebdd0096aff5a Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sat, 08 Oct 2011 09:47:20 +0000 -Subject: gio: enable test_peer regression test for OpenBSD - ---- gio/tests/gdbus-peer.c.orig Thu Sep 15 02:01:00 2011 -+++ gio/tests/gdbus-peer.c Sat Oct 8 11:43:57 2011 -@@ -795,6 +795,18 @@ test_peer (void) - g_assert (native_creds->pid == getpid ()); - } - g_object_unref (credentials); -+#elif defined (__OpenBSD__) -+ { -+ struct sockpeercred *native_creds; -+ g_assert_no_error (error); -+ g_assert (G_IS_CREDENTIALS (credentials)); -+ native_creds = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED); -+ g_assert (native_creds != NULL); -+ g_assert (native_creds->uid == getuid ()); -+ g_assert (native_creds->gid == getgid ()); -+ g_assert (native_creds->pid == getpid ()); -+ } -+ g_object_unref (credentials); - #else - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED); - g_assert (credentials == NULL); diff --git a/devel/glib2/patches/patch-glib-2_0_pc_in b/devel/glib2/patches/patch-glib-2_0_pc_in new file mode 100644 index 00000000000..73efb67387e --- /dev/null +++ b/devel/glib2/patches/patch-glib-2_0_pc_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-glib-2_0_pc_in,v 1.1 2012/03/23 13:19:32 ajacoutot Exp $ + +libglib-2.0.so includes pthread_* symbols. + +--- glib-2.0.pc.in.orig Mon Feb 20 21:23:17 2012 ++++ glib-2.0.pc.in Fri Mar 16 16:43:28 2012 +@@ -11,6 +11,6 @@ Name: GLib + Description: C Utility Library + Version: @VERSION@ + Requires.private: @PCRE_REQUIRES@ +-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ ++Libs: @G_THREAD_LIBS@ -L${libdir} -lglib-2.0 @INTLLIBS@ + Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ +-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ ++Cflags: @G_THREAD_CFLAGS@ -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ diff --git a/devel/glib2/patches/patch-glib_gmain_c b/devel/glib2/patches/patch-glib_gmain_c deleted file mode 100644 index 136997afa1b..00000000000 --- a/devel/glib2/patches/patch-glib_gmain_c +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-glib_gmain_c,v 1.10 2012/03/12 07:21:06 ajacoutot Exp $ - -Rewrote upstream, but provides similar functionnality. -(test with GDM that the following does not happen: -Failed to read from child watch wake up pipe: Interrupted system call) - ---- glib/gmain.c.orig Sun Mar 11 22:43:28 2012 -+++ glib/gmain.c Mon Mar 12 07:46:36 2012 -@@ -4564,7 +4564,12 @@ unix_signal_helper_thread (gpointer data) - gboolean sigint_received = FALSE; - gboolean sighup_received = FALSE; - -- bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b)); -+ do -+ { -+ bytes_read = read (unix_signal_wake_up_pipe[0], b, sizeof (b)); -+ } -+ while (bytes_read == -1 && errno == EINTR); -+ - if (bytes_read < 0) - { - g_warning ("Failed to read from child watch wake up pipe: %s", diff --git a/devel/glib2/patches/patch-glib_tests_Makefile_am b/devel/glib2/patches/patch-glib_tests_Makefile_am index d5a8078d979..35869335891 100644 --- a/devel/glib2/patches/patch-glib_tests_Makefile_am +++ b/devel/glib2/patches/patch-glib_tests_Makefile_am @@ -1,9 +1,9 @@ -$OpenBSD: patch-glib_tests_Makefile_am,v 1.1 2012/02/02 07:10:18 ajacoutot Exp $ ---- glib/tests/Makefile.am.orig Mon Jan 30 13:48:23 2012 -+++ glib/tests/Makefile.am Mon Jan 30 13:48:51 2012 -@@ -193,7 +193,7 @@ unix_nothreads_LDADD = $(progs_ldadd) - noinst_PROGRAMS += atomic - atomic_CFLAGS = $(INCLUDES) +$OpenBSD: patch-glib_tests_Makefile_am,v 1.2 2012/03/23 13:19:32 ajacoutot Exp $ +--- glib/tests/Makefile.am.orig Mon Feb 20 21:23:17 2012 ++++ glib/tests/Makefile.am Fri Mar 16 12:10:00 2012 +@@ -190,7 +190,7 @@ sort_LDADD = $(progs_ldadd) + TEST_PROGS += atomic + atomic_CFLAGS = $(INCLUDES) if HAVE_GCC -atomic_CFLAGS += -Wstrict-aliasing=2 +atomic_CFLAGS += -Wstrict-aliasing diff --git a/devel/glib2/patches/patch-gthread_tests_gwakeuptest_c b/devel/glib2/patches/patch-gthread_tests_gwakeuptest_c deleted file mode 100644 index f2688d41bb8..00000000000 --- a/devel/glib2/patches/patch-gthread_tests_gwakeuptest_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-gthread_tests_gwakeuptest_c,v 1.1 2012/02/20 19:36:50 ajacoutot Exp $ ---- gthread/tests/gwakeuptest.c.orig Fri Nov 11 18:56:52 2011 -+++ gthread/tests/gwakeuptest.c Mon Feb 20 20:34:16 2012 -@@ -31,7 +31,7 @@ test_semantics (void) - gint i; - - /* prevent the test from deadlocking */ -- alarm (30); -+ alarm (60); - - wakeup = g_wakeup_new (); - g_assert (!check_signaled (wakeup)); -@@ -212,7 +212,7 @@ test_threaded (void) - gint i; - - /* make sure we don't block forever */ -- alarm (30); -+ alarm (60); - - /* simple mainloop test based on GWakeup. - * diff --git a/devel/glib2/pkg/PLIST-docs b/devel/glib2/pkg/PLIST-docs index 81f91ee9fdd..904787f832d 100644 --- a/devel/glib2/pkg/PLIST-docs +++ b/devel/glib2/pkg/PLIST-docs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-docs,v 1.24 2012/03/12 07:21:06 ajacoutot Exp $ +@comment $OpenBSD: PLIST-docs,v 1.25 2012/03/23 13:19:32 ajacoutot Exp $ @conflict glib2-<2.4.6 share/gtk-doc/ share/gtk-doc/html/ @@ -9,6 +9,7 @@ share/gtk-doc/html/gio/ExampleObject.html share/gtk-doc/html/gio/ExampleObjectManagerClient.html share/gtk-doc/html/gio/GAction.html share/gtk-doc/html/gio/GActionGroup.html +share/gtk-doc/html/gio/GActionMap.html share/gtk-doc/html/gio/GAppInfo.html share/gtk-doc/html/gio/GApplication.html share/gtk-doc/html/gio/GApplicationCommandLine.html @@ -20,10 +21,12 @@ share/gtk-doc/html/gio/GCancellable.html share/gtk-doc/html/gio/GCharsetConverter.html share/gtk-doc/html/gio/GConverter.html share/gtk-doc/html/gio/GCredentials.html +share/gtk-doc/html/gio/GDBusActionGroup.html share/gtk-doc/html/gio/GDBusAuthObserver.html share/gtk-doc/html/gio/GDBusConnection.html share/gtk-doc/html/gio/GDBusInterface.html share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html +share/gtk-doc/html/gio/GDBusMenuModel.html share/gtk-doc/html/gio/GDBusMessage.html share/gtk-doc/html/gio/GDBusMethodInvocation.html share/gtk-doc/html/gio/GDBusObject.html @@ -61,9 +64,12 @@ share/gtk-doc/html/gio/GInputStream.html share/gtk-doc/html/gio/GLoadableIcon.html share/gtk-doc/html/gio/GMemoryInputStream.html share/gtk-doc/html/gio/GMemoryOutputStream.html +share/gtk-doc/html/gio/GMenu.html +share/gtk-doc/html/gio/GMenuModel.html share/gtk-doc/html/gio/GMount.html share/gtk-doc/html/gio/GMountOperation.html share/gtk-doc/html/gio/GNetworkAddress.html +share/gtk-doc/html/gio/GNetworkMonitor.html share/gtk-doc/html/gio/GNetworkService.html share/gtk-doc/html/gio/GOutputStream.html share/gtk-doc/html/gio/GPermission.html @@ -72,6 +78,7 @@ share/gtk-doc/html/gio/GPollableOutputStream.html share/gtk-doc/html/gio/GProxy.html share/gtk-doc/html/gio/GProxyAddress.html share/gtk-doc/html/gio/GProxyResolver.html +share/gtk-doc/html/gio/GRemoteActionGroup.html share/gtk-doc/html/gio/GResolver.html share/gtk-doc/html/gio/GSeekable.html share/gtk-doc/html/gio/GSettings.html @@ -122,6 +129,7 @@ share/gtk-doc/html/gio/api-index-2-24.html share/gtk-doc/html/gio/api-index-2-26.html share/gtk-doc/html/gio/api-index-2-28.html share/gtk-doc/html/gio/api-index-2-30.html +share/gtk-doc/html/gio/api-index-2-32.html share/gtk-doc/html/gio/api-index-deprecated.html share/gtk-doc/html/gio/api-index-full.html share/gtk-doc/html/gio/application.html @@ -129,22 +137,22 @@ share/gtk-doc/html/gio/async.html share/gtk-doc/html/gio/ch01.html share/gtk-doc/html/gio/ch02.html share/gtk-doc/html/gio/ch03.html -share/gtk-doc/html/gio/ch26.html share/gtk-doc/html/gio/ch27.html -share/gtk-doc/html/gio/ch27s02.html -share/gtk-doc/html/gio/ch27s03.html share/gtk-doc/html/gio/ch28.html share/gtk-doc/html/gio/ch28s02.html share/gtk-doc/html/gio/ch28s03.html -share/gtk-doc/html/gio/ch28s04.html -share/gtk-doc/html/gio/ch28s05.html -share/gtk-doc/html/gio/ch28s06.html -share/gtk-doc/html/gio/ch28s07.html share/gtk-doc/html/gio/ch29.html share/gtk-doc/html/gio/ch29s02.html share/gtk-doc/html/gio/ch29s03.html share/gtk-doc/html/gio/ch29s04.html share/gtk-doc/html/gio/ch29s05.html +share/gtk-doc/html/gio/ch29s06.html +share/gtk-doc/html/gio/ch29s07.html +share/gtk-doc/html/gio/ch30.html +share/gtk-doc/html/gio/ch30s02.html +share/gtk-doc/html/gio/ch30s03.html +share/gtk-doc/html/gio/ch30s04.html +share/gtk-doc/html/gio/ch30s05.html share/gtk-doc/html/gio/conversion.html share/gtk-doc/html/gio/extending-gio.html share/gtk-doc/html/gio/extending.html @@ -162,6 +170,7 @@ share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html share/gtk-doc/html/gio/gio-D-Bus-Utilities.html share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html share/gtk-doc/html/gio/gio-Extension-Points.html +share/gtk-doc/html/gio/gio-GActionGroup-exporter.html share/gtk-doc/html/gio/gio-GContentType.html share/gtk-doc/html/gio/gio-GConverterInputstream.html share/gtk-doc/html/gio/gio-GConverterOutputstream.html @@ -169,6 +178,10 @@ share/gtk-doc/html/gio/gio-GDBusError.html share/gtk-doc/html/gio/gio-GFileAttribute.html share/gtk-doc/html/gio/gio-GIOError.html share/gtk-doc/html/gio/gio-GIOScheduler.html +share/gtk-doc/html/gio/gio-GInetAddressMask.html +share/gtk-doc/html/gio/gio-GMenuModel-exporter.html +share/gtk-doc/html/gio/gio-GResource.html +share/gtk-doc/html/gio/gio-GSettingsSchema-GSettingsSchemaSource.html share/gtk-doc/html/gio/gio-GWin32InputStream.html share/gtk-doc/html/gio/gio-GWin32OutputStream.html share/gtk-doc/html/gio/gio-Owning-Bus-Names.html @@ -178,7 +191,9 @@ share/gtk-doc/html/gio/gio-Watching-Bus-Names.html share/gtk-doc/html/gio/gio-hierarchy.html share/gtk-doc/html/gio/gio-querymodules.html share/gtk-doc/html/gio/gio.devhelp2 +share/gtk-doc/html/gio/glib-compile-resources.html share/gtk-doc/html/gio/glib-compile-schemas.html +share/gtk-doc/html/gio/gresource-tool.html share/gtk-doc/html/gio/gsettings-tool.html share/gtk-doc/html/gio/gvfs-overview.png share/gtk-doc/html/gio/highlevel-socket.html @@ -187,12 +202,15 @@ share/gtk-doc/html/gio/icons.html share/gtk-doc/html/gio/index.html share/gtk-doc/html/gio/index.sgml share/gtk-doc/html/gio/left.png +share/gtk-doc/html/gio/menu-example.png +share/gtk-doc/html/gio/menu-model.png share/gtk-doc/html/gio/migrating.html share/gtk-doc/html/gio/networking.html share/gtk-doc/html/gio/permissions.html share/gtk-doc/html/gio/pt01.html share/gtk-doc/html/gio/pt02.html share/gtk-doc/html/gio/resolver.html +share/gtk-doc/html/gio/resources.html share/gtk-doc/html/gio/right.png share/gtk-doc/html/gio/settings.html share/gtk-doc/html/gio/streaming.html @@ -217,11 +235,13 @@ share/gtk-doc/html/glib/api-index-2-24.html share/gtk-doc/html/glib/api-index-2-26.html share/gtk-doc/html/glib/api-index-2-28.html share/gtk-doc/html/glib/api-index-2-30.html +share/gtk-doc/html/glib/api-index-2-32.html share/gtk-doc/html/glib/api-index-2-4.html share/gtk-doc/html/glib/api-index-2-6.html share/gtk-doc/html/glib/api-index-2-8.html share/gtk-doc/html/glib/api-index-deprecated.html share/gtk-doc/html/glib/api-index-full.html +share/gtk-doc/html/glib/deprecated.html share/gtk-doc/html/glib/file-name-encodings.png share/gtk-doc/html/glib/glib-Arrays.html share/gtk-doc/html/glib/glib-Asynchronous-Queues.html @@ -240,6 +260,7 @@ share/gtk-doc/html/glib/glib-Data-Checksums.html share/gtk-doc/html/glib/glib-Data-HMACs.html share/gtk-doc/html/glib/glib-Datasets.html share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html +share/gtk-doc/html/glib/glib-Deprecated-Thread-APIs.html share/gtk-doc/html/glib/glib-Double-ended-Queues.html share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html @@ -258,10 +279,7 @@ share/gtk-doc/html/glib/glib-IO-Channels.html share/gtk-doc/html/glib/glib-Key-value-file-parser.html share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html share/gtk-doc/html/glib/glib-Lexical-Scanner.html -share/gtk-doc/html/glib/glib-Limits-of-Basic-Types.html share/gtk-doc/html/glib/glib-Memory-Allocation.html -share/gtk-doc/html/glib/glib-Memory-Allocators.html -share/gtk-doc/html/glib/glib-Memory-Chunks.html share/gtk-doc/html/glib/glib-Memory-Slices.html share/gtk-doc/html/glib/glib-Message-Logging.html share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html @@ -337,6 +355,7 @@ share/gtk-doc/html/gobject/api-index-2-24.html share/gtk-doc/html/gobject/api-index-2-26.html share/gtk-doc/html/gobject/api-index-2-28.html share/gtk-doc/html/gobject/api-index-2-30.html +share/gtk-doc/html/gobject/api-index-2-32.html share/gtk-doc/html/gobject/api-index-2-4.html share/gtk-doc/html/gobject/api-index-2-6.html share/gtk-doc/html/gobject/api-index-2-8.html diff --git a/devel/glib2/pkg/PLIST-main b/devel/glib2/pkg/PLIST-main index c0a476c99c1..d2f006e0718 100644 --- a/devel/glib2/pkg/PLIST-main +++ b/devel/glib2/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.25 2012/03/12 07:21:06 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.26 2012/03/23 13:19:32 ajacoutot Exp $ @conflict glib2-fam-* @pkgpath devel/glib2 @pkgpath devel/glib2,-fam @@ -7,11 +7,13 @@ @bin bin/gdbus bin/gdbus-codegen @bin bin/gio-querymodules +@bin bin/glib-compile-resources @bin bin/glib-compile-schemas @bin bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @bin bin/gobject-query +@bin bin/gresource @bin bin/gsettings @bin bin/gtester bin/gtester-report @@ -31,6 +33,8 @@ include/glib-2.0/ include/glib-2.0/gio/ include/glib-2.0/gio/gaction.h include/glib-2.0/gio/gactiongroup.h +include/glib-2.0/gio/gactiongroupexporter.h +include/glib-2.0/gio/gactionmap.h include/glib-2.0/gio/gappinfo.h include/glib-2.0/gio/gapplication.h include/glib-2.0/gio/gapplicationcommandline.h @@ -47,6 +51,7 @@ include/glib-2.0/gio/gconverteroutputstream.h include/glib-2.0/gio/gcredentials.h include/glib-2.0/gio/gdatainputstream.h include/glib-2.0/gio/gdataoutputstream.h +include/glib-2.0/gio/gdbusactiongroup.h include/glib-2.0/gio/gdbusaddress.h include/glib-2.0/gio/gdbusauthobserver.h include/glib-2.0/gio/gdbusconnection.h @@ -54,6 +59,7 @@ include/glib-2.0/gio/gdbuserror.h include/glib-2.0/gio/gdbusinterface.h include/glib-2.0/gio/gdbusinterfaceskeleton.h include/glib-2.0/gio/gdbusintrospection.h +include/glib-2.0/gio/gdbusmenumodel.h include/glib-2.0/gio/gdbusmessage.h include/glib-2.0/gio/gdbusmethodinvocation.h include/glib-2.0/gio/gdbusnameowning.h @@ -84,6 +90,7 @@ include/glib-2.0/gio/gfilterinputstream.h include/glib-2.0/gio/gfilteroutputstream.h include/glib-2.0/gio/gicon.h include/glib-2.0/gio/ginetaddress.h +include/glib-2.0/gio/ginetaddressmask.h include/glib-2.0/gio/ginetsocketaddress.h include/glib-2.0/gio/ginitable.h include/glib-2.0/gio/ginputstream.h @@ -98,10 +105,14 @@ include/glib-2.0/gio/giotypes.h include/glib-2.0/gio/gloadableicon.h include/glib-2.0/gio/gmemoryinputstream.h include/glib-2.0/gio/gmemoryoutputstream.h +include/glib-2.0/gio/gmenu.h +include/glib-2.0/gio/gmenuexporter.h +include/glib-2.0/gio/gmenumodel.h include/glib-2.0/gio/gmount.h include/glib-2.0/gio/gmountoperation.h include/glib-2.0/gio/gnativevolumemonitor.h include/glib-2.0/gio/gnetworkaddress.h +include/glib-2.0/gio/gnetworkmonitor.h include/glib-2.0/gio/gnetworkservice.h include/glib-2.0/gio/goutputstream.h include/glib-2.0/gio/gpermission.h @@ -111,10 +122,13 @@ include/glib-2.0/gio/gproxy.h include/glib-2.0/gio/gproxyaddress.h include/glib-2.0/gio/gproxyaddressenumerator.h include/glib-2.0/gio/gproxyresolver.h +include/glib-2.0/gio/gremoteactiongroup.h include/glib-2.0/gio/gresolver.h +include/glib-2.0/gio/gresource.h include/glib-2.0/gio/gseekable.h include/glib-2.0/gio/gsettings.h include/glib-2.0/gio/gsettingsbackend.h +include/glib-2.0/gio/gsettingsschema.h include/glib-2.0/gio/gsimpleaction.h include/glib-2.0/gio/gsimpleactiongroup.h include/glib-2.0/gio/gsimpleasyncresult.h @@ -151,6 +165,13 @@ include/glib-2.0/glib/ include/glib-2.0/glib-object.h include/glib-2.0/glib-unix.h include/glib-2.0/glib.h +include/glib-2.0/glib/deprecated/ +include/glib-2.0/glib/deprecated/gallocator.h +include/glib-2.0/glib/deprecated/gcache.h +include/glib-2.0/glib/deprecated/gcompletion.h +include/glib-2.0/glib/deprecated/gmain.h +include/glib-2.0/glib/deprecated/grel.h +include/glib-2.0/glib/deprecated/gthread.h include/glib-2.0/glib/galloca.h include/glib-2.0/glib/garray.h include/glib-2.0/glib/gasyncqueue.h @@ -159,16 +180,18 @@ include/glib-2.0/glib/gbacktrace.h include/glib-2.0/glib/gbase64.h include/glib-2.0/glib/gbitlock.h include/glib-2.0/glib/gbookmarkfile.h -include/glib-2.0/glib/gcache.h +include/glib-2.0/glib/gbytes.h +include/glib-2.0/glib/gcharset.h include/glib-2.0/glib/gchecksum.h -include/glib-2.0/glib/gcompletion.h include/glib-2.0/glib/gconvert.h include/glib-2.0/glib/gdataset.h include/glib-2.0/glib/gdate.h include/glib-2.0/glib/gdatetime.h include/glib-2.0/glib/gdir.h +include/glib-2.0/glib/genviron.h include/glib-2.0/glib/gerror.h include/glib-2.0/glib/gfileutils.h +include/glib-2.0/glib/ggettext.h include/glib-2.0/glib/ghash.h include/glib-2.0/glib/ghmac.h include/glib-2.0/glib/ghook.h @@ -195,7 +218,6 @@ include/glib-2.0/glib/gquark.h include/glib-2.0/glib/gqueue.h include/glib-2.0/glib/grand.h include/glib-2.0/glib/gregex.h -include/glib-2.0/glib/grel.h include/glib-2.0/glib/gscanner.h include/glib-2.0/glib/gsequence.h include/glib-2.0/glib/gshell.h @@ -205,11 +227,13 @@ include/glib-2.0/glib/gspawn.h include/glib-2.0/glib/gstdio.h include/glib-2.0/glib/gstrfuncs.h include/glib-2.0/glib/gstring.h +include/glib-2.0/glib/gstringchunk.h include/glib-2.0/glib/gtestutils.h include/glib-2.0/glib/gthread.h include/glib-2.0/glib/gthreadpool.h include/glib-2.0/glib/gtimer.h include/glib-2.0/glib/gtimezone.h +include/glib-2.0/glib/gtrashstack.h include/glib-2.0/glib/gtree.h include/glib-2.0/glib/gtypes.h include/glib-2.0/glib/gunicode.h @@ -217,6 +241,8 @@ include/glib-2.0/glib/gurifuncs.h include/glib-2.0/glib/gutils.h include/glib-2.0/glib/gvariant.h include/glib-2.0/glib/gvarianttype.h +include/glib-2.0/glib/gversion.h +include/glib-2.0/glib/gversionmacros.h include/glib-2.0/glib/gwin32.h include/glib-2.0/gmodule.h include/glib-2.0/gobject/ @@ -297,11 +323,13 @@ lib/pkgconfig/gthread-2.0.pc @man man/man1/gdbus-codegen.1 @man man/man1/gdbus.1 @man man/man1/gio-querymodules.1 +@man man/man1/glib-compile-resources.1 @man man/man1/glib-compile-schemas.1 @man man/man1/glib-genmarshal.1 @man man/man1/glib-gettextize.1 @man man/man1/glib-mkenums.1 @man man/man1/gobject-query.1 +@man man/man1/gresource.1 @man man/man1/gsettings.1 @man man/man1/gtester-report.1 @man man/man1/gtester.1 @@ -311,8 +339,8 @@ share/aclocal/gsettings.m4 share/doc/pkg-readmes/${FULLPKGNAME} share/gdb/ share/gdb/auto-load/ -share/gdb/auto-load/libglib-2.0.so.0.3000.3-gdb.py -share/gdb/auto-load/libgobject-2.0.so.0.3000.3-gdb.py +share/gdb/auto-load/libglib-2.0.so.0.3120.0-gdb.py +share/gdb/auto-load/libgobject-2.0.so.0.3120.0-gdb.py share/glib-2.0/ share/glib-2.0/gdb/ share/glib-2.0/gdb/glib.py