[packages/kde4-kalzium] - fix c++ const def - rel 5

baggins baggins at pld-linux.org
Sat Oct 5 19:19:18 CEST 2019


commit fd31ef1232850f0c12dabe19354ce1b82f10b21c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 5 19:17:55 2019 +0200

    - fix c++ const def
    - rel 5

 cxx.patch         | 11 +++++++++++
 kde4-kalzium.spec |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/kde4-kalzium.spec b/kde4-kalzium.spec
index d73622b..dc2fd8d 100644
--- a/kde4-kalzium.spec
+++ b/kde4-kalzium.spec
@@ -5,17 +5,18 @@ Summary:	K Desktop Environment - A Periodic System of Elements database
 Summary(pl.UTF-8):	K Desktop Environment - Baza danych Układu Okresowego Pierwiastków
 Name:		kde4-kalzium
 Version:	4.14.3
-Release:	4
+Release:	5
 License:	GPL
 Group:		X11/Applications/Science
 Source0:	http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	f773692c7e58567a27d8129f0cc39d5c
 Patch0:		kalzium-eigen2.patch
 Patch1:		kalzium-ocaml.patch
+Patch2:		cxx.patch
 URL:		http://www.kde.org/
 BuildRequires:	avogadro-devel
 BuildRequires:	boost-python-devel
-BuildRequires:	eigen
+BuildRequires:	eigen3
 BuildRequires:	kde4-kdelibs-devel
 BuildRequires:	ocaml
 BuildRequires:	ocaml-facile
@@ -53,6 +54,7 @@ Pliki dla programistów kalzium.
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/cxx.patch b/cxx.patch
new file mode 100644
index 0000000..30abcfc
--- /dev/null
+++ b/cxx.patch
@@ -0,0 +1,11 @@
+--- kalzium-4.14.3/src/calculator/gasCalculator.h.orig	2014-10-29 20:36:16.000000000 +0100
++++ kalzium-4.14.3/src/calculator/gasCalculator.h	2019-10-05 19:16:06.306721543 +0200
+@@ -28,7 +28,7 @@
+ #include "ui_gasCalculator.h"
+ 
+ // The universal Gas constant is defined here.
+-#define R 0.08206
++const double R = 0.08206;
+ 
+ using namespace KUnitConversion;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kalzium.git/commitdiff/fd31ef1232850f0c12dabe19354ce1b82f10b21c



More information about the pld-cvs-commit mailing list