[112175] trunk/dports/devel/glibmm
devans at macports.org
devans at macports.org
Mon Oct 14 09:09:50 PDT 2013
Revision: 112175
https://trac.macports.org/changeset/112175
Author: devans at macports.org
Date: 2013-10-14 09:09:50 -0700 (Mon, 14 Oct 2013)
Log Message:
-----------
glibmm: update to version 2.38.0.
Modified Paths:
--------------
trunk/dports/devel/glibmm/Portfile
Added Paths:
-----------
trunk/dports/devel/glibmm/files/
trunk/dports/devel/glibmm/files/patch-gio-src-actiongroup.hg.diff
Modified: trunk/dports/devel/glibmm/Portfile
===================================================================
--- trunk/dports/devel/glibmm/Portfile 2013-10-14 16:09:05 UTC (rev 112174)
+++ trunk/dports/devel/glibmm/Portfile 2013-10-14 16:09:50 UTC (rev 112175)
@@ -4,7 +4,7 @@
PortSystem 1.0
name glibmm
-version 2.36.2
+version 2.38.0
set branch [join [lrange [split ${version} .] 0 1] .]
description C++ interface to glib
long_description \
@@ -18,19 +18,23 @@
use_xz yes
-checksums rmd160 df88264bc1f1968fc1bdc6ace2c509af88941edd \
- sha256 f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf
+checksums rmd160 6d65859a733a63d2bf93201d0a454e45b5972c04 \
+ sha256 f37bab6bedb7b68045e356feca9e27760a5ce50d95df07156656a0e1deabc402
depends_build port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool \
port:mm-common
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:p5.12-xml-parser \
port:libsigcxx2
-use_autoreconf yes
-autoreconf.args -fvi
+patchfiles patch-gio-src-actiongroup.hg.diff
+configure.cmd ./autogen.sh
+
post-destroot {
set mmdoctooldir ${prefix}/share/glibmm-2.4/doctool
xinstall -d ${destroot}${mmdoctooldir}
Added: trunk/dports/devel/glibmm/files/patch-gio-src-actiongroup.hg.diff
===================================================================
--- trunk/dports/devel/glibmm/files/patch-gio-src-actiongroup.hg.diff (rev 0)
+++ trunk/dports/devel/glibmm/files/patch-gio-src-actiongroup.hg.diff 2013-10-14 16:09:50 UTC (rev 112175)
@@ -0,0 +1,27 @@
+From c619be2fadae1b5a87151db0b0adddf55584084a Mon Sep 17 00:00:00 2001
+From: Murray Cumming <murrayc at murrayc.com>
+Date: Mon, 14 Oct 2013 08:11:25 +0000
+Subject: Gio::ActionGroup: Remove a nonsensical check.
+
+* gio/src/actiongroup.hg: get_action_state_hint():
+ Remove a wrongly copy/pasted g_return_if_fail() line that
+ causes a compiler error when the template is actually used.
+ Ideally we would have tests for uses of templated methods.
+ Bug #709963 (Johannes Meng, David Evans)
+---
+diff --git a/gio/src/actiongroup.hg b/gio/src/actiongroup.hg
+index 4d706d7..434b7fa 100644
+--- gio/src/actiongroup.hg.orig
++++ gio/src/actiongroup.hg
+@@ -184,9 +184,6 @@ void ActionGroup::get_action_state_hint(const Glib::ustring& action_name, T_Valu
+
+ typedef Glib::Variant<T_Value> type_glib_variant;
+
+- g_return_if_fail(
+- g_variant_type_equal(g_action_get_state_type(const_cast<GAction*>(gobj())), type_glib_variant::variant_type().gobj()));
+-
+ const Glib::VariantBase variantBase = get_action_state_hint_variant(action_name);
+
+ // We can't check the type (a range) that will be returned before getting the range hint.
+--
+cgit v0.9.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131014/56caa847/attachment.html>
More information about the macports-changes
mailing list