Update to 2.25.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14456 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 29 insertions, 37 deletions

diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index bdf813467..194237660 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.92 2010/06/18 20:09:31 kwm Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.93 2010/06/19 08:39:23 kwm Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.25.2
-PORTREVISION?=	1
+PORTVERSION=	2.25.3
+PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 638a5d076..91dc80afd 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.25.2.tar.bz2) = 4f1ac871374c92c69f982a32198feeb7
-SHA256 (gnome2/glibmm-2.25.2.tar.bz2) = 8c2bec1a5ce185bfe29c72bc0d93c7c70a5ff40b98bea8bc8b2fedc5f5f4931e
-SIZE (gnome2/glibmm-2.25.2.tar.bz2) = 4527993
+MD5 (gnome2/glibmm-2.25.3.tar.bz2) = f7527ac939cbfe8f85d7d54d2dcb36c4
+SHA256 (gnome2/glibmm-2.25.3.tar.bz2) = df738de311efe174f335f9d4f9ed8051a02d3d66043a9d31545d059824d7f7a2
+SIZE (gnome2/glibmm-2.25.3.tar.bz2) = 4867786
diff --git a/devel/glibmm/files/patch-glib_glibmm_ustring.cc b/devel/glibmm/files/patch-glib_glibmm_ustring.cc
deleted file mode 100644
index 7d63f5029..000000000
--- a/devel/glibmm/files/patch-glib_glibmm_ustring.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- glib/glibmm/ustring.cc.orig	2010-06-01 15:36:11.000000000 +0200
-+++ glib/glibmm/ustring.cc	2010-06-19 09:44:25.000000000 +0200
-@@ -1354,7 +1354,12 @@ std::wistream& operator>>(std::wistream&
-   glong n_bytes = 0;
-   const ScopedPtr<char> buf (g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(wstr.data()),
-                                              wstr.size(), 0, &n_bytes, &error));
--#endif //GLIBMM_EXCEPTIONS_ENABLED
-+#else
-+  gsize n_bytes = 0;
-+  const ScopedPtr<char> buf (g_convert(reinterpret_cast<const char*>(wstr.data()),
-+                                       wstr.size() * sizeof(std::wstring::value_type),
-+                                       "UTF-8", "WCHAR_T", 0, &n_bytes, &error));
-+#endif // !(__STDC_ISO_10646__ || G_OS_WIN32)
- 
-   if (error)
-   {
-@@ -1378,7 +1383,13 @@ std::wostream& operator<<(std::wostream&
-   // Avoid going through iconv if wchar_t always contains UTF-16.
-   const ScopedPtr<gunichar2> buf (g_utf8_to_utf16(utf8_string.raw().data(),
-                                                   utf8_string.raw().size(), 0, 0, &error));
--#endif //GLIBMM_EXCEPTIONS_ENABLED
-+#else
-+  // TODO: For some reason the conversion from UTF-8 to WCHAR_T doesn't work
-+  // with g_convert(), while iconv on the command line handles it just fine.
-+  // Maybe a bug in GLib?
-+  const ScopedPtr<char> buf (g_convert(utf8_string.raw().data(), utf8_string.raw().size(),
-+                                       "WCHAR_T", "UTF-8", 0, 0, &error));
-+#endif // !(__STDC_ISO_10646__ || G_OS_WIN32)
- 
-   if (error)
-   {
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 65e5f25a0..b2e3964f0 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -1,12 +1,20 @@
 include/giomm-%%API_VERSION%%/giomm.h
 include/giomm-%%API_VERSION%%/giomm/appinfo.h
+include/giomm-%%API_VERSION%%/giomm/application.h
 include/giomm-%%API_VERSION%%/giomm/asyncresult.h
 include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h
 include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/cancellable.h
 include/giomm-%%API_VERSION%%/giomm/contenttype.h
+include/giomm-%%API_VERSION%%/giomm/credentials.h
 include/giomm-%%API_VERSION%%/giomm/datainputstream.h
 include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/dbusauthobserver.h
+include/giomm-%%API_VERSION%%/giomm/dbusconnection.h
+include/giomm-%%API_VERSION%%/giomm/dbusmessage.h
+include/giomm-%%API_VERSION%%/giomm/dbusmethodinvocation.h
+include/giomm-%%API_VERSION%%/giomm/dbusownname.h
+include/giomm-%%API_VERSION%%/giomm/dbusserver.h
 include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h
 include/giomm-%%API_VERSION%%/giomm/drive.h
 include/giomm-%%API_VERSION%%/giomm/emblem.h
@@ -42,12 +50,20 @@ include/giomm-%%API_VERSION%%/giomm/networkaddress.h
 include/giomm-%%API_VERSION%%/giomm/networkservice.h
 include/giomm-%%API_VERSION%%/giomm/outputstream.h
 include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/application_p.h
 include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h
 include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/credentials_p.h
 include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusauthobserver_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusmessage_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusmethodinvocation_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusownname_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusserver_p.h
 include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h
 include/giomm-%%API_VERSION%%/giomm/private/drive_p.h
 include/giomm-%%API_VERSION%%/giomm/private/emblem_p.h
@@ -98,6 +114,7 @@ include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h
 include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h
 include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h
 include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixfdlist_p.h
 include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/volume_p.h
@@ -119,6 +136,7 @@ include/giomm-%%API_VERSION%%/giomm/tcpconnection.h
 include/giomm-%%API_VERSION%%/giomm/themedicon.h
 include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h
 include/giomm-%%API_VERSION%%/giomm/unixconnection.h
+include/giomm-%%API_VERSION%%/giomm/unixfdlist.h
 include/giomm-%%API_VERSION%%/giomm/unixinputstream.h
 include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/volume.h
@@ -181,6 +199,8 @@ include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/variant_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/varianttype_p.h
 include/glibmm-%%API_VERSION%%/glibmm/property.h
 include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h
 include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
@@ -208,6 +228,9 @@ include/glibmm-%%API_VERSION%%/glibmm/value.h
 include/glibmm-%%API_VERSION%%/glibmm/value_basictypes.h
 include/glibmm-%%API_VERSION%%/glibmm/value_custom.h
 include/glibmm-%%API_VERSION%%/glibmm/valuearray.h
+include/glibmm-%%API_VERSION%%/glibmm/variant.h
+include/glibmm-%%API_VERSION%%/glibmm/variant_basictypes.h
+include/glibmm-%%API_VERSION%%/glibmm/varianttype.h
 include/glibmm-%%API_VERSION%%/glibmm/wrap.h
 include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h
 include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h