*** HEADS UP!

Major update to glib2-2.26.0.
This starts a flood commit of several big updates (gtk+2 and GNOME 2.32).

Please note that there will be some WANTLIB/DEPENDS breakage probably,
this went into several bulks but it's impossible to catch everything.
Any gtk+2/glib2 related build failures, please talk to me or jasper@

The ports tree is expected to be in a unconsistent state for a couple of
days to give us time to fix everything we didn't spot or any runtime
issue with the latest GNOME.
We do this now so that we have packages with all the latest major bumped
libraries at p2k10.

Thanks to landry@ and his zomg!cluster for the bulks and reports.

ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:17:19 +00:00
parent e099268f79
commit cf5a80bff3
20 changed files with 248 additions and 101 deletions

View File

@ -1,26 +1,24 @@
# $OpenBSD: Makefile,v 1.92 2010/09/24 16:20:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.93 2010/09/30 07:17:19 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.24.2
VERSION= 2.26.0
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 2
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
SHARED_LIBS+= glib-2.0 1803.0 # .2400.1
SHARED_LIBS+= gobject-2.0 1803.0 # .2400.1
SHARED_LIBS+= gmodule-2.0 1803.0 # .2400.1
SHARED_LIBS+= gthread-2.0 1803.0 # .2400.1
SHARED_LIBS+= gio-2.0 1803.0 # .2400.1
SHARED_LIBS += glib-2.0 2600.0 # 2600.0
SHARED_LIBS += gmodule-2.0 2600.0 # 2600.0
SHARED_LIBS += gthread-2.0 2600.0 # 2600.0
SHARED_LIBS += gobject-2.0 2600.0 # 2600.0
SHARED_LIBS += gio-2.0 2600.0 # 2600.0
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -45,7 +43,9 @@ PKG_ARCH-docs= *
LIB_DEPENDS-docs=
RUN_DEPENDS-docs=
REGRESS_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
# DBus is only used in the GDBus test cases
REGRESS_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \
::x11/dbus
USE_GMAKE= Yes
USE_LIBTOOL= Yes
@ -54,6 +54,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-static \
--enable-fam \
--with-pcre=system \
--disable-gtk-doc \
--disable-Bsymbolic \
--disable-selinux \
--disable-xattr \
--disable-silent-rules
@ -66,5 +68,9 @@ pre-configure:
-e "s,/usr/share,${LOCALBASE}/share,g;" \
-e "s,/etc/xdg,${SYSCONFDIR}/xdg,g" \
${WRKSRC}/glib/gutils.c ${WRKSRC}/gio/xdgmime/xdgmime.c
perl -pi -e 's,/var/lib/dbus/machine-id,${SYSCONFDIR}/dbus-1/machine-id,g' \
${WRKSRC}/gio/gdbusconnection.c \
${WRKSRC}/gio/gdbusaddress.c \
${WRKSRC}/gio/gdbusprivate.c ${WRKSRC}/po/*.po
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (glib-2.24.2.tar.bz2) = im5F14QEYO2EKI6/11eC1A==
RMD160 (glib-2.24.2.tar.bz2) = JZ0tCpKxoBu2JKK3WdD4Lu/CJ+o=
SHA1 (glib-2.24.2.tar.bz2) = iCNQwxr5Kc1OeO5qrUYQh0gkDng=
SHA256 (glib-2.24.2.tar.bz2) = OutSGr02Qt0SJDefDlSRWVflAQ+IikrnSvoK1U2gFgw=
SIZE (glib-2.24.2.tar.bz2) = 5326328
MD5 (glib-2.26.0.tar.bz2) = m33GH144nhz/J3pjUMNzlw==
RMD160 (glib-2.26.0.tar.bz2) = F2RBlE8kwnQ5iQOuGBbuz+LP82s=
SHA1 (glib-2.26.0.tar.bz2) = nX6dzirdP63DUHmtKRqU9F689wY=
SHA256 (glib-2.26.0.tar.bz2) = TBjjqttbIKzHwPfTp32oooQ7han9c/06o2CnrqlT47I=
SIZE (glib-2.26.0.tar.bz2) = 6632632

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.23 2010/09/24 16:20:40 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.24 2010/09/30 07:17:19 ajacoutot Exp $
OpenBSD does not have sched_get_priority_{max,min}.
--- configure.orig Fri Sep 24 16:23:49 2010
+++ configure Fri Sep 24 16:24:38 2010
@@ -25883,6 +25883,15 @@ $as_echo "$glib_result" >&6; }
--- configure.orig Sat Sep 18 21:28:26 2010
+++ configure Mon Sep 27 14:42:36 2010
@@ -25257,6 +25257,15 @@ $as_echo "$glib_result" >&6; }
posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
posix_priority_max="sched_get_priority_max(SCHED_OTHER)"
break

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.7 2010/04/22 19:34:06 ajacoutot Exp $
--- docs/reference/glib/Makefile.in.orig Fri Mar 26 16:01:25 2010
+++ docs/reference/glib/Makefile.in Sun Mar 28 07:51:43 2010
@@ -434,8 +434,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.8 2010/09/30 07:17:19 ajacoutot Exp $
--- docs/reference/glib/Makefile.in.orig Sat Sep 18 21:28:23 2010
+++ docs/reference/glib/Makefile.in Mon Sep 27 14:42:36 2010
@@ -446,8 +446,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
########################################################################
man_MANS = \
glib-gettextize.1 \
@ -9,5 +9,5 @@ $OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.7 2010/04/22 19:34:06 ajacou
- gtester-report.1
+ gtester.1
BUILT_EXTRA_DIST = $(man_MANS)
MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
all: all-am

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-gio_gnetworkingprivate_h,v 1.1 2010/09/30 07:17:19 ajacoutot Exp $
--- gio/gnetworkingprivate.h.orig Tue Sep 28 15:25:02 2010
+++ gio/gnetworkingprivate.h Tue Sep 28 15:26:25 2010
@@ -49,11 +49,6 @@
#endif
#include <sys/types.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
-#include <arpa/nameser_compat.h>
-#endif
#ifndef T_SRV
#define T_SRV 33
@@ -71,6 +66,12 @@
#include <resolv.h>
#include <sys/socket.h>
#include <sys/un.h>
+
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+#if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
+#include <arpa/nameser_compat.h>
+#endif
#ifndef _PATH_RESCONF
#define _PATH_RESCONF "/etc/resolv.conf"

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-gio_gunixmount_c,v 1.1 2010/04/29 16:38:41 ajacoutot Exp $
$OpenBSD: patch-gio_gunixmount_c,v 1.2 2010/09/30 07:17:19 ajacoutot Exp $
Removable device needs to be unmounted before it is ejected.
--- gio/gunixmount.c.orig Sat Aug 29 04:52:23 2009
+++ gio/gunixmount.c Thu Apr 29 14:13:50 2010
--- gio/gunixmount.c.orig Mon Aug 9 15:34:46 2010
+++ gio/gunixmount.c Mon Sep 27 14:42:36 2010
@@ -29,6 +29,11 @@
#include <sys/wait.h>
#include <unistd.h>
@ -16,7 +16,7 @@ Removable device needs to be unmounted before it is ejected.
#include <glib.h>
#include "gunixvolumemonitor.h"
#include "gunixmount.h"
@@ -453,10 +458,15 @@ g_unix_mount_eject (GMount *mount,
@@ -452,10 +457,15 @@ g_unix_mount_eject (GMount *mount,
GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
char *argv[] = {"eject", NULL, NULL};

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gio_gunixmounts_c,v 1.1 2009/10/14 01:29:39 ajacoutot Exp $
$OpenBSD: patch-gio_gunixmounts_c,v 1.2 2010/09/30 07:17:19 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 Apr 1 01:04:20 2009
+++ gio/gunixmounts.c Wed Oct 14 03:13:38 2009
@@ -136,6 +136,9 @@ struct _GUnixMountMonitor {
--- gio/gunixmounts.c.orig Mon Aug 9 15:34:46 2010
+++ gio/gunixmounts.c Mon Sep 27 14:42:36 2010
@@ -135,6 +135,9 @@ struct _GUnixMountMonitor {
GFileMonitor *fstab_monitor;
GFileMonitor *mtab_monitor;
@ -16,7 +16,7 @@ on checking for mtab updates like other systems.
};
struct _GUnixMountMonitorClass {
@@ -147,6 +150,8 @@ static GUnixMountMonitor *the_mount_monitor = NULL;
@@ -146,6 +149,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
@@ -173,6 +178,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor
@@ -172,6 +177,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor
#endif
#if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
@ -33,7 +33,7 @@ on checking for mtab updates like other systems.
#include <sys/ucred.h>
#include <sys/mount.h>
#include <fstab.h>
@@ -223,20 +229,28 @@ g_unix_is_mount_path_system_internal (const char *moun
@@ -222,20 +228,28 @@ g_unix_is_mount_path_system_internal (const char *moun
"/", /* we already have "Filesystem root" in Nautilus */
"/bin",
"/boot",

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gio_tests_memory-output-stream_c,v 1.1 2010/06/07 12:47:28 jasper Exp $
$OpenBSD: patch-gio_tests_memory-output-stream_c,v 1.2 2010/09/30 07:17:19 ajacoutot Exp $
Fix build with GCC2.
--- gio/tests/memory-output-stream.c.orig Mon Jun 7 10:04:19 2010
+++ gio/tests/memory-output-stream.c Mon Jun 7 10:06:51 2010
@@ -92,6 +92,10 @@ test_properties (void)
--- gio/tests/memory-output-stream.c.orig Mon Aug 9 15:34:46 2010
+++ gio/tests/memory-output-stream.c Mon Sep 27 14:42:36 2010
@@ -118,6 +118,10 @@ test_properties (void)
GDataOutputStream *o;
int i;
GError *error = NULL;
@ -15,7 +15,7 @@ Fix build with GCC2.
g_test_bug ("605733");
@@ -107,13 +111,11 @@ test_properties (void)
@@ -133,13 +137,11 @@ test_properties (void)
g_assert_no_error (error);
}
@ -29,5 +29,5 @@ Fix build with GCC2.
- gpointer data_prop;
+ data_fun = g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mo));
g_object_get (mo, "data", &data_prop, NULL);
g_assert_cmphex (data_fun, ==, data_prop);
g_assert_cmphex (GPOINTER_TO_SIZE (data_fun), ==, GPOINTER_TO_SIZE (data_prop));

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-glib_Makefile_in,v 1.18 2010/05/03 11:41:56 ajacoutot Exp $
$OpenBSD: patch-glib_Makefile_in,v 1.19 2010/09/30 07:17:19 ajacoutot Exp $
Don't install gtester-report, it'll only pull in python.
--- glib/Makefile.in.orig Mon May 3 02:59:23 2010
+++ glib/Makefile.in Mon May 3 12:46:28 2010
@@ -726,7 +726,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
--- glib/Makefile.in.orig Mon Sep 27 18:10:13 2010
+++ glib/Makefile.in Mon Sep 27 18:44:45 2010
@@ -777,7 +777,7 @@ INSTALL_PROGS = $(am__append_5) $(am__append_6) $(am__
@OS_WIN32_TRUE@@OS_WIN32_X64_FALSE@gspawn_win32_helper_console_LDADD = libglib-2.0.la
@OS_UNIX_TRUE@gtester_SOURCES = gtester.c
@OS_UNIX_TRUE@gtester_LDADD = libglib-2.0.la
@ -12,19 +12,19 @@ Don't install gtester-report, it'll only pull in python.
+@OS_UNIX_TRUE@auto_config_binscripts =
@OS_UNIX_TRUE@bin_SCRIPTS = ${auto_config_binscripts}
@OS_UNIX_TRUE@CONFIGVARS = \
@OS_UNIX_TRUE@ "bindir" : "${bindir}", \
@@ -1440,7 +1440,7 @@ info: info-recursive
@OS_UNIX_TRUE@ "bindir" : "${bindir}", \
@@ -1539,7 +1539,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
install-glibincludeHEADERS install-glibsubincludeHEADERS
install-glibincludeHEADERS install-glibsubincludeHEADERS \
install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1658,9 +1658,7 @@ distclean-local:
@@ -1793,9 +1793,7 @@ distclean-local:
libglib-gdb.py: libglib-gdb.py.in
sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
-install-data-hook: libglib-gdb.py
- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gbacktrace_c,v 1.5 2007/10/24 22:29:03 jasper Exp $
--- glib/gbacktrace.c.orig Sun Sep 16 18:28:33 2007
+++ glib/gbacktrace.c Tue Oct 2 20:47:04 2007
@@ -167,7 +167,7 @@ g_on_error_stack_trace (const gchar *prg_name)
$OpenBSD: patch-glib_gbacktrace_c,v 1.6 2010/09/30 07:17:19 ajacoutot Exp $
--- glib/gbacktrace.c.orig Mon Sep 13 17:57:51 2010
+++ glib/gbacktrace.c Mon Sep 27 14:42:36 2010
@@ -172,7 +172,7 @@ g_on_error_stack_trace (const gchar *prg_name)
if (!prg_name)
return;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-glib_gmacros_h,v 1.12 2009/11/26 08:00:43 ajacoutot Exp $
--- glib/gmacros.h.orig Wed Apr 1 01:04:20 2009
+++ glib/gmacros.h Sat Nov 21 14:38:24 2009
$OpenBSD: patch-glib_gmacros_h,v 1.13 2010/09/30 07:17:19 ajacoutot Exp $
--- glib/gmacros.h.orig Mon Aug 9 15:34:46 2010
+++ glib/gmacros.h Mon Sep 27 14:42:36 2010
@@ -38,6 +38,7 @@
/* We include stddef.h to get the system's definition of NULL
*/
@ -23,7 +23,7 @@ $OpenBSD: patch-glib_gmacros_h,v 1.12 2009/11/26 08:00:43 ajacoutot Exp $
#define G_GNUC_NO_INSTRUMENT \
__attribute__((__no_instrument_function__))
#else /* !__GNUC__ */
@@ -187,11 +193,13 @@
@@ -194,11 +200,13 @@
#define TRUE (!FALSE)
#endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gprintf_c,v 1.5 2008/10/27 21:28:01 landry Exp $
--- glib/gprintf.c.orig Thu Oct 16 16:31:58 2008
+++ glib/gprintf.c Sat Oct 18 16:46:26 2008
@@ -89,6 +89,8 @@ g_fprintf (FILE *file,
$OpenBSD: patch-glib_gprintf_c,v 1.6 2010/09/30 07:17:19 ajacoutot Exp $
--- glib/gprintf.c.orig Mon Sep 13 17:57:51 2010
+++ glib/gprintf.c Mon Sep 27 14:42:36 2010
@@ -87,6 +87,8 @@ g_fprintf (FILE *file,
return retval;
}
@ -9,8 +9,8 @@ $OpenBSD: patch-glib_gprintf_c,v 1.5 2008/10/27 21:28:01 landry Exp $
+ "warning: g_sprintf() is often misused, please use g_snprintf()");
/**
* g_sprintf:
* @string: A pointer to a memory buffer to contain the resulting string. It
@@ -212,6 +214,8 @@ g_vfprintf (FILE *file,
* @string: A pointer to a memory buffer to contain the resulting string. It
@@ -215,6 +217,8 @@ g_vfprintf (FILE *file,
return _g_vfprintf (file, format, args);
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_grand_c,v 1.2 2010/04/22 19:34:06 ajacoutot Exp $
--- glib/grand.c.orig Wed Mar 17 21:55:34 2010
+++ glib/grand.c Sun Mar 28 07:51:43 2010
@@ -223,7 +223,7 @@ g_rand_new (void)
$OpenBSD: patch-glib_grand_c,v 1.3 2010/09/30 07:17:19 ajacoutot Exp $
--- glib/grand.c.orig Mon Sep 13 17:57:51 2010
+++ glib/grand.c Mon Sep 27 14:42:36 2010
@@ -227,7 +227,7 @@ g_rand_new (void)
do
{
errno = 0;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-glib_gstrfuncs_c,v 1.9 2009/07/12 20:38:09 ajacoutot Exp $
--- glib/gstrfuncs.c.orig Wed Apr 1 01:04:20 2009
+++ glib/gstrfuncs.c Thu Jun 11 14:15:29 2009
@@ -1381,7 +1381,7 @@ g_strerror (gint errnum)
$OpenBSD: patch-glib_gstrfuncs_c,v 1.10 2010/09/30 07:17:19 ajacoutot Exp $
--- glib/gstrfuncs.c.orig Mon Sep 13 17:57:51 2010
+++ glib/gstrfuncs.c Mon Sep 27 14:44:40 2010
@@ -1394,7 +1394,7 @@ g_strerror (gint errnum)
g_static_private_set (&msg_private, msg, g_free);
}
@ -10,12 +10,12 @@ $OpenBSD: patch-glib_gstrfuncs_c,v 1.9 2009/07/12 20:38:09 ajacoutot Exp $
errno = saved_errno;
return msg;
@@ -1545,7 +1545,7 @@ extern const char *strsignal(int);
@@ -1558,7 +1558,7 @@ extern const char *strsignal(int);
g_static_private_set (&msg_private, msg, g_free);
}
- _g_sprintf (msg, "unknown signal (%d)", signum);
+ _g_snprintf (msg, 64, "unknown signal (%d)", signum);
return msg;
}

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-gobject_Makefile_in,v 1.8 2010/05/03 11:41:56 ajacoutot Exp $
--- gobject/Makefile.in.orig Mon May 3 12:46:43 2010
+++ gobject/Makefile.in Mon May 3 12:47:04 2010
@@ -1198,7 +1198,7 @@ info: info-recursive
$OpenBSD: patch-gobject_Makefile_in,v 1.9 2010/09/30 07:17:19 ajacoutot Exp $
--- gobject/Makefile.in.orig Sat Sep 18 21:28:25 2010
+++ gobject/Makefile.in Mon Sep 27 14:43:10 2010
@@ -1243,7 +1243,7 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
+install-data-am: install-data-local \
install-libgobjectincludeHEADERS
install-libgobjectincludeHEADERS install-tapsetDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1414,9 +1414,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
@@ -1488,9 +1488,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
uninstall-gdb:
-rm -r $(DESTDIR)$(datadir)/gdb

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-m4macros_gsettings_m4,v 1.1 2010/09/30 07:17:19 ajacoutot Exp $
Bug 627126 - gsettings schema files don't get installed on FreeBSD
--- m4macros/gsettings.m4.orig Mon Aug 9 15:34:46 2010
+++ m4macros/gsettings.m4 Tue Sep 28 10:33:03 2010
@@ -46,8 +46,8 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \
+ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\''
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
@$(NORMAL_INSTALL)

View File

@ -1,11 +1,13 @@
$OpenBSD: patch-tests_Makefile_in,v 1.15 2010/04/22 19:34:06 ajacoutot Exp $
--- tests/Makefile.in.orig Fri Mar 26 16:01:29 2010
+++ tests/Makefile.in Sun Mar 28 07:51:44 2010
@@ -738,7 +738,6 @@ test_programs = \
tree-test \
$OpenBSD: patch-tests_Makefile_in,v 1.16 2010/09/30 07:17:19 ajacoutot Exp $
--- tests/Makefile.in.orig Sat Sep 18 21:28:25 2010
+++ tests/Makefile.in Mon Sep 27 14:43:37 2010
@@ -639,8 +639,7 @@ test_programs = \
thread-test \
threadpool-test \
type-test \
unicode-caseconv \
- unicode-encoding \
utf8-validate \
utf8-pointer \
uri-test \
- unicode-caseconv \
- unicode-encoding
+ unicode-caseconv
test_scripts = run-collate-tests.sh run-assert-msg-test.sh
test_script_support_programs = unicode-collate

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.15 2010/04/22 19:34:06 ajacoutot Exp $
--- tests/refcount/Makefile.in.orig Fri Mar 26 16:01:29 2010
+++ tests/refcount/Makefile.in Sun Mar 28 07:51:44 2010
@@ -377,7 +377,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.16 2010/09/30 07:17:19 ajacoutot Exp $
--- tests/refcount/Makefile.in.orig Sat Sep 18 21:28:26 2010
+++ tests/refcount/Makefile.in Mon Sep 27 14:42:37 2010
@@ -403,7 +403,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
libgobject = $(top_builddir)/gobject/libgobject-2.0.la
LDADD = $(libglib) $(libgobject) $(libgthread) $(G_THREAD_LIBS)
test_programs = \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.19 2010/04/22 19:34:06 ajacoutot Exp $
@comment $OpenBSD: PLIST-docs,v 1.20 2010/09/30 07:17:19 ajacoutot Exp $
@conflict glib2-<2.4.6
share/gtk-doc/
share/gtk-doc/html/
@ -11,6 +11,13 @@ share/gtk-doc/html/gio/GBufferedOutputStream.html
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/GDBusAuthObserver.html
share/gtk-doc/html/gio/GDBusConnection.html
share/gtk-doc/html/gio/GDBusMessage.html
share/gtk-doc/html/gio/GDBusMethodInvocation.html
share/gtk-doc/html/gio/GDBusProxy.html
share/gtk-doc/html/gio/GDBusServer.html
share/gtk-doc/html/gio/GDataInputStream.html
share/gtk-doc/html/gio/GDataOutputStream.html
share/gtk-doc/html/gio/GDrive.html
@ -43,9 +50,16 @@ share/gtk-doc/html/gio/GMountOperation.html
share/gtk-doc/html/gio/GNetworkAddress.html
share/gtk-doc/html/gio/GNetworkService.html
share/gtk-doc/html/gio/GOutputStream.html
share/gtk-doc/html/gio/GPermission.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/GResolver.html
share/gtk-doc/html/gio/GSeekable.html
share/gtk-doc/html/gio/GSettings.html
share/gtk-doc/html/gio/GSettingsBackend.html
share/gtk-doc/html/gio/GSimpleAsyncResult.html
share/gtk-doc/html/gio/GSimplePermission.html
share/gtk-doc/html/gio/GSocket.html
share/gtk-doc/html/gio/GSocketAddress.html
share/gtk-doc/html/gio/GSocketClient.html
@ -54,8 +68,11 @@ share/gtk-doc/html/gio/GSocketConnection.html
share/gtk-doc/html/gio/GSocketControlMessage.html
share/gtk-doc/html/gio/GSocketListener.html
share/gtk-doc/html/gio/GSocketService.html
share/gtk-doc/html/gio/GTcpConnection.html
share/gtk-doc/html/gio/GThemedIcon.html
share/gtk-doc/html/gio/GThreadedSocketService.html
share/gtk-doc/html/gio/GUnixConnection.html
share/gtk-doc/html/gio/GUnixCredentialsMessage.html
share/gtk-doc/html/gio/GUnixFDList.html
share/gtk-doc/html/gio/GUnixFDMessage.html
share/gtk-doc/html/gio/GUnixInputStream.html
@ -66,39 +83,66 @@ share/gtk-doc/html/gio/GVolume.html
share/gtk-doc/html/gio/GVolumeMonitor.html
share/gtk-doc/html/gio/GZlibCompressor.html
share/gtk-doc/html/gio/GZlibDecompressor.html
share/gtk-doc/html/gio/annotation-glossary.html
share/gtk-doc/html/gio/api-index-2-18.html
share/gtk-doc/html/gio/api-index-2-20.html
share/gtk-doc/html/gio/api-index-2-22.html
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-deprecated.html
share/gtk-doc/html/gio/api-index-full.html
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/ch19.html
share/gtk-doc/html/gio/ch20.html
share/gtk-doc/html/gio/ch20s02.html
share/gtk-doc/html/gio/ch20s03.html
share/gtk-doc/html/gio/ch24.html
share/gtk-doc/html/gio/ch25.html
share/gtk-doc/html/gio/ch25s02.html
share/gtk-doc/html/gio/ch25s03.html
share/gtk-doc/html/gio/ch26.html
share/gtk-doc/html/gio/ch26s02.html
share/gtk-doc/html/gio/ch26s03.html
share/gtk-doc/html/gio/ch26s04.html
share/gtk-doc/html/gio/ch26s05.html
share/gtk-doc/html/gio/ch26s06.html
share/gtk-doc/html/gio/ch26s07.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/ch27s04.html
share/gtk-doc/html/gio/ch27s05.html
share/gtk-doc/html/gio/ch27s06.html
share/gtk-doc/html/gio/conversion.html
share/gtk-doc/html/gio/extending-gio.html
share/gtk-doc/html/gio/extending.html
share/gtk-doc/html/gio/failable_initialization.html
share/gtk-doc/html/gio/file_mon.html
share/gtk-doc/html/gio/file_ops.html
share/gtk-doc/html/gio/gdbus-convenience.html
share/gtk-doc/html/gio/gdbus-lowlevel.html
share/gtk-doc/html/gio/gdbus.html
share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
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-GContentType.html
share/gtk-doc/html/gio/gio-GConverterInputstream.html
share/gtk-doc/html/gio/gio-GConverterOutputstream.html
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-GSrvTarget.html
share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
share/gtk-doc/html/gio/gio-Unix-Mounts.html
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.devhelp
share/gtk-doc/html/gio/gio.devhelp2
share/gtk-doc/html/gio/glib-compile-schemas.html
share/gtk-doc/html/gio/gsettings.html
share/gtk-doc/html/gio/gvfs-overview.png
share/gtk-doc/html/gio/highlevel-socket.html
share/gtk-doc/html/gio/home.png
@ -108,17 +152,21 @@ share/gtk-doc/html/gio/index.sgml
share/gtk-doc/html/gio/left.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/right.png
share/gtk-doc/html/gio/settings.html
share/gtk-doc/html/gio/streaming.html
share/gtk-doc/html/gio/style.css
share/gtk-doc/html/gio/tools.html
share/gtk-doc/html/gio/types.html
share/gtk-doc/html/gio/up.png
share/gtk-doc/html/gio/utils.html
share/gtk-doc/html/gio/volume_mon.html
share/gtk-doc/html/glib/
share/gtk-doc/html/glib/annotation-glossary.html
share/gtk-doc/html/glib/api-index-2-10.html
share/gtk-doc/html/glib/api-index-2-12.html
share/gtk-doc/html/glib/api-index-2-14.html
@ -128,6 +176,7 @@ share/gtk-doc/html/glib/api-index-2-2.html
share/gtk-doc/html/glib/api-index-2-20.html
share/gtk-doc/html/glib/api-index-2-22.html
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-4.html
share/gtk-doc/html/glib/api-index-2-6.html
share/gtk-doc/html/glib/api-index-2-8.html
@ -155,6 +204,8 @@ share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
share/gtk-doc/html/glib/glib-Error-Reporting.html
share/gtk-doc/html/glib/glib-File-Utilities.html
share/gtk-doc/html/glib/glib-GDateTime.html
share/gtk-doc/html/glib/glib-GTimeZone.html
share/gtk-doc/html/glib/glib-GVariant.html
share/gtk-doc/html/glib/glib-GVariantType.html
share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
@ -230,8 +281,10 @@ share/gtk-doc/html/glib/style.css
share/gtk-doc/html/glib/tools.html
share/gtk-doc/html/glib/up.png
share/gtk-doc/html/gobject/
share/gtk-doc/html/gobject/GBinding.html
share/gtk-doc/html/gobject/GTypeModule.html
share/gtk-doc/html/gobject/GTypePlugin.html
share/gtk-doc/html/gobject/annotation-glossary.html
share/gtk-doc/html/gobject/api-index-2-10.html
share/gtk-doc/html/gobject/api-index-2-12.html
share/gtk-doc/html/gobject/api-index-2-14.html
@ -239,6 +292,7 @@ share/gtk-doc/html/gobject/api-index-2-18.html
share/gtk-doc/html/gobject/api-index-2-2.html
share/gtk-doc/html/gobject/api-index-2-22.html
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-4.html
share/gtk-doc/html/gobject/api-index-2-6.html
share/gtk-doc/html/gobject/api-index-2-8.html

View File

@ -1,18 +1,22 @@
@comment $OpenBSD: PLIST-main,v 1.15 2010/06/19 11:05:34 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2010/09/30 07:17:19 ajacoutot Exp $
@conflict glib2-fam-*
@pkgpath devel/glib2
@pkgpath devel/glib2,-fam
@bin bin/gdbus
@bin bin/gio-querymodules
@bin bin/glib-compile-schemas
@bin bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@bin bin/gobject-query
@bin bin/gsettings
@bin bin/gtester
include/gio-unix-2.0/
include/gio-unix-2.0/gio/
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
include/gio-unix-2.0/gio/gunixcredentialsmessage.h
include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
@ -32,8 +36,21 @@ include/glib-2.0/gio/gcontenttype.h
include/glib-2.0/gio/gconverter.h
include/glib-2.0/gio/gconverterinputstream.h
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/gdbusaddress.h
include/glib-2.0/gio/gdbusauthobserver.h
include/glib-2.0/gio/gdbusconnection.h
include/glib-2.0/gio/gdbuserror.h
include/glib-2.0/gio/gdbusintrospection.h
include/glib-2.0/gio/gdbusmessage.h
include/glib-2.0/gio/gdbusmethodinvocation.h
include/glib-2.0/gio/gdbusnameowning.h
include/glib-2.0/gio/gdbusnamewatching.h
include/glib-2.0/gio/gdbusproxy.h
include/glib-2.0/gio/gdbusserver.h
include/glib-2.0/gio/gdbusutils.h
include/glib-2.0/gio/gdrive.h
include/glib-2.0/gio/gemblem.h
include/glib-2.0/gio/gemblemedicon.h
@ -71,9 +88,17 @@ include/glib-2.0/gio/gnativevolumemonitor.h
include/glib-2.0/gio/gnetworkaddress.h
include/glib-2.0/gio/gnetworkservice.h
include/glib-2.0/gio/goutputstream.h
include/glib-2.0/gio/gpermission.h
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/gresolver.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/gsimpleasyncresult.h
include/glib-2.0/gio/gsimplepermission.h
include/glib-2.0/gio/gsocket.h
include/glib-2.0/gio/gsocketaddress.h
include/glib-2.0/gio/gsocketaddressenumerator.h
@ -109,6 +134,7 @@ 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/gerror.h
include/glib-2.0/glib/gfileutils.h
@ -151,6 +177,7 @@ 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/gtree.h
include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
@ -161,6 +188,7 @@ include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gwin32.h
include/glib-2.0/gmodule.h
include/glib-2.0/gobject/
include/glib-2.0/gobject/gbinding.h
include/glib-2.0/gobject/gboxed.h
include/glib-2.0/gobject/gclosure.h
include/glib-2.0/gobject/genums.h
@ -205,18 +233,25 @@ lib/pkgconfig/gmodule-export-2.0.pc
lib/pkgconfig/gmodule-no-export-2.0.pc
lib/pkgconfig/gobject-2.0.pc
lib/pkgconfig/gthread-2.0.pc
@man man/man1/gdbus.1
@man man/man1/gio-querymodules.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/gsettings.1
@man man/man1/gtester.1
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/aclocal/gsettings.m4
share/glib-2.0/
share/glib-2.0/gettext/
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/
share/glib-2.0/gettext/po/Makefile.in.in
share/glib-2.0/schemas/
share/glib-2.0/schemas/gschema.dtd
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/glib20.mo
@ -304,6 +339,9 @@ share/locale/ja/LC_MESSAGES/glib20.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/glib20.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/glib20.mo
share/locale/kn/
share/locale/kn/LC_MESSAGES/
share/locale/kn/LC_MESSAGES/glib20.mo
@ -412,3 +450,5 @@ share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
%%SHARED%%
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas 2> /dev/null || true
@unexec-delete rm -f %D/share/glib-2.0/schemas/gschemas.compiled