From 2a83d0db618e0795208142c8804571953de98a47 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 10 May 2016 10:02:58 +0000 Subject: [PATCH] Update to glib2-2.48.1. --- devel/glib2/Makefile | 14 +++++++------- devel/glib2/distinfo | 4 ++-- devel/glib2/patches/patch-gio_gioenums_h | 18 ------------------ devel/glib2/pkg/PLIST | 9 +++------ 4 files changed, 12 insertions(+), 33 deletions(-) delete mode 100644 devel/glib2/patches/patch-gio_gioenums_h diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index a592b864818..580d92ea3a1 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.252 2016/04/18 06:46:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.253 2016/05/10 10:02:58 ajacoutot Exp $ COMMENT= general-purpose utility library GNOME_PROJECT= glib -GNOME_VERSION= 2.48.0 +GNOME_VERSION= 2.48.1 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= devel @@ -16,11 +16,11 @@ MAINTAINER= Antoine Jacoutot # would trigger an abort(): # GLib-GObject:ERROR:gvaluetypes.c:457:_g_value_types_init: # assertion failed: (type == G_TYPE_CHAR) -SHARED_LIBS += glib-2.0 4200.3 # 4800.0 -SHARED_LIBS += gmodule-2.0 4200.3 # 4800.0 -SHARED_LIBS += gthread-2.0 4200.3 # 4800.0 -SHARED_LIBS += gobject-2.0 4200.3 # 4800.0 -SHARED_LIBS += gio-2.0 4200.3 # 4800.0 +SHARED_LIBS += glib-2.0 4200.3 # 4800.1 +SHARED_LIBS += gmodule-2.0 4200.3 # 4800.1 +SHARED_LIBS += gthread-2.0 4200.3 # 4800.1 +SHARED_LIBS += gobject-2.0 4200.3 # 4800.1 +SHARED_LIBS += gio-2.0 4200.3 # 4800.1 # LGPLv2 PERMIT_PACKAGE_CDROM= Yes diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index fb7a3ef0935..cf58a0d1119 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,2 +1,2 @@ -SHA256 (glib-2.48.0.tar.xz) = dEvmkxypFMaK+Y3Dj/awz4OB1l4zUGD63fvwTBcUfDQ= -SIZE (glib-2.48.0.tar.xz) = 7487800 +SHA256 (glib-2.48.1.tar.xz) = dEEb/0icsqNSe6x0OlEBiEGlak2JbMHg0NVPgWahRhI= +SIZE (glib-2.48.1.tar.xz) = 7441032 diff --git a/devel/glib2/patches/patch-gio_gioenums_h b/devel/glib2/patches/patch-gio_gioenums_h deleted file mode 100644 index b57181c85d2..00000000000 --- a/devel/glib2/patches/patch-gio_gioenums_h +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-gio_gioenums_h,v 1.4 2016/04/18 06:46:30 ajacoutot Exp $ - -From 52f116e874c783789bda3ddc67df61729834bf49 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 17 Apr 2016 10:04:13 +0200 -Subject: gioenums.h: Remove trailing comma. - ---- gio/gioenums.h.orig Sun Apr 17 10:50:06 2016 -+++ gio/gioenums.h Sun Apr 17 10:50:11 2016 -@@ -561,7 +561,7 @@ typedef enum { - G_IO_ERROR_BROKEN_PIPE, - G_IO_ERROR_CONNECTION_CLOSED = G_IO_ERROR_BROKEN_PIPE, - G_IO_ERROR_NOT_CONNECTED, -- G_IO_ERROR_MESSAGE_TOO_LARGE, -+ G_IO_ERROR_MESSAGE_TOO_LARGE - } GIOErrorEnum; - - diff --git a/devel/glib2/pkg/PLIST b/devel/glib2/pkg/PLIST index 036e50b7ca9..f47575c7d28 100644 --- a/devel/glib2/pkg/PLIST +++ b/devel/glib2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.46 2016/04/18 06:46:30 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.47 2016/05/10 10:02:58 ajacoutot Exp $ @conflict glib2-docs-* @conflict glib2-fam-* @pkgpath devel/glib2,-docs @@ -347,8 +347,8 @@ share/gdb/auto-load/ share/gdb/auto-load/usr/ share/gdb/auto-load/usr/local/ share/gdb/auto-load/usr/local/lib/ -share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.4800.0-gdb.py -share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.4800.0-gdb.py +share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.4800.1-gdb.py +share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.4800.1-gdb.py share/gettext/its/ share/gettext/its/gschema.its share/gettext/its/gschema.loc @@ -609,7 +609,6 @@ 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 -share/gtk-doc/html/gio/index.sgml share/gtk-doc/html/gio/left-insensitive.png share/gtk-doc/html/gio/left.png share/gtk-doc/html/gio/menu-example.png @@ -763,7 +762,6 @@ share/gtk-doc/html/glib/gvariant-format-strings.html share/gtk-doc/html/glib/gvariant-text.html share/gtk-doc/html/glib/home.png share/gtk-doc/html/glib/index.html -share/gtk-doc/html/glib/index.sgml share/gtk-doc/html/glib/left-insensitive.png share/gtk-doc/html/glib/left.png share/gtk-doc/html/glib/mainloop-states.gif @@ -842,7 +840,6 @@ share/gtk-doc/html/gobject/howto-interface-properties.html share/gtk-doc/html/gobject/howto-interface.html share/gtk-doc/html/gobject/howto-signals.html share/gtk-doc/html/gobject/index.html -share/gtk-doc/html/gobject/index.sgml share/gtk-doc/html/gobject/left-insensitive.png share/gtk-doc/html/gobject/left.png share/gtk-doc/html/gobject/pr01.html