summaryrefslogtreecommitdiff
path: root/x11/gtkmm-utils
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-11-16 00:27:20 +0000
committerjoerg <joerg@pkgsrc.org>2012-11-16 00:27:20 +0000
commit37e5928f00425029e8d68291295ee1861106ce32 (patch)
tree5183e6c36c8d058a2d8ce3c39cd123ff44b3e876 /x11/gtkmm-utils
parent2442d9d0739b154ca9938335cc967bbbca0c89a1 (diff)
downloadpkgsrc-37e5928f00425029e8d68291295ee1861106ce32.tar.gz
Passing non-POD types to variadic functions is not valid C++.
Bump revision.
Diffstat (limited to 'x11/gtkmm-utils')
-rw-r--r--x11/gtkmm-utils/Makefile4
-rw-r--r--x11/gtkmm-utils/distinfo5
-rw-r--r--x11/gtkmm-utils/patches/patch-glibmm-utils_ustring.h13
-rw-r--r--x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc19
4 files changed, 35 insertions, 6 deletions
diff --git a/x11/gtkmm-utils/Makefile b/x11/gtkmm-utils/Makefile
index a97f42c2a49..5dce30136f1 100644
--- a/x11/gtkmm-utils/Makefile
+++ b/x11/gtkmm-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/29 05:06:20 asau Exp $
+# $NetBSD: Makefile,v 1.15 2012/11/16 00:27:20 joerg Exp $
#
DISTNAME= gtkmm-utils-0.4.1
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= x11
MASTER_SITES= http://gtkmm-utils.googlecode.com/files/
diff --git a/x11/gtkmm-utils/distinfo b/x11/gtkmm-utils/distinfo
index bf1ea89d94a..7d4066f0650 100644
--- a/x11/gtkmm-utils/distinfo
+++ b/x11/gtkmm-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/05/07 01:41:44 dholland Exp $
+$NetBSD: distinfo,v 1.3 2012/11/16 00:27:20 joerg Exp $
SHA1 (gtkmm-utils-0.4.1.tar.gz) = dbf1af7f0ee27c380786651591ef83549ce97ca0
RMD160 (gtkmm-utils-0.4.1.tar.gz) = 1db5390fc26f0f55fa19511e63b9d4ea6edb7250
@@ -6,4 +6,5 @@ Size (gtkmm-utils-0.4.1.tar.gz) = 388799 bytes
SHA1 (patch-aa) = 6bcc502c2901da1b468d9b9cb5d02f0d426828d6
SHA1 (patch-ab) = 1ac7b0b9cf87176264d12711b7e57f26fff30adf
SHA1 (patch-ac) = 81d58f752d8cc0383b9c3d532360e2cc7426ea01
-SHA1 (patch-glibmm-utils_ustring_cc) = fe4d4ca52ea15b3e7619da072faf4e0becc20260
+SHA1 (patch-glibmm-utils_ustring.h) = 31afa32fe4a38d4b2ca8ef83ad1d944c8c0d4779
+SHA1 (patch-glibmm-utils_ustring_cc) = 111019060ddfa53afc4c3a2d965d7993049262a9
diff --git a/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring.h b/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring.h
new file mode 100644
index 00000000000..4869d332265
--- /dev/null
+++ b/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-glibmm-utils_ustring.h,v 1.1 2012/11/16 00:27:20 joerg Exp $
+
+--- glibmm-utils/ustring.h.orig 2012-11-15 13:48:06.000000000 +0000
++++ glibmm-utils/ustring.h
+@@ -107,7 +107,7 @@ inline T convert_to(const Glib::ustring&
+ }
+
+ /// \brief a printf() that returns a Glib::ustring
+-Glib::ustring uprintf(const Glib::ustring& format, ...);
++Glib::ustring uprintf(const char *format, ...);
+
+ } // namespace Util
+
diff --git a/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc b/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc
index 5519ea30101..8a7092f5080 100644
--- a/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc
+++ b/x11/gtkmm-utils/patches/patch-glibmm-utils_ustring_cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-glibmm-utils_ustring_cc,v 1.1 2012/05/07 01:41:44 dholland Exp $
+$NetBSD: patch-glibmm-utils_ustring_cc,v 1.2 2012/11/16 00:27:20 joerg Exp $
Fix build with latest glib2.
---- glibmm-utils/ustring.cc~ 2008-06-19 13:12:29.000000000 +0000
+--- glibmm-utils/ustring.cc.orig 2008-06-19 13:12:29.000000000 +0000
+++ glibmm-utils/ustring.cc
@@ -20,8 +20,7 @@
*/
@@ -14,3 +14,18 @@ Fix build with latest glib2.
#include "ustring.h"
namespace Glib {
+@@ -156,12 +155,12 @@ trim(Glib::ustring& str)
+ }
+
+ Glib::ustring
+-uprintf(const Glib::ustring& format, ...)
++uprintf(const char *format, ...)
+ {
+ va_list args;
+
+ va_start(args, format);
+- gchar* cstr = g_strdup_vprintf(format.c_str(), args);
++ gchar* cstr = g_strdup_vprintf(format, args);
+ Glib::ustring str(cstr);
+ g_free(cstr);
+