Hi.
So, new patches for glib2 and gtk+2 which got updated to a minor
version.
Also included the fix to make wxWidgets compile.
Cheers!
--
Antoine
Index: patches/patch-src_gtk_gsockgtk_cpp
===================================================================
RCS file: patches/patch-src_gtk_gsockgtk_cpp
diff -N patches/patch-src_gtk_gsockgtk_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gtk_gsockgtk_cpp 2 Oct 2009 09:05:44 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- src/gtk/gsockgtk.cpp.orig Fri Mar 6 13:11:40 2009
++++ src/gtk/gsockgtk.cpp Fri Oct 2 09:58:20 2009
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+
++// newer versions of glib define its own GSocket but we unfortunately use this
++// // name in our own (semi-)public header and so can't change it -- rename
glib
++// // one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- Makefile 18 Sep 2009 20:47:11 -0000 1.85
+++ Makefile 2 Oct 2009 09:07:47 -0000
@@ -6,20 +6,20 @@
COMMENT-docs= gtk+2 documentation
COMMENT-cups= gtk+2 CUPS print backend
-VERSION= 2.16.6
+VERSION= 2.18.1
DISTNAME= gtk+-${VERSION}
-PKGNAME-main= gtk+2-${VERSION}p1
+PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
-PKGNAME-cups= gtk+2-cups-${VERSION}p0
+PKGNAME-cups= gtk+2-cups-${VERSION}
CATEGORIES= x11 devel
-SHARED_LIBS+= gdk_pixbuf-2.0 1401.0 #.1600.2
-SHARED_LIBS+= gdk-x11-2.0 1401.0 #.1600.2
-SHARED_LIBS+= gtk-x11-2.0 1401.0 #.1600.2
-SHARED_LIBS+= gdk_pixbuf_xlib-2.0 1401.0 #.1600.2
-SHARED_LIBS+= gailutil 23.0 #.18.1
+SHARED_LIBS+= gdk_pixbuf-2.0 1402.0 # .1800.1
+SHARED_LIBS+= gdk-x11-2.0 1402.0 # .1800.1
+SHARED_LIBS+= gtk-x11-2.0 1402.0 # .1800.1
+SHARED_LIBS+= gdk_pixbuf_xlib-2.0 1402.0 # .1800.1
+SHARED_LIBS+= gailutil 24.0 # .18.1
HOMEPAGE= http://www.gtk.org/
@@ -50,7 +50,6 @@
atk-1.0.>=1809.0::devel/atk \
tiff.>=35::graphics/tiff \
png.>=3::graphics/png \
- jasper::graphics/jasper \
jpeg.>=62::graphics/jpeg
WANTLIB-main= ${WANTLIB} c pthread
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gtk+2/distinfo,v
retrieving revision 1.43
diff -u -r1.43 distinfo
--- distinfo 29 Aug 2009 20:17:49 -0000 1.43
+++ distinfo 2 Oct 2009 09:07:47 -0000
@@ -1,5 +1,5 @@
-MD5 (gtk+-2.16.6.tar.bz2) = QWQSszbZ87a3jKiHOV0XJg==
-RMD160 (gtk+-2.16.6.tar.bz2) = EEhwQEL/u6vg3mAnj0n4t3APLR8=
-SHA1 (gtk+-2.16.6.tar.bz2) = 9py0gxHWBmS6x89oNRwXXHohSuY=
-SHA256 (gtk+-2.16.6.tar.bz2) = GOD5eSAo5sxRCER2ePF9OW+aLN/sHmq13KmMuET5VK8=
-SIZE (gtk+-2.16.6.tar.bz2) = 18518781
+MD5 (gtk+-2.18.1.tar.bz2) = 1uD5gqhNOTzRHi6pCp43dQ==
+RMD160 (gtk+-2.18.1.tar.bz2) = fD8yj30zn8aeEyK/k4GBBHqSv3w=
+SHA1 (gtk+-2.18.1.tar.bz2) = xIdMdhc+ubZZHM4fTJTkApDxNzI=
+SHA256 (gtk+-2.18.1.tar.bz2) = x4ORnseWf8NuxED8aHHLzzsmJugXUw4eLwo/y9rjHrw=
+SIZE (gtk+-2.18.1.tar.bz2) = 19050508
Index: patches/patch-demos_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-demos_Makefile_in,v
retrieving revision 1.19
diff -u -r1.19 patch-demos_Makefile_in
--- patches/patch-demos_Makefile_in 12 Jul 2009 20:39:33 -0000 1.19
+++ patches/patch-demos_Makefile_in 2 Oct 2009 09:07:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.19 2009/07/12 20:39:33 ajacoutot Exp $
---- demos/Makefile.in.orig Sun May 31 06:11:02 2009
-+++ demos/Makefile.in Thu Jun 11 15:11:57 2009
-@@ -972,6 +972,7 @@ test-report perf-report full-report: ${TEST_PROGS}
+--- demos/Makefile.in.orig Wed Sep 23 04:22:46 2009
++++ demos/Makefile.in Tue Sep 29 06:59:19 2009
+@@ -935,6 +935,7 @@ test-report perf-report full-report: ${TEST_PROGS}
check-local: test
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
Index: patches/patch-gdk-pixbuf_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in,v
retrieving revision 1.22
diff -u -r1.22 patch-gdk-pixbuf_Makefile_in
--- patches/patch-gdk-pixbuf_Makefile_in 12 Jul 2009 20:39:33 -0000
1.22
+++ patches/patch-gdk-pixbuf_Makefile_in 2 Oct 2009 09:07:47 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.22 2009/07/12 20:39:33 ajacoutot
Exp $
---- gdk-pixbuf/Makefile.in.orig Sun May 31 06:11:03 2009
-+++ gdk-pixbuf/Makefile.in Thu Jun 11 15:11:57 2009
-@@ -860,7 +860,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+--- gdk-pixbuf/Makefile.in.orig Tue Sep 29 09:17:04 2009
++++ gdk-pixbuf/Makefile.in Tue Sep 29 09:18:08 2009
+@@ -1324,7 +1324,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS)
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_LDADD = $(LDADDS)
-
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -pthread
-
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
-@@ -2247,13 +2247,6 @@ install-data-hook: install-ms-lib install-def-file
+ #
+@@ -2331,13 +2331,6 @@ install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
@@ -24,7 +24,7 @@
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
-@@ -2265,7 +2258,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
+@@ -2349,7 +2342,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@BUILD_DYNAMIC_MODULES_TRUE@ LOADERS=`echo libpixbufloader-*.la` ; \
@BUILD_DYNAMIC_MODULES_TRUE@ if test "x$$LOADERS" != 'xlibpixbufloader-*.la'
; then \
@BUILD_DYNAMIC_MODULES_TRUE@ echo "Writing a gdk-pixbuf.loader file
to use when running examples before installing gdk-pixbuf."; \
Index: patches/patch-gdk-pixbuf_gdk-pixbuf-io_c
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gdk-pixbuf_gdk-pixbuf-io_c,v
retrieving revision 1.10
diff -u -r1.10 patch-gdk-pixbuf_gdk-pixbuf-io_c
--- patches/patch-gdk-pixbuf_gdk-pixbuf-io_c 21 Apr 2009 13:01:18 -0000
1.10
+++ patches/patch-gdk-pixbuf_gdk-pixbuf-io_c 2 Oct 2009 09:07:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.10 2009/04/21 13:01:18
ajacoutot Exp $
---- gdk-pixbuf/gdk-pixbuf-io.c.orig Mon Nov 24 07:35:45 2008
-+++ gdk-pixbuf/gdk-pixbuf-io.c Sat Dec 20 17:32:11 2008
-@@ -298,7 +298,7 @@ gdk_pixbuf_get_module_file (void)
+--- gdk-pixbuf/gdk-pixbuf-io.c.orig Sat Sep 12 04:58:36 2009
++++ gdk-pixbuf/gdk-pixbuf-io.c Tue Sep 29 06:59:19 2009
+@@ -305,7 +305,7 @@ gdk_pixbuf_get_module_file (void)
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
Index: patches/patch-gtk_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-gtk_Makefile_in,v
retrieving revision 1.13
diff -u -r1.13 patch-gtk_Makefile_in
--- patches/patch-gtk_Makefile_in 12 Jul 2009 20:39:33 -0000 1.13
+++ patches/patch-gtk_Makefile_in 2 Oct 2009 09:07:47 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.13 2009/07/12 20:39:33 ajacoutot Exp $
---- gtk/Makefile.in.orig Thu Jun 11 15:10:41 2009
-+++ gtk/Makefile.in Thu Jun 11 15:11:39 2009
-@@ -477,7 +477,7 @@ SUBDIRS = theme-bits . tests
+--- gtk/Makefile.in.orig Tue Sep 29 06:53:28 2009
++++ gtk/Makefile.in Tue Sep 29 06:54:19 2009
+@@ -932,7 +932,7 @@ SUBDIRS = theme-bits . tests
DIST_SUBDIRS = theme-bits tests
- @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@have_papi_t...@gtk_print_backends =
file,papi
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@have_papi_fa...@gtk_print_backends =
file,lpr
+ @HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@have_papi_t...@gtk_print_backends =
file,papi
-...@have_cups_true@@have_papi_cups_fa...@gtk_print_backends = file,cups
+...@have_cups_true@@have_papi_cups_fa...@gtk_print_backends = file,cups,lpr
-
@have_papi_cups_t...@gtk_print_backends = file,papi,cups
-
+ INCLUDES = \
+ -DG_LOG_DOMAIN=\"Gtk\" \
Index: patches/patch-modules_input_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/gtk+2/patches/patch-modules_input_Makefile_in,v
retrieving revision 1.21
diff -u -r1.21 patch-modules_input_Makefile_in
--- patches/patch-modules_input_Makefile_in 12 Jul 2009 20:39:33 -0000
1.21
+++ patches/patch-modules_input_Makefile_in 2 Oct 2009 09:07:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.21 2009/07/12 20:39:33 ajacoutot
Exp $
---- modules/input/Makefile.in.orig Sun May 31 06:11:05 2009
-+++ modules/input/Makefile.in Thu Jun 11 15:11:57 2009
-@@ -1344,13 +1344,6 @@ install-data-hook:
+--- modules/input/Makefile.in.orig Wed Sep 23 04:22:51 2009
++++ modules/input/Makefile.in Tue Sep 29 06:59:20 2009
+@@ -1239,13 +1239,6 @@ install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
$(top_builddir)/gtk/gtk-query-immodules-2.0 >
$(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
@@ -15,7 +15,7 @@
fi
uninstall-local:
-@@ -1359,6 +1352,7 @@ uninstall-local:
+@@ -1254,6 +1247,7 @@ uninstall-local:
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
Index: patches/patch-modules_printbackends_lpr_gtkprintbackendlpr_c
===================================================================
RCS file: patches/patch-modules_printbackends_lpr_gtkprintbackendlpr_c
diff -N patches/patch-modules_printbackends_lpr_gtkprintbackendlpr_c
--- patches/patch-modules_printbackends_lpr_gtkprintbackendlpr_c 16 Sep
2009 12:58:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-modules_printbackends_lpr_gtkprintbackendlpr_c,v 1.1
2009/09/16 12:58:44 jasper Exp $
-
-Fix for #503776, git f6ed1487bd2c5c2315a07ff2f9f4426102524743
-Prevents an application from crashing when printing to a non-existant printer.
-
---- modules/printbackends/lpr/gtkprintbackendlpr.c.orig Wed Sep 16
14:21:48 2009
-+++ modules/printbackends/lpr/gtkprintbackendlpr.c Wed Sep 16 14:22:28 2009
-@@ -281,7 +281,9 @@ lpr_write (GIOChannel *source,
- {
- gsize bytes_written;
-
-- g_io_channel_write_chars (ps->in,
-+ signal (SIGPIPE, SIG_IGN);
-+
-+ g_io_channel_write_chars (ps->in,
- buf,
- bytes_read,
- &bytes_written,
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-docs,v
retrieving revision 1.25
diff -u -r1.25 PLIST-docs
--- pkg/PLIST-docs 12 Jul 2009 20:39:33 -0000 1.25
+++ pkg/PLIST-docs 2 Oct 2009 09:07:47 -0000
@@ -70,6 +70,7 @@
share/gtk-doc/html/gdk/api-index-2-12.html
share/gtk-doc/html/gdk/api-index-2-14.html
share/gtk-doc/html/gdk/api-index-2-16.html
+share/gtk-doc/html/gdk/api-index-2-18.html
share/gtk-doc/html/gdk/api-index-2-2.html
share/gtk-doc/html/gdk/api-index-2-4.html
share/gtk-doc/html/gdk/api-index-2-6.html
@@ -242,6 +243,7 @@
share/gtk-doc/html/gtk/GtkDrawingArea.html
share/gtk-doc/html/gtk/GtkEditable.html
share/gtk-doc/html/gtk/GtkEntry.html
+share/gtk-doc/html/gtk/GtkEntryBuffer.html
share/gtk-doc/html/gtk/GtkEntryCompletion.html
share/gtk-doc/html/gtk/GtkEventBox.html
share/gtk-doc/html/gtk/GtkExpander.html
@@ -272,6 +274,7 @@
share/gtk-doc/html/gtk/GtkIconView.html
share/gtk-doc/html/gtk/GtkImage.html
share/gtk-doc/html/gtk/GtkImageMenuItem.html
+share/gtk-doc/html/gtk/GtkInfoBar.html
share/gtk-doc/html/gtk/GtkInputDialog.html
share/gtk-doc/html/gtk/GtkInvisible.html
share/gtk-doc/html/gtk/GtkItem.html
@@ -396,6 +399,7 @@
share/gtk-doc/html/gtk/api-index-2-12.html
share/gtk-doc/html/gtk/api-index-2-14.html
share/gtk-doc/html/gtk/api-index-2-16.html
+share/gtk-doc/html/gtk/api-index-2-18.html
share/gtk-doc/html/gtk/api-index-2-2.html
share/gtk-doc/html/gtk/api-index-2-4.html
share/gtk-doc/html/gtk/api-index-2-6.html
@@ -527,6 +531,7 @@
share/gtk-doc/html/gtk/gtk-media-rewind-ltr.png
share/gtk-doc/html/gtk/gtk-media-rewind-rtl.png
share/gtk-doc/html/gtk/gtk-media-stop.png
+share/gtk-doc/html/gtk/gtk-migrating-ClientSideWindows.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAssistant.html
@@ -539,6 +544,7 @@
share/gtk-doc/html/gtk/gtk-migrating-GtkRecentChooser.html
share/gtk-doc/html/gtk/gtk-migrating-checklist.html
share/gtk-doc/html/gtk/gtk-migrating-entry-icons.html
+share/gtk-doc/html/gtk/gtk-migrating-label-links.html
share/gtk-doc/html/gtk/gtk-migrating-tooltips.html
share/gtk-doc/html/gtk/gtk-missing-image.png
share/gtk-doc/html/gtk/gtk-network.png
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/gtk+2/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -r1.13 PLIST-main
--- pkg/PLIST-main 18 Sep 2009 20:47:11 -0000 1.13
+++ pkg/PLIST-main 2 Oct 2009 09:07:47 -0000
@@ -117,6 +117,7 @@
include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
+include/gtk-2.0/gtk/gtkentrybuffer.h
include/gtk-2.0/gtk/gtkentrycompletion.h
include/gtk-2.0/gtk/gtkenums.h
include/gtk-2.0/gtk/gtkeventbox.h
@@ -151,6 +152,7 @@
include/gtk-2.0/gtk/gtkimcontextsimple.h
include/gtk-2.0/gtk/gtkimmodule.h
include/gtk-2.0/gtk/gtkimmulticontext.h
+include/gtk-2.0/gtk/gtkinfobar.h
include/gtk-2.0/gtk/gtkinputdialog.h
include/gtk-2.0/gtk/gtkinvisible.h
include/gtk-2.0/gtk/gtkitem.h
@@ -335,9 +337,6 @@
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
-lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.la
-lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.so
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
@@ -430,6 +429,7 @@
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
+share/gtk-2.0/demo/entry_buffer.c
share/gtk-2.0/demo/entry_completion.c
share/gtk-2.0/demo/expander.c
share/gtk-2.0/demo/floppybuddy.gif
@@ -447,8 +447,12 @@
share/gtk-2.0/demo/iconview.c
share/gtk-2.0/demo/iconview_edit.c
share/gtk-2.0/demo/images.c
+share/gtk-2.0/demo/infobar.c
+share/gtk-2.0/demo/links.c
share/gtk-2.0/demo/list_store.c
share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/offscreen_window.c
+share/gtk-2.0/demo/offscreen_window2.c
share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- Makefile 29 Aug 2009 10:20:28 -0000 1.63
+++ Makefile 2 Oct 2009 09:06:12 -0000
@@ -4,7 +4,7 @@
COMMENT-docs= glib2 documentation
COMMENT-fam= fam(3) gio module
-VERSION= 2.20.5
+VERSION= 2.22.1
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
@@ -14,11 +14,13 @@
HOMEPAGE= http://www.gtk.org/
-SHARED_LIBS+= glib-2.0 1801.0 # .2000.2
-SHARED_LIBS+= gobject-2.0 1801.0 # .2000.2
-SHARED_LIBS+= gmodule-2.0 1801.0 # .2000.2
-SHARED_LIBS+= gthread-2.0 1801.0 # .2000.2
-SHARED_LIBS+= gio-2.0 1801.0 # .2000.2
+# glib-2.0 and gobject-2.0 need to be in sync as glib-2.0 version is
+# used to install *-gdb.py files
+SHARED_LIBS+= glib-2.0 1802.0 # .2200.1
+SHARED_LIBS+= gobject-2.0 1802.0 # .2200.1
+SHARED_LIBS+= gmodule-2.0 1802.0 # .2200.1
+SHARED_LIBS+= gthread-2.0 1802.0 # .2200.1
+SHARED_LIBS+= gio-2.0 1802.0 # .2200.1
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -73,5 +75,8 @@
-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,!!LIBglib-2.0_VERSION_R!!,${LIBglib-2.0_VERSION:R},g;' \
+ -e 's,!!LIBglib-2.0_VERSION_E!!,${LIBglib-2.0_VERSION:E},g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/glib2/distinfo,v
retrieving revision 1.34
diff -u -r1.34 distinfo
--- distinfo 29 Aug 2009 10:20:28 -0000 1.34
+++ distinfo 2 Oct 2009 09:06:12 -0000
@@ -1,5 +1,5 @@
-MD5 (glib-2.20.5.tar.bz2) = TBeLkdgu+Aoto8JrdyVpwA==
-RMD160 (glib-2.20.5.tar.bz2) = xxzKrwoZbiHhRAQewyhtsYoDqWA=
-SHA1 (glib-2.20.5.tar.bz2) = GeKyaE17w1pz/5Trf9FfxwzG8pI=
-SHA256 (glib-2.20.5.tar.bz2) = iPCSdp31zp94TBBoowVe3gCtpQMxdlOYQQHVOT3mNlU=
-SIZE (glib-2.20.5.tar.bz2) = 5037738
+MD5 (glib-2.22.1.tar.bz2) = Eil6faV3MhZHs4reBZPLPA==
+RMD160 (glib-2.22.1.tar.bz2) = yElasFJFYOIW2ZXxzMiHxUlNmUs=
+SHA1 (glib-2.22.1.tar.bz2) = LNSH8+u/qzOoFvOCwdDp3t0cAt8=
+SHA256 (glib-2.22.1.tar.bz2) = SJjTQMgwpZAxFUEuxblesDtBDv37HFMW028S+L6FV30=
+SIZE (glib-2.22.1.tar.bz2) = 5476114
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-configure,v
retrieving revision 1.14
diff -u -r1.14 patch-configure
--- patches/patch-configure 12 Jul 2009 20:38:09 -0000 1.14
+++ patches/patch-configure 2 Oct 2009 09:06:12 -0000
@@ -1,7 +1,20 @@
$OpenBSD: patch-configure,v 1.14 2009/07/12 20:38:09 ajacoutot Exp $
---- configure.orig Sat Jun 27 06:21:02 2009
-+++ configure Wed Jul 1 12:54:41 2009
-@@ -35637,7 +35637,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
+--- configure.orig Wed Sep 30 03:19:04 2009
++++ configure Fri Oct 2 09:09:31 2009
+@@ -2822,9 +2822,9 @@ _ACEOF
+
+ # libtool versioning
+ LT_RELEASE=2.22
+-LT_CURRENT=2200
+-LT_REVISION=1
+-LT_AGE=2200
++LT_CURRENT=!!LIBglib-2.0_VERSION_R!!
++LT_REVISION=!!LIBglib-2.0_VERSION_E!!
++LT_AGE=!!LIBglib-2.0_VERSION_R!!
+ LT_CURRENT_MINUS_AGE=0
+
+
+@@ -38669,7 +38669,7 @@ if test "${ac_cv_lib_fam_FAMOpen+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10,7 +23,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35854,7 +35854,7 @@ if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then
+@@ -38886,7 +38886,7 @@ if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +32,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35921,7 +35921,7 @@ _ACEOF
+@@ -38953,7 +38953,7 @@ _ACEOF
fi
Index: patches/patch-docs_reference_glib_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-docs_reference_glib_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-docs_reference_glib_Makefile_in
--- patches/patch-docs_reference_glib_Makefile_in 12 Jul 2009 20:38:09
-0000 1.3
+++ patches/patch-docs_reference_glib_Makefile_in 2 Oct 2009 09:06:12
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-docs_reference_glib_Makefile_in,v 1.3 2009/07/12 20:38:09
ajacoutot Exp $
---- docs/reference/glib/Makefile.in.orig Sat Jun 27 06:20:57 2009
-+++ docs/reference/glib/Makefile.in Wed Jul 1 12:54:00 2009
-@@ -408,8 +408,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
+--- docs/reference/glib/Makefile.in.orig Wed Sep 30 03:18:59 2009
++++ docs/reference/glib/Makefile.in Thu Oct 1 14:41:23 2009
+@@ -418,8 +418,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_ST
########################################################################
man_MANS = \
glib-gettextize.1 \
Index: patches/patch-glib_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-glib_Makefile_in,v
retrieving revision 1.13
diff -u -r1.13 patch-glib_Makefile_in
--- patches/patch-glib_Makefile_in 12 Jul 2009 20:38:09 -0000 1.13
+++ patches/patch-glib_Makefile_in 2 Oct 2009 09:06:12 -0000
@@ -2,9 +2,9 @@
Don't install gtester-report, it'll only pull in python.
---- glib/Makefile.in.orig Sat Jun 27 06:20:58 2009
-+++ glib/Makefile.in Wed Jul 1 12:54:00 2009
-@@ -666,7 +666,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
+--- glib/Makefile.in.orig Wed Sep 30 03:19:01 2009
++++ glib/Makefile.in Thu Oct 1 14:41:23 2009
+@@ -691,7 +691,7 @@ INSTALL_PROGS = $(am__append_1) $(am__append_2) $(am__
@OS_WIN32_TRUE@@os_win32_x64_fa...@gspawn_win32_helper_console_ldadd =
libglib-2.0.la
@os_unix_t...@gtester_sources = gtester.c
@os_unix_t...@gtester_ldadd = libglib-2.0.la
Index: patches/patch-tests_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_Makefile_in,v
retrieving revision 1.11
diff -u -r1.11 patch-tests_Makefile_in
--- patches/patch-tests_Makefile_in 12 Jul 2009 20:38:09 -0000 1.11
+++ patches/patch-tests_Makefile_in 2 Oct 2009 09:06:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.11 2009/07/12 20:38:09 ajacoutot Exp $
---- tests/Makefile.in.orig Sat Jun 27 06:20:59 2009
-+++ tests/Makefile.in Wed Jul 1 12:54:00 2009
-@@ -702,7 +702,6 @@ test_programs = \
+--- tests/Makefile.in.orig Wed Sep 30 03:19:02 2009
++++ tests/Makefile.in Thu Oct 1 14:41:23 2009
+@@ -729,7 +729,6 @@ test_programs = \
tree-test \
type-test \
unicode-caseconv \
Index: patches/patch-tests_refcount_Makefile_in
===================================================================
RCS file: /cvs/ports/devel/glib2/patches/patch-tests_refcount_Makefile_in,v
retrieving revision 1.11
diff -u -r1.11 patch-tests_refcount_Makefile_in
--- patches/patch-tests_refcount_Makefile_in 12 Jul 2009 20:38:09 -0000
1.11
+++ patches/patch-tests_refcount_Makefile_in 2 Oct 2009 09:06:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_refcount_Makefile_in,v 1.11 2009/07/12 20:38:09
ajacoutot Exp $
---- tests/refcount/Makefile.in.orig Sat Jun 27 06:21:00 2009
-+++ tests/refcount/Makefile.in Wed Jul 1 12:54:00 2009
-@@ -353,7 +353,6 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
+--- tests/refcount/Makefile.in.orig Wed Sep 30 03:19:02 2009
++++ tests/refcount/Makefile.in Thu Oct 1 14:41:24 2009
+@@ -373,7 +373,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 = \
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/devel/glib2/pkg/PLIST-docs,v
retrieving revision 1.17
diff -u -r1.17 PLIST-docs
--- pkg/PLIST-docs 12 Jul 2009 20:38:09 -0000 1.17
+++ pkg/PLIST-docs 2 Oct 2009 09:06:12 -0000
@@ -4,6 +4,7 @@
share/gtk-doc/html/
share/gtk-doc/html/gio/
share/gtk-doc/html/gio/GAppInfo.html
+share/gtk-doc/html/gio/GAsyncInitable.html
share/gtk-doc/html/gio/GAsyncResult.html
share/gtk-doc/html/gio/GBufferedInputStream.html
share/gtk-doc/html/gio/GBufferedOutputStream.html
@@ -15,6 +16,7 @@
share/gtk-doc/html/gio/GEmblemedIcon.html
share/gtk-doc/html/gio/GFile.html
share/gtk-doc/html/gio/GFileEnumerator.html
+share/gtk-doc/html/gio/GFileIOStream.html
share/gtk-doc/html/gio/GFileIcon.html
share/gtk-doc/html/gio/GFileInfo.html
share/gtk-doc/html/gio/GFileInputStream.html
@@ -24,19 +26,37 @@
share/gtk-doc/html/gio/GFilterInputStream.html
share/gtk-doc/html/gio/GFilterOutputStream.html
share/gtk-doc/html/gio/GIOModule.html
+share/gtk-doc/html/gio/GIOStream.html
share/gtk-doc/html/gio/GIcon.html
+share/gtk-doc/html/gio/GInetAddress.html
+share/gtk-doc/html/gio/GInetSocketAddress.html
+share/gtk-doc/html/gio/GInitable.html
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/GMount.html
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/GResolver.html
share/gtk-doc/html/gio/GSeekable.html
share/gtk-doc/html/gio/GSimpleAsyncResult.html
+share/gtk-doc/html/gio/GSocket.html
+share/gtk-doc/html/gio/GSocketAddress.html
+share/gtk-doc/html/gio/GSocketClient.html
+share/gtk-doc/html/gio/GSocketConnectable.html
+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/GThemedIcon.html
+share/gtk-doc/html/gio/GThreadedSocketService.html
+share/gtk-doc/html/gio/GUnixFDMessage.html
share/gtk-doc/html/gio/GUnixInputStream.html
share/gtk-doc/html/gio/GUnixOutputStream.html
+share/gtk-doc/html/gio/GUnixSocketAddress.html
share/gtk-doc/html/gio/GVfs.html
share/gtk-doc/html/gio/GVolume.html
share/gtk-doc/html/gio/GVolumeMonitor.html
@@ -44,12 +64,13 @@
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/ch14.html
-share/gtk-doc/html/gio/ch15.html
-share/gtk-doc/html/gio/ch15s02.html
-share/gtk-doc/html/gio/ch15s03.html
+share/gtk-doc/html/gio/ch18.html
+share/gtk-doc/html/gio/ch19.html
+share/gtk-doc/html/gio/ch19s02.html
+share/gtk-doc/html/gio/ch19s03.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/gio-Desktop-file-based-GAppInfo.html
@@ -58,11 +79,13 @@
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-Unix-Mounts.html
share/gtk-doc/html/gio/gio-hierarchy.html
share/gtk-doc/html/gio/gio.devhelp
share/gtk-doc/html/gio/gio.devhelp2
share/gtk-doc/html/gio/gvfs-overview.png
+share/gtk-doc/html/gio/highlevel-socket.html
share/gtk-doc/html/gio/home.png
share/gtk-doc/html/gio/icons.html
share/gtk-doc/html/gio/index.html
@@ -70,10 +93,14 @@
share/gtk-doc/html/gio/ix01.html
share/gtk-doc/html/gio/ix02.html
share/gtk-doc/html/gio/ix03.html
+share/gtk-doc/html/gio/ix04.html
+share/gtk-doc/html/gio/ix05.html
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/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/streaming.html
share/gtk-doc/html/gio/style.css
@@ -107,6 +134,7 @@
share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
share/gtk-doc/html/glib/glib-Hash-Tables.html
share/gtk-doc/html/glib/glib-Hook-Functions.html
+share/gtk-doc/html/glib/glib-Hostname-Utilities.html
share/gtk-doc/html/glib/glib-I18N.html
share/gtk-doc/html/glib/glib-IO-Channels.html
share/gtk-doc/html/glib/glib-Key-value-file-parser.html
@@ -180,6 +208,7 @@
share/gtk-doc/html/glib/ix10.html
share/gtk-doc/html/glib/ix11.html
share/gtk-doc/html/glib/ix12.html
+share/gtk-doc/html/glib/ix13.html
share/gtk-doc/html/glib/left.png
share/gtk-doc/html/glib/mainloop-states.gif
share/gtk-doc/html/glib/right.png
@@ -241,6 +270,7 @@
share/gtk-doc/html/gobject/ix08.html
share/gtk-doc/html/gobject/ix09.html
share/gtk-doc/html/gobject/ix10.html
+share/gtk-doc/html/gobject/ix11.html
share/gtk-doc/html/gobject/left.png
share/gtk-doc/html/gobject/pr01.html
share/gtk-doc/html/gobject/pt01.html
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/glib2/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -r1.7 PLIST-main
--- pkg/PLIST-main 12 Jul 2009 20:38:09 -0000 1.7
+++ pkg/PLIST-main 2 Oct 2009 09:06:12 -0000
@@ -9,12 +9,16 @@
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/gunixconnection.h
+include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
include/gio-unix-2.0/gio/gunixoutputstream.h
+include/gio-unix-2.0/gio/gunixsocketaddress.h
include/glib-2.0/
include/glib-2.0/gio/
include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gasyncinitable.h
include/glib-2.0/gio/gasyncresult.h
include/glib-2.0/gio/gbufferedinputstream.h
include/glib-2.0/gio/gbufferedoutputstream.h
@@ -31,12 +35,16 @@
include/glib-2.0/gio/gfileicon.h
include/glib-2.0/gio/gfileinfo.h
include/glib-2.0/gio/gfileinputstream.h
+include/glib-2.0/gio/gfileiostream.h
include/glib-2.0/gio/gfilemonitor.h
include/glib-2.0/gio/gfilenamecompleter.h
include/glib-2.0/gio/gfileoutputstream.h
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/ginetsocketaddress.h
+include/glib-2.0/gio/ginitable.h
include/glib-2.0/gio/ginputstream.h
include/glib-2.0/gio/gio.h
include/glib-2.0/gio/gioenums.h
@@ -44,6 +52,7 @@
include/glib-2.0/gio/gioerror.h
include/glib-2.0/gio/giomodule.h
include/glib-2.0/gio/gioscheduler.h
+include/glib-2.0/gio/giostream.h
include/glib-2.0/gio/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
@@ -51,10 +60,25 @@
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/gnetworkservice.h
include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gresolver.h
include/glib-2.0/gio/gseekable.h
include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gsocket.h
+include/glib-2.0/gio/gsocketaddress.h
+include/glib-2.0/gio/gsocketaddressenumerator.h
+include/glib-2.0/gio/gsocketclient.h
+include/glib-2.0/gio/gsocketconnectable.h
+include/glib-2.0/gio/gsocketconnection.h
+include/glib-2.0/gio/gsocketcontrolmessage.h
+include/glib-2.0/gio/gsocketlistener.h
+include/glib-2.0/gio/gsocketservice.h
+include/glib-2.0/gio/gsrvtarget.h
+include/glib-2.0/gio/gtcpconnection.h
include/glib-2.0/gio/gthemedicon.h
+include/glib-2.0/gio/gthreadedsocketservice.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
@@ -79,6 +103,7 @@
include/glib-2.0/glib/gfileutils.h
include/glib-2.0/glib/ghash.h
include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/ghostutils.h
include/glib-2.0/glib/gi18n-lib.h
include/glib-2.0/glib/gi18n.h
include/glib-2.0/glib/giochannel.h
@@ -172,7 +197,14 @@
@man man/man1/gtester.1
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
+share/gdb/
+share/gdb/auto-load/
+share/gdb/auto-load/libglib-2.0.so.0.1802.0-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.1802.0-gdb.py
share/glib-2.0/
+share/glib-2.0/gdb/
+share/glib-2.0/gdb/glib.py
+share/glib-2.0/gdb/gobject.py
share/glib-2.0/gettext/
share/glib-2.0/gettext/mkinstalldirs
share/glib-2.0/gettext/po/
