summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-08 22:46:55 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-08 22:49:58 +0200
commit1257a57be6a6d27551914d9d37490a1ef9755fd0 (patch)
treee5984dd19b75c307b7d88b93f150cf71e80789db /dev-embedded/cpik/files
parentwww-servers/tomcat: clean duplicate patches (diff)
downloadgentoo-1257a57be6a6d27551914d9d37490a1ef9755fd0.tar.gz
gentoo-1257a57be6a6d27551914d9d37490a1ef9755fd0.tar.bz2
gentoo-1257a57be6a6d27551914d9d37490a1ef9755fd0.zip
dev-embedded/cpik: 0.7.4_p4 version bump, use qtcore:5, fix GCC-6
Thanks-to: Thomas Posch <bugs.gentoo.org@online.posch.name> Bug: https://bugs.gentoo.org/644402 Closes: https://bugs.gentoo.org/639554 Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'dev-embedded/cpik/files')
-rw-r--r--dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch b/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch
new file mode 100644
index 000000000000..c1f41cd7e6e0
--- /dev/null
+++ b/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur cpik-0.7.2-4-orig/utility.h cpik-0.7.2-4/utility.h
+--- cpik-0.7.2-4-orig/utility.h 2017-12-03 03:47:35.302504007 +0100
++++ cpik-0.7.2-4/utility.h 2017-12-03 03:47:59.537116442 +0100
+@@ -75,7 +75,7 @@
+ static bool stringTo ( const string& s, T& result )
+ {
+ istringstream is ( s ) ;
+- return is >> result ;
++ return static_cast<bool>(is >> result);
+ }
+
+ /** generic conversion from T to string */