CVS commit: pkgsrc/math/kcalc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 17 11:01:23 UTC 2018

Modified Files:
        pkgsrc/math/kcalc: distinfo
Added Files:
        pkgsrc/math/kcalc/patches: patch-kcalc.cpp

Log Message:
kcalc: Avoid 'version' namespace issue.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/kcalc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/kcalc/patches/patch-kcalc.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/kcalc/distinfo
diff -u pkgsrc/math/kcalc/distinfo:1.9 pkgsrc/math/kcalc/distinfo:1.10
--- pkgsrc/math/kcalc/distinfo:1.9      Tue Nov  3 23:33:35 2015
+++ pkgsrc/math/kcalc/distinfo  Thu May 17 11:01:23 2018
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 23:33:35 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/05/17 11:01:23 jperkin Exp $
 
 SHA1 (kcalc-4.14.3.tar.xz) = 0990a35d1fe97b4d4157b6ce6d8e13d199934dad
 RMD160 (kcalc-4.14.3.tar.xz) = 81822b452042f23e85216ad3e662e797050e0592
 SHA512 (kcalc-4.14.3.tar.xz) = ec8090b6bc8c78e7a63286c797e67617e4d9e335f6b29dce1dcbd41073465e6cf313d485f27f84a06d7cd04acc024051709b00f7be1dc8170e9531281d2deb16
 Size (kcalc-4.14.3.tar.xz) = 81392 bytes
 SHA1 (patch-CMakeLists.txt) = 41012666b695fbaad04261cbf566d875d9f83ed8
+SHA1 (patch-kcalc.cpp) = a318b81b381454fcf1570450c41d6bb7b58cf685
 SHA1 (patch-knumber_knumber_float.cpp) = 678e8d62df1a615f1117c58737da23a95d0e15a9
 SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df

Added files:

Index: pkgsrc/math/kcalc/patches/patch-kcalc.cpp
diff -u /dev/null pkgsrc/math/kcalc/patches/patch-kcalc.cpp:1.1
--- /dev/null   Thu May 17 11:01:23 2018
+++ pkgsrc/math/kcalc/patches/patch-kcalc.cpp   Thu May 17 11:01:23 2018
@@ -0,0 +1,24 @@
+$NetBSD: patch-kcalc.cpp,v 1.1 2018/05/17 11:01:23 jperkin Exp $
+
+Avoid 'version' namespace issue.
+
+--- kcalc.cpp.orig     2014-07-17 13:35:22.000000000 +0000
++++ kcalc.cpp
+@@ -64,7 +64,7 @@ along with this program.  If not, see <h
+ 
+ namespace {
+ const char description[] = I18N_NOOP("KDE Calculator");
+-const char version[]   = KCALCVERSION;
++const char myversion[]         = KCALCVERSION;
+ const int maxprecision   = 1000;
+ }
+ 
+@@ -2284,7 +2284,7 @@ extern "C" KDE_EXPORT int kdemain(int ar
+       KAboutData aboutData("kcalc",
+               0,
+               ki18n("KCalc"),
+-              version,
++              myversion,
+               ki18n(description),
+               KAboutData::License_GPL,
+               ki18n(