From a7e36b0099b9a57cea1991dbdbfeb16cbce10ede Mon Sep 17 00:00:00 2001 From: wilfried Date: Wed, 25 Apr 2007 10:38:15 +0000 Subject: [PATCH] update glibmm to 2.12.8 --- devel/glib2mm/Makefile | 17 +++--- devel/glib2mm/distinfo | 10 +-- .../glib2mm/patches/patch-glib_glibmm_date_cc | 20 ------ .../glib2mm/patches/patch-glib_glibmm_date_h | 21 ------- devel/glib2mm/pkg/PLIST-docs | 61 +++++++------------ 5 files changed, 36 insertions(+), 93 deletions(-) delete mode 100644 devel/glib2mm/patches/patch-glib_glibmm_date_cc delete mode 100644 devel/glib2mm/patches/patch-glib_glibmm_date_h diff --git a/devel/glib2mm/Makefile b/devel/glib2mm/Makefile index 3ca44eed553..8c9f6f4a91a 100644 --- a/devel/glib2mm/Makefile +++ b/devel/glib2mm/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.12 2006/12/16 12:22:33 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2007/04/25 10:38:15 wilfried Exp $ COMMENT-main= "C++ interface for glib2" COMMENT-docs= "C++ interface for glib2 documentation" -VERSION= 2.10.7 +VERSION= 2.12.8 V= 2.4 DISTNAME= glibmm-${VERSION} -PKGNAME-main= glib2mm-${VERSION}p0 +PKGNAME-main= glib2mm-${VERSION} PKGNAME-docs= glib2mm-docs-${VERSION} -SHARED_LIBS += glibmm_generate_extra_defs-2.4 4.0 # .1.24 -SHARED_LIBS += glibmm-2.4 4.0 # .1.24 +SHARED_LIBS += glibmm_generate_extra_defs-2.4 5.0 # .1.24 +SHARED_LIBS += glibmm-2.4 5.0 # .1.24 CATEGORIES= devel @@ -23,7 +23,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glibmm/2.10/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glibmm/2.12/} MULTI_PACKAGES= -main -docs @@ -38,8 +38,9 @@ SEPARATE_BUILD= concurrent USE_GMAKE= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-static +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --disable-dependency-tracking CONFIGURE_ENV= M4='m4 -g' MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts diff --git a/devel/glib2mm/distinfo b/devel/glib2mm/distinfo index be51117a0fe..992e5a24ba6 100644 --- a/devel/glib2mm/distinfo +++ b/devel/glib2mm/distinfo @@ -1,5 +1,5 @@ -MD5 (glibmm-2.10.7.tar.gz) = CyMxQhBN7aoVb37oJim8RA== -RMD160 (glibmm-2.10.7.tar.gz) = fC/aB1VT46n9KQLxV5DmVa34IAU= -SHA1 (glibmm-2.10.7.tar.gz) = iNZZr9CML5CpQrr+nY49zYJZt7c= -SHA256 (glibmm-2.10.7.tar.gz) = vt1k1NG1y3+9yftJBIwgE4h1PoWvtuGOz/p3n2jtSS8= -SIZE (glibmm-2.10.7.tar.gz) = 3185689 +MD5 (glibmm-2.12.8.tar.gz) = P5iLZT6NEBU1avrLto0XIA== +RMD160 (glibmm-2.12.8.tar.gz) = AsHDcx089RHdjkUGVILCrnbUhBA= +SHA1 (glibmm-2.12.8.tar.gz) = AH+CbaI5I/Sy39g0vS29r1G5Qvc= +SHA256 (glibmm-2.12.8.tar.gz) = /zFJ2gUTgkF/r24ZEJEBo0nf69qmhJQ2aaQHQedRcfA= +SIZE (glibmm-2.12.8.tar.gz) = 3477611 diff --git a/devel/glib2mm/patches/patch-glib_glibmm_date_cc b/devel/glib2mm/patches/patch-glib_glibmm_date_cc deleted file mode 100644 index 94f5d0f3788..00000000000 --- a/devel/glib2mm/patches/patch-glib_glibmm_date_cc +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-glib_glibmm_date_cc,v 1.1 2006/10/18 21:17:13 wilfried Exp $ ---- glib/glibmm/date.cc.orig Thu May 11 19:29:44 2006 -+++ glib/glibmm/date.cc Wed Oct 18 19:19:09 2006 -@@ -71,16 +71,6 @@ void Date::set_parse(const Glib::ustring - g_date_set_parse(&gobject_, str.c_str()); - } - --#ifndef GLIBMM_DISABLE_DEPRECATED -- --void Date::set_time(GTime time) --{ -- //This method, and the C function that it wraps, are deprecated. -- g_date_set_time(&gobject_, time); --} --#endif // GLIBMM_DISABLE_DEPRECATED -- -- - void Date::set_time(time_t timet) - { - g_date_set_time_t(&gobject_, timet); diff --git a/devel/glib2mm/patches/patch-glib_glibmm_date_h b/devel/glib2mm/patches/patch-glib_glibmm_date_h deleted file mode 100644 index 4666a83257d..00000000000 --- a/devel/glib2mm/patches/patch-glib_glibmm_date_h +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-glib_glibmm_date_h,v 1.1 2006/10/18 21:17:13 wilfried Exp $ ---- glib/glibmm/date.h.orig Wed May 10 10:01:21 2006 -+++ glib/glibmm/date.h Wed Oct 18 19:19:15 2006 -@@ -119,17 +119,6 @@ enum DMY - */ - void set_parse (const Glib::ustring& str); - -- #ifndef GLIBMM_DISABLE_DEPRECATED -- -- /** Sets the value of a date from a GTime (time_t) value. -- * -- * @param time GTime value to set. -- * -- * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&). -- */ -- void set_time(GTime time); -- #endif // GLIBMM_DISABLE_DEPRECATED -- - - /** Sets the value of a date from a time_t value. - * diff --git a/devel/glib2mm/pkg/PLIST-docs b/devel/glib2mm/pkg/PLIST-docs index 1192b7b8adf..843d3ed70ae 100644 --- a/devel/glib2mm/pkg/PLIST-docs +++ b/devel/glib2mm/pkg/PLIST-docs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-docs,v 1.4 2006/10/18 21:17:13 wilfried Exp $ +@comment $OpenBSD: PLIST-docs,v 1.5 2007/04/25 10:38:15 wilfried Exp $ share/doc/glibmm-${V}/ share/doc/glibmm-${V}/docs/ share/doc/glibmm-${V}/docs/images/ @@ -94,14 +94,30 @@ share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1OptionError.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1OptionError__inherit__graph.png share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1OptionGroup-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1OptionGroup.html -share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1OptionGroup_1_1CppOptionEntry-members.html -share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1OptionGroup_1_1CppOptionEntry.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PatternSpec-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PatternSpec.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PollFD-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PollFD.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Private-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Private.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Property-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Property.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyBase-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyBase.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyBase__inherit__graph.png +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__Base-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__Base.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__Base__inherit__graph.png +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__ReadOnly-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__ReadOnly.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__ReadOnly__inherit__graph.png +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__WriteOnly-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__WriteOnly.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__WriteOnly__inherit__graph.png +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1PropertyProxy__inherit__graph.png +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Property__inherit__graph.png share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Quark-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Quark.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Quark__inherit__graph.png @@ -166,6 +182,9 @@ share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyConnectionNode share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyNormal-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyNormal.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyNormal__inherit__graph.png +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyProperty-members.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyProperty.html +share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalProxyProperty__inherit__graph.png share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalTimeout-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1SignalTimeout.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Source-members.html @@ -213,7 +232,6 @@ share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1ValueBase__inherit__graph share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4__inherit__graph.png -share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01T_01_5_01_4-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01T_01_5_01_4.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01T_01_5_01_4__inherit__graph.png share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01bool_01_4-members.html @@ -222,7 +240,6 @@ share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01bool_01_4__inhe share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01char_01_4-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01char_01_4.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01char_01_4__inherit__graph.png -share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01const_01T_01_5_01_4-members.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01const_01T_01_5_01_4.html share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01const_01T_01_5_01_4__inherit__graph.png share/doc/glibmm-${V}/docs/reference/html/classGlib_1_1Value_3_01double_01_4-members.html @@ -278,16 +295,11 @@ share/doc/glibmm-${V}/docs/reference/html/class_8h.html share/doc/glibmm-${V}/docs/reference/html/classes.html share/doc/glibmm-${V}/docs/reference/html/classsigc_1_1trackable.html share/doc/glibmm-${V}/docs/reference/html/classsigc_1_1trackable__inherit__graph.png -share/doc/glibmm-${V}/docs/reference/html/classstd_1_1basic__filebuf.html -share/doc/glibmm-${V}/docs/reference/html/classstd_1_1basic__filebuf__inherit__graph.png -share/doc/glibmm-${V}/docs/reference/html/classstd_1_1char__traits.html -share/doc/glibmm-${V}/docs/reference/html/classstd_1_1char__traits__inherit__graph.png share/doc/glibmm-${V}/docs/reference/html/containerhandle__shared_8h.html share/doc/glibmm-${V}/docs/reference/html/containers_8h.html share/doc/glibmm-${V}/docs/reference/html/convert_8h.html share/doc/glibmm-${V}/docs/reference/html/date_8h.html share/doc/glibmm-${V}/docs/reference/html/debug_8h.html -share/doc/glibmm-${V}/docs/reference/html/deprecated.html share/doc/glibmm-${V}/docs/reference/html/dispatcher_8h.html share/doc/glibmm-${V}/docs/reference/html/doxygen.css share/doc/glibmm-${V}/docs/reference/html/doxygen.png @@ -454,38 +466,9 @@ share/doc/glibmm-${V}/docs/reference/html/inherit__graph__52.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__53.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__54.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__55.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__56.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__57.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__58.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__59.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__6.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__60.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__61.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__62.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__63.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__64.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__65.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__66.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__67.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__68.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__69.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__7.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__70.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__71.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__72.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__73.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__74.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__75.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__76.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__77.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__78.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__79.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__8.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__80.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__81.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__82.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__83.png -share/doc/glibmm-${V}/docs/reference/html/inherit__graph__84.png share/doc/glibmm-${V}/docs/reference/html/inherit__graph__9.png share/doc/glibmm-${V}/docs/reference/html/inherits.html share/doc/glibmm-${V}/docs/reference/html/init_8h.html