From c649f52aaa824d9d55135461ea97eb3f133edfe5 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 27 Sep 2011 12:08:09 +0000 Subject: [PATCH] Update to glib2mm-2.30.0. --- devel/glib2mm/Makefile | 16 ++++++---------- devel/glib2mm/distinfo | 10 +++++----- devel/glib2mm/patches/patch-Makefile_in | 8 ++++---- devel/glib2mm/pkg/PLIST | 20 ++++++++++++++++---- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/devel/glib2mm/Makefile b/devel/glib2mm/Makefile index 39a4f1873dc..1c44a4a43de 100644 --- a/devel/glib2mm/Makefile +++ b/devel/glib2mm/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.48 2011/09/16 09:24:49 espie Exp $ +# $OpenBSD: Makefile,v 1.49 2011/09/27 12:08:09 ajacoutot Exp $ COMMENT= C++ interface for glib2 GNOME_PROJECT= glibmm -GNOME_VERSION= 2.28.2 +GNOME_VERSION= 2.30.0 +PKGNAME= glib2mm-${GNOME_VERSION} V= 2.4 SUBST_VARS= V -PKGNAME= glib2mm-${GNOME_VERSION} -REVISION = 0 - SHARED_LIBS += glibmm_generate_extra_defs-2.4 10.0 # 4.0 SHARED_LIBS += glibmm-2.4 10.0 # 4.0 SHARED_LIBS += giomm-2.4 10.0 # 4.0 @@ -26,20 +24,18 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += pcre z m stdc++ sigc-2.0 glib-2.0>=1803 gmodule-2.0 gobject-2.0 -WANTLIB += gio-2.0 gthread-2.0 - +WANTLIB += gio-2.0 gthread-2.0 ffi MODULES= devel/gettext \ x11/gnome LIB_DEPENDS= devel/libsigc++-2 \ - devel/glib2>=2.24.0 + devel/glib2>=2.30.0 CONFIGURE_STYLE=gnu CONFIGURE_ENV= M4='m4 -g' \ ac_cv_path_DOXYGEN="" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --disable-dependency-tracking .include diff --git a/devel/glib2mm/distinfo b/devel/glib2mm/distinfo index 953b23a74f5..86e98363a8c 100644 --- a/devel/glib2mm/distinfo +++ b/devel/glib2mm/distinfo @@ -1,5 +1,5 @@ -MD5 (glibmm-2.28.2.tar.xz) = e7xK0cT3newO555trqS7Aw== -RMD160 (glibmm-2.28.2.tar.xz) = l49h5SaxHjAIoQf6UCvkYN3pVfI= -SHA1 (glibmm-2.28.2.tar.xz) = vRlix95xADaHWottere15eUPt68= -SHA256 (glibmm-2.28.2.tar.xz) = +E6ZhY2WdHBTFuxAyz8Dw0EpKT69Nwp9Y99tlZZEy+M= -SIZE (glibmm-2.28.2.tar.xz) = 4584624 +MD5 (glibmm-2.30.0.tar.xz) = VMgDz5Wo05WlU5fHI82zFQ== +RMD160 (glibmm-2.30.0.tar.xz) = 3zc7nBasvQ5bmNtEDrtFrPFHDDI= +SHA1 (glibmm-2.30.0.tar.xz) = WU5ZL/ozL5mRaDYqzZ8BihJ+Iec= +SHA256 (glibmm-2.30.0.tar.xz) = p60/w0wroQhRFzim7L+Tlu3rJndrL5tfRJBVFQnuDbQ= +SIZE (glibmm-2.30.0.tar.xz) = 4472896 diff --git a/devel/glib2mm/patches/patch-Makefile_in b/devel/glib2mm/patches/patch-Makefile_in index bbb1f5bb99e..51639a89b78 100644 --- a/devel/glib2mm/patches/patch-Makefile_in +++ b/devel/glib2mm/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.7 2011/06/14 11:49:54 ajacoutot Exp $ +$OpenBSD: patch-Makefile_in,v 1.8 2011/09/27 12:08:09 ajacoutot Exp $ main.cc: In function `void ::show_examples()': main.cc:40: error: no matching function for call to `Glib::ustring::format( std::ios_base&(&)(std::ios_base&), std::_Setprecision, double)' ---- Makefile.in.orig Tue Jun 14 12:22:44 2011 -+++ Makefile.in Tue Jun 14 13:38:36 2011 -@@ -341,7 +341,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal +--- Makefile.in.orig Tue Sep 27 09:33:43 2011 ++++ Makefile.in Tue Sep 27 13:55:11 2011 +@@ -338,7 +338,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal @MAINTAINER_MODE_TRUE@src_subdirs = glib/src gio/src @ENABLE_DOCUMENTATION_FALSE@doc_subdirs = @ENABLE_DOCUMENTATION_TRUE@doc_subdirs = docs diff --git a/devel/glib2mm/pkg/PLIST b/devel/glib2mm/pkg/PLIST index c6e01775f3d..a4af32dd75c 100644 --- a/devel/glib2mm/pkg/PLIST +++ b/devel/glib2mm/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2011/06/14 11:49:54 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.15 2011/09/27 12:08:09 ajacoutot Exp $ @conflict glib2mm-docs-* @pkgpath devel/glib2mm,-main @pkgpath devel/glib2mm,-docs @@ -191,6 +191,7 @@ include/glibmm-${V}/glibmm/containerhandle_shared.h include/glibmm-${V}/glibmm/containers.h include/glibmm-${V}/glibmm/convert.h include/glibmm-${V}/glibmm/date.h +include/glibmm-${V}/glibmm/datetime.h include/glibmm-${V}/glibmm/debug.h include/glibmm-${V}/glibmm/dispatcher.h include/glibmm-${V}/glibmm/error.h @@ -222,6 +223,7 @@ include/glibmm-${V}/glibmm/private/balancedtree_p.h include/glibmm-${V}/glibmm/private/checksum_p.h include/glibmm-${V}/glibmm/private/convert_p.h include/glibmm-${V}/glibmm/private/date_p.h +include/glibmm-${V}/glibmm/private/datetime_p.h include/glibmm-${V}/glibmm/private/fileutils_p.h include/glibmm-${V}/glibmm/private/interface_p.h include/glibmm-${V}/glibmm/private/iochannel_p.h @@ -237,6 +239,7 @@ include/glibmm-${V}/glibmm/private/regex_p.h include/glibmm-${V}/glibmm/private/shell_p.h include/glibmm-${V}/glibmm/private/spawn_p.h include/glibmm-${V}/glibmm/private/thread_p.h +include/glibmm-${V}/glibmm/private/timezone_p.h include/glibmm-${V}/glibmm/private/unicode_p.h include/glibmm-${V}/glibmm/private/uriutils_p.h include/glibmm-${V}/glibmm/private/valuearray_p.h @@ -262,6 +265,7 @@ include/glibmm-${V}/glibmm/thread.h include/glibmm-${V}/glibmm/threadpool.h include/glibmm-${V}/glibmm/timer.h include/glibmm-${V}/glibmm/timeval.h +include/glibmm-${V}/glibmm/timezone.h include/glibmm-${V}/glibmm/unicode.h include/glibmm-${V}/glibmm/uriutils.h include/glibmm-${V}/glibmm/ustring.h @@ -334,7 +338,6 @@ lib/libglibmm_generate_extra_defs-${V}.la lib/pkgconfig/ lib/pkgconfig/giomm-${V}.pc lib/pkgconfig/glibmm-${V}.pc -share/aclocal/glibmm_check_perl.m4 share/devhelp/ share/devhelp/books/ share/devhelp/books/glibmm-${V}/ @@ -636,6 +639,8 @@ share/doc/glibmm-${V}/reference/html/classGlib_1_1ConvertError.html share/doc/glibmm-${V}/reference/html/classGlib_1_1ConvertError__inherit__graph.png share/doc/glibmm-${V}/reference/html/classGlib_1_1Date-members.html share/doc/glibmm-${V}/reference/html/classGlib_1_1Date.html +share/doc/glibmm-${V}/reference/html/classGlib_1_1DateTime-members.html +share/doc/glibmm-${V}/reference/html/classGlib_1_1DateTime.html share/doc/glibmm-${V}/reference/html/classGlib_1_1Dir-members.html share/doc/glibmm-${V}/reference/html/classGlib_1_1Dir.html share/doc/glibmm-${V}/reference/html/classGlib_1_1DirIterator-members.html @@ -834,6 +839,8 @@ share/doc/glibmm-${V}/reference/html/classGlib_1_1ThreadError__inherit__graph.pn share/doc/glibmm-${V}/reference/html/classGlib_1_1ThreadPool-members.html share/doc/glibmm-${V}/reference/html/classGlib_1_1ThreadPool.html share/doc/glibmm-${V}/reference/html/classGlib_1_1Thread_1_1Exit.html +share/doc/glibmm-${V}/reference/html/classGlib_1_1TimeZone-members.html +share/doc/glibmm-${V}/reference/html/classGlib_1_1TimeZone.html share/doc/glibmm-${V}/reference/html/classGlib_1_1TimeoutSource-members.html share/doc/glibmm-${V}/reference/html/classGlib_1_1TimeoutSource.html share/doc/glibmm-${V}/reference/html/classGlib_1_1TimeoutSource__inherit__graph.png @@ -991,8 +998,8 @@ share/doc/glibmm-${V}/reference/html/classGlib_1_1ustring.html share/doc/glibmm-${V}/reference/html/classGlib_1_1ustring__Iterator-members.html share/doc/glibmm-${V}/reference/html/classGlib_1_1ustring__Iterator.html share/doc/glibmm-${V}/reference/html/classes.html -share/doc/glibmm-${V}/reference/html/classsigc_1_1trackable.html -share/doc/glibmm-${V}/reference/html/classsigc_1_1trackable__inherit__graph.png +share/doc/glibmm-${V}/reference/html/classresize__policy.html +share/doc/glibmm-${V}/reference/html/classresize__policy__inherit__graph.png share/doc/glibmm-${V}/reference/html/closed.png share/doc/glibmm-${V}/reference/html/deprecated.html share/doc/glibmm-${V}/reference/html/doxygen.css @@ -1212,6 +1219,9 @@ share/doc/glibmm-${V}/reference/html/inherit_graph_90.png share/doc/glibmm-${V}/reference/html/inherit_graph_91.png share/doc/glibmm-${V}/reference/html/inherit_graph_92.png share/doc/glibmm-${V}/reference/html/inherit_graph_93.png +share/doc/glibmm-${V}/reference/html/inherit_graph_94.png +share/doc/glibmm-${V}/reference/html/inherit_graph_95.png +share/doc/glibmm-${V}/reference/html/inherit_graph_96.png share/doc/glibmm-${V}/reference/html/inherits.html share/doc/glibmm-${V}/reference/html/modules.html share/doc/glibmm-${V}/reference/html/namespaceGio.html @@ -1296,7 +1306,9 @@ share/doc/glibmm-${V}/reference/html/since_2_22.html share/doc/glibmm-${V}/reference/html/since_2_24.html share/doc/glibmm-${V}/reference/html/since_2_26.html share/doc/glibmm-${V}/reference/html/since_2_28.html +share/doc/glibmm-${V}/reference/html/since_2_30.html share/doc/glibmm-${V}/reference/html/since_2_6.html +share/doc/glibmm-${V}/reference/html/since_3_2.html share/doc/glibmm-${V}/reference/html/structGlib_1_1Container__Helpers_1_1TypeTraits-members.html share/doc/glibmm-${V}/reference/html/structGlib_1_1Container__Helpers_1_1TypeTraits.html share/doc/glibmm-${V}/reference/html/structGlib_1_1Container__Helpers_1_1TypeTraits_3_01Glib_1_1RefPtr_3_01Gio_1_1Drive_01_4_01_4.html