Attachment #198599 for bug #232593

Lines 2-8 Link Here

(-)science/kalzium-kde4/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= kalzium	3	PORTNAME= kalzium
4	PORTVERSION= ${KDE4_VERSION}	4	PORTVERSION= ${KDE4_VERSION}
5	PORTREVISION= 5	5	PORTREVISION= 6
6	CATEGORIES= science kde kde-kde4	6	CATEGORIES= science kde kde-kde4
7		7
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
Lines 17-23 Link Here
17	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data	17	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
18	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data	18	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
19		19
20	USES= cmake:outsource eigen:3 kde:4 pkgconfig qt:4 tar:xz	20	USES= cmake:outsource eigen:2 kde:4 pkgconfig qt:4 tar:xz
21	USE_KDE= kdelibs automoc4	21	USE_KDE= kdelibs automoc4
22	USE_OCAML= yes	22	USE_OCAML= yes
23	NO_OCAML_RUNDEPENDS= yes	23	NO_OCAML_RUNDEPENDS= yes




--- KalziumConfigureChecks.cmake.orig	2018-10-24 19:49:03 UTC
+++ KalziumConfigureChecks.cmake
@@ -4,7 +4,8 @@ include(CheckFunctionExists)
 macro_optional_find_package(OCaml)
 macro_optional_find_package(Libfacile)
 macro_optional_find_package(OpenBabel2)
-macro_optional_find_package(Eigen3)
+#macro_optional_find_package(Eigen3)
+set(EIGEN3_FOUND FALSE)
 macro_optional_find_package(Avogadro 1.0.0 NO_MODULE)
 
 find_package(PkgConfig)




--- src/calculator/gasCalculator.cpp.orig	2018-10-24 05:36:48 UTC
+++ src/calculator/gasCalculator.cpp
@@ -139,7 +139,7 @@ void gasCalculator::calculatePressure()
     double temp = m_temp.convertTo( KUnitConversion::Kelvin ).number();
     double b = m_Vand_b.convertTo( KUnitConversion::Liter ).number();
 
-    double pressure = m_moles * R * temp / (volume - m_moles * b) - m_moles * m_moles * m_Vand_a / volume / volume;
+    double pressure = m_moles * Rgas * temp / (volume - m_moles * b) - m_moles * m_moles * m_Vand_a / volume / volume;
 
     m_pressure = Value(pressure, KUnitConversion::Atmosphere );
     m_pressure = m_pressure.convertTo(getCurrentUnitId(ui.pressure_unit));
@@ -154,7 +154,7 @@ void gasCalculator::calculateMolarMass()
     double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
     double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
 
-    m_molarMass = mass * R * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
+    m_molarMass = mass * Rgas * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
                   / (volume - m_moles * b);
     ui.molarMass->setValue(m_molarMass);
 }
@@ -165,7 +165,7 @@ void gasCalculator::calculateVol()
     double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
     double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
 
-    double volume = m_moles * R * temp / pressure + (m_moles * b);
+    double volume = m_moles * Rgas * temp / pressure + (m_moles * b);
     m_vol = Value(volume, KUnitConversion::Liter);
     m_vol = m_vol.convertTo( getCurrentUnitId(ui.volume_unit) );
     ui.volume->setValue(m_vol.number());
@@ -178,7 +178,7 @@ void gasCalculator::calculateTemp()
     double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
 
     double temp = (pressure + (m_moles * m_moles * m_Vand_a / volume / volume))\
-                  * (volume - m_moles * b) / m_moles / R;
+                  * (volume - m_moles * b) / m_moles / Rgas;
     m_temp = Value(temp, KUnitConversion::Kelvin);
     m_temp = m_temp.convertTo( getCurrentUnitId( ui.temp_unit ) );
     ui.temp->setValue(m_temp.number());
@@ -192,7 +192,7 @@ void gasCalculator::calculateMoles()
     double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
 
     m_moles = (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
-              * (volume - m_moles * b) / R / temp;
+              * (volume - m_moles * b) / Rgas / temp;
     ui.moles->setValue(m_moles);
 }
 
@@ -204,7 +204,7 @@ void gasCalculator::calculateMass()
     double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
 
     double mass = (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
-                  * (volume - m_moles * b) * m_molarMass / R / temp;
+                  * (volume - m_moles * b) * m_molarMass / Rgas / temp;
     m_mass = Value(mass, KUnitConversion::Gram);
     m_mass = m_mass.convertTo( getCurrentUnitId( ui.mass_unit ) );
     ui.mass->setValue(m_mass.number());

Line 0 Link Here

(-)science/kalzium-kde4/files/patch-src_calculator_gasCalculator.h (+11 lines)
	1	--- src/calculator/gasCalculator.h.orig 2018-10-24 05:31:16 UTC
	2	+++ src/calculator/gasCalculator.h
	3	@@ -28,7 +28,7 @@
	4	#include "ui_gasCalculator.h"
	5
	6	// The universal Gas constant is defined here.
	7	-#define R 0.08206
	8	+#define Rgas 0.08206
	9
	10	using namespace KUnitConversion;
	11

Lines 16-24 Link Here

(-)science/kalzium-kde4/pkg-plist (-3 lines)
16	lib/kde4/plasma_applet_didyouknow.so	16	lib/kde4/plasma_applet_didyouknow.so
17	lib/kde4/plasma_applet_molmassCalculator.so	17	lib/kde4/plasma_applet_molmassCalculator.so
18	lib/kde4/plasma_engine_kalzium.so	18	lib/kde4/plasma_engine_kalzium.so
19	lib/libcompoundviewer.so
20	lib/libcompoundviewer.so.4
21	lib/libcompoundviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
22	lib/libscience.so	19	lib/libscience.so
23	lib/libscience.so.4	20	lib/libscience.so.4
24	lib/libscience.so.%%KDE4_GENERIC_LIB_VERSION%%	21	lib/libscience.so.%%KDE4_GENERIC_LIB_VERSION%%

Return to bug 232593

Line 0 Link Here

(-)science/kalzium-kde4/files/patch-KalziumConfigureChecks.cmake (+12 lines)
	1	--- KalziumConfigureChecks.cmake.orig 2018-10-24 19:49:03 UTC
	2	+++ KalziumConfigureChecks.cmake
	3	@@ -4,7 +4,8 @@ include(CheckFunctionExists)
	4	macro_optional_find_package(OCaml)
	5	macro_optional_find_package(Libfacile)
	6	macro_optional_find_package(OpenBabel2)
	7	-macro_optional_find_package(Eigen3)
	8	+#macro_optional_find_package(Eigen3)
	9	+set(EIGEN3_FOUND FALSE)
	10	macro_optional_find_package(Avogadro 1.0.0 NO_MODULE)
	11
	12	find_package(PkgConfig)

Line 0 Link Here

(-)science/kalzium-kde4/files/patch-src_calculator_gasCalculator.cpp (+56 lines)
	1	--- src/calculator/gasCalculator.cpp.orig 2018-10-24 05:36:48 UTC
	2	+++ src/calculator/gasCalculator.cpp
	3	@@ -139,7 +139,7 @@ void gasCalculator::calculatePressure()
	4	double temp = m_temp.convertTo( KUnitConversion::Kelvin ).number();
	5	double b = m_Vand_b.convertTo( KUnitConversion::Liter ).number();
	6
	7	- double pressure = m_moles * R * temp / (volume - m_moles * b) - m_moles * m_moles * m_Vand_a / volume / volume;
	8	+ double pressure = m_moles * Rgas * temp / (volume - m_moles * b) - m_moles * m_moles * m_Vand_a / volume / volume;
	9
	10	m_pressure = Value(pressure, KUnitConversion::Atmosphere );
	11	m_pressure = m_pressure.convertTo(getCurrentUnitId(ui.pressure_unit));
	12	@@ -154,7 +154,7 @@ void gasCalculator::calculateMolarMass()
	13	double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
	14	double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
	15
	16	- m_molarMass = mass * R * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
	17	+ m_molarMass = mass * Rgas * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
	18	/ (volume - m_moles * b);
	19	ui.molarMass->setValue(m_molarMass);
	20	}
	21	@@ -165,7 +165,7 @@ void gasCalculator::calculateVol()
	22	double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
	23	double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
	24
	25	- double volume = m_moles * R * temp / pressure + (m_moles * b);
	26	+ double volume = m_moles * Rgas * temp / pressure + (m_moles * b);
	27	m_vol = Value(volume, KUnitConversion::Liter);
	28	m_vol = m_vol.convertTo( getCurrentUnitId(ui.volume_unit) );
	29	ui.volume->setValue(m_vol.number());
	30	@@ -178,7 +178,7 @@ void gasCalculator::calculateTemp()
	31	double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
	32
	33	double temp = (pressure + (m_moles * m_moles * m_Vand_a / volume / volume))\
	34	- * (volume - m_moles * b) / m_moles / R;
	35	+ * (volume - m_moles * b) / m_moles / Rgas;
	36	m_temp = Value(temp, KUnitConversion::Kelvin);
	37	m_temp = m_temp.convertTo( getCurrentUnitId( ui.temp_unit ) );
	38	ui.temp->setValue(m_temp.number());
	39	@@ -192,7 +192,7 @@ void gasCalculator::calculateMoles()
	40	double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
	41
	42	m_moles = (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
	43	- * (volume - m_moles * b) / R / temp;
	44	+ * (volume - m_moles * b) / Rgas / temp;
	45	ui.moles->setValue(m_moles);
	46	}
	47
	48	@@ -204,7 +204,7 @@ void gasCalculator::calculateMass()
	49	double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
	50
	51	double mass = (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
	52	- * (volume - m_moles * b) * m_molarMass / R / temp;
	53	+ * (volume - m_moles * b) * m_molarMass / Rgas / temp;
	54	m_mass = Value(mass, KUnitConversion::Gram);
	55	m_mass = m_mass.convertTo( getCurrentUnitId( ui.mass_unit ) );
	56	ui.mass->setValue(m_mass.number());