summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-10-20 09:40:21 +0000
committertnn <tnn@pkgsrc.org>2015-10-20 09:40:21 +0000
commit74667c39591ccf05ac15ed6ddc3bc16346ba6392 (patch)
treef7486078f0dae1741c83572e05efd5eb4705867f /misc
parent7e833ffaad4980c6c2493f0b39bfce5369bf958b (diff)
downloadpkgsrc-74667c39591ccf05ac15ed6ddc3bc16346ba6392.tar.gz
packages that use libsigc++ need -std=c++11 now
approved by wiz@
Diffstat (limited to 'misc')
-rw-r--r--misc/gelemental/Makefile3
-rw-r--r--misc/gelemental/distinfo3
-rw-r--r--misc/gelemental/patches/patch-src_dialogs.cc19
3 files changed, 23 insertions, 2 deletions
diff --git a/misc/gelemental/Makefile b/misc/gelemental/Makefile
index 1e076a19d4d..555e0da7b83 100644
--- a/misc/gelemental/Makefile
+++ b/misc/gelemental/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/07/03 12:46:10 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2015/10/20 09:40:22 tnn Exp $
#
DISTNAME= gelemental-1.2.0
@@ -15,6 +15,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
USE_LANGUAGES= c c++
+CXXFLAGS+= -std=c++11
PKGCONFIG_OVERRIDE+= data/libelemental.pc.in
diff --git a/misc/gelemental/distinfo b/misc/gelemental/distinfo
index 3f564e8e468..0d8612b8f9f 100644
--- a/misc/gelemental/distinfo
+++ b/misc/gelemental/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/07/03 12:46:10 joerg Exp $
+$NetBSD: distinfo,v 1.5 2015/10/20 09:40:22 tnn Exp $
SHA1 (gelemental-1.2.0.tar.bz2) = 5640c8912de555eddf72924c866831249d0fdd28
RMD160 (gelemental-1.2.0.tar.bz2) = a54b29e853d4861f4fd5adb947816cb0f736d2bc
@@ -9,4 +9,5 @@ SHA1 (patch-libelemental_misc_widgets_cc) = 1de3021e6b4790e8f879f7ed8859281bf6f7
SHA1 (patch-libelemental_value.cc) = 1db6a3d81c98749bf71a66ee88af8a18f3b2608d
SHA1 (patch-libelemental_value.hh) = bc630930c5e6a801419b7e48986814b7a96c4e89
SHA1 (patch-libelemental_value.tcc) = d07bd0eda624514bf4e22a2f995cc0176d1e6a6c
+SHA1 (patch-src_dialogs.cc) = 50b665acb4c2657d218a65a429d5c62b77d3e247
SHA1 (patch-src_main_cc) = efd05b15c0e4fc2d19c07c525ac5f20e9fb05b1c
diff --git a/misc/gelemental/patches/patch-src_dialogs.cc b/misc/gelemental/patches/patch-src_dialogs.cc
new file mode 100644
index 00000000000..e03505d949d
--- /dev/null
+++ b/misc/gelemental/patches/patch-src_dialogs.cc
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_dialogs.cc,v 1.1 2015/10/20 09:40:22 tnn Exp $
+
+dialogs.cc:250:14: error: incompatible operand types
+ ('Elemental::PropertyBase *' and 'bool')
+ return iter ? iter->get_value (cols.property) : false;
+
+(not sure if this is in line with what the code intends)
+
+--- src/dialogs.cc.orig 2007-09-25 04:49:33.000000000 +0000
++++ src/dialogs.cc
+@@ -247,7 +247,7 @@ PropertiesDialog::is_selectable (const R
+ const Gtk::TreePath& tpath, bool)
+ {
+ Gtk::TreeIter iter = store->get_iter (tpath);
+- return iter ? iter->get_value (cols.property) : false;
++ return iter ? (iter->get_value (cols.property) != NULL) : false;
+ }
+
+