[neon/kde/kalzium/Neon/stable] debian/patches: refresh patch
Jonathan Esk-Riddell
null at kde.org
Wed Mar 16 16:17:32 GMT 2022
Git commit cb37ea348e6e960de43aeded4e1bf614fee4c9bf by Jonathan Esk-Riddell.
Committed on 16/03/2022 at 16:17.
Pushed by jriddell into branch 'Neon/stable'.
refresh patch
M +7 -78 debian/patches/avoid_nameclash.patch
M +2 -2 debian/patches/no_install_rpath_use_link_path.diff
https://invent.kde.org/neon/kde/kalzium/commit/cb37ea348e6e960de43aeded4e1bf614fee4c9bf
diff --git a/debian/patches/avoid_nameclash.patch b/debian/patches/avoid_nameclash.patch
index b67020c..6f30e5f 100644
--- a/debian/patches/avoid_nameclash.patch
+++ b/debian/patches/avoid_nameclash.patch
@@ -10,82 +10,11 @@ Subject: avoid_nameclash
src/calculator/gasCalculator.h | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
-Index: kalzium/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
-===================================================================
---- kalzium.orig/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
-+++ kalzium/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
-@@ -430,7 +430,7 @@ void gasCalculator::calculatePressure()
- double temp = (m_converter->convert(m_Temp, "kelvins")).number();
- double b = (m_converter->convert(m_Vand_B, "liters")).number();
-
-- pressure = m_Moles * R * temp / (volume - m_Moles * b) - m_Moles * m_Moles * m_Vand_A / volume / volume;
-+ pressure = m_Moles * GAS_R * temp / (volume - m_Moles * b) - m_Moles * m_Moles * m_Vand_A / volume / volume;
- m_Pressure = Value(pressure, "atmospheres");
- m_Pressure = m_converter->convert(m_Pressure, m_pressureUnit->nativeWidget()->currentText());
- m_pressure->setValue(m_Pressure.number());
-@@ -447,7 +447,7 @@ void gasCalculator::calculateMolarMass()
- double temp = ((m_converter->convert(m_Temp, "kelvins")).number());
- double b = ((m_converter->convert(m_Vand_B, "liters")).number());
-
-- m_MolarMass = mass * R * temp / (pressure + m_Moles * m_Moles * m_Vand_A / volume / volume)\
-+ m_MolarMass = mass * GAS_R * temp / (pressure + m_Moles * m_Moles * m_Vand_A / volume / volume)\
- / (volume - m_Moles * b);
- m_molarMass->setValue(m_MolarMass);
- }
-@@ -460,7 +460,7 @@ void gasCalculator::calculateVol()
- double temp = ((m_converter->convert(m_Temp, "kelvins")).number());
- double b = ((m_converter->convert(m_Vand_B, "liters")).number());
-
-- volume = m_Moles * R * temp / pressure + (m_Moles * b);
-+ volume = m_Moles * GAS_R * temp / pressure + (m_Moles * b);
- m_Vol = Value(volume, "liters");
- m_Vol = (m_converter->convert(m_Vol, m_volumeUnit->nativeWidget()->currentText()));
- m_volume->setValue(m_Vol.number());
-@@ -475,7 +475,7 @@ void gasCalculator::calculateTemp()
- double b = ((m_converter->convert(m_Vand_B, "liters")).number());
-
- temp = (pressure + (m_Moles * m_Moles * m_Vand_A / volume / volume))\
-- * (volume - m_Moles * b) / m_Moles / R;
-+ * (volume - m_Moles * b) / m_Moles / GAS_R;
- m_Temp = Value(temp, "kelvins");
- m_Temp = (m_converter->convert(m_Temp, m_temperatureUnit->nativeWidget()->currentText()));
- m_temperature->setValue(m_Temp.number());
-@@ -490,7 +490,7 @@ void gasCalculator::calculateMoles()
- double b = ((m_converter->convert(m_Vand_B, "liters")).number());
-
- m_Moles = (pressure + m_Moles * m_Moles * m_Vand_A / volume / volume)\
-- * (volume - m_Moles * b) / R / temp;
-+ * (volume - m_Moles * b) / GAS_R / temp;
- m_moles->setValue(m_Moles);
- }
-
-@@ -504,7 +504,7 @@ void gasCalculator::calculateMass()
- double b = ((m_converter->convert(m_Vand_B, "liters")).number());
-
- 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 / GAS_R / temp;
- m_Mass = Value(mass, "grams");
- m_Mass = (m_converter->convert(m_Mass, m_massUnit->nativeWidget()->currentText()));
- m_mass->setValue(m_Mass.number());
-Index: kalzium/plasmoid/applet/gasPlasmoid/gasCalculator.h
-===================================================================
---- kalzium.orig/plasmoid/applet/gasPlasmoid/gasCalculator.h
-+++ kalzium/plasmoid/applet/gasPlasmoid/gasCalculator.h
-@@ -23,7 +23,7 @@
-
- #include "ui_gasCalculatorConfig.h"
-
--#define R 0.08206
-+#define GAS_R 0.08206
-
- namespace Plasma{
- class ComboBox;
Index: kalzium/src/calculator/gasCalculator.cpp
===================================================================
--- kalzium.orig/src/calculator/gasCalculator.cpp
+++ kalzium/src/calculator/gasCalculator.cpp
-@@ -143,7 +143,7 @@ void gasCalculator::calculatePressure()
+@@ -130,7 +130,7 @@ void gasCalculator::calculatePressure()
double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
@@ -94,7 +23,7 @@ Index: kalzium/src/calculator/gasCalculator.cpp
m_pressure = Value(pressure, KUnitConversion::Atmosphere);
m_pressure = m_pressure.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.pressure_unit)));
-@@ -158,7 +158,7 @@ void gasCalculator::calculateMolarMass()
+@@ -145,7 +145,7 @@ void gasCalculator::calculateMolarMass()
double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
@@ -103,7 +32,7 @@ Index: kalzium/src/calculator/gasCalculator.cpp
/ (volume - m_moles * b);
ui.molarMass->setValue(m_molarMass);
}
-@@ -169,7 +169,7 @@ void gasCalculator::calculateVol()
+@@ -156,7 +156,7 @@ void gasCalculator::calculateVol()
double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
@@ -112,7 +41,7 @@ Index: kalzium/src/calculator/gasCalculator.cpp
m_vol = Value(volume, KUnitConversion::Liter);
m_vol = m_vol.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.volume_unit)));
ui.volume->setValue(m_vol.number());
-@@ -182,7 +182,7 @@ void gasCalculator::calculateTemp()
+@@ -169,7 +169,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))\
@@ -121,7 +50,7 @@ Index: kalzium/src/calculator/gasCalculator.cpp
m_temp = Value(temp, KUnitConversion::Kelvin);
m_temp = m_temp.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.temp_unit)));
ui.temp->setValue(m_temp.number());
-@@ -196,7 +196,7 @@ void gasCalculator::calculateMoles()
+@@ -183,7 +183,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)\
@@ -130,7 +59,7 @@ Index: kalzium/src/calculator/gasCalculator.cpp
ui.moles->setValue(m_moles);
}
-@@ -208,7 +208,7 @@ void gasCalculator::calculateMass()
+@@ -195,7 +195,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)\
@@ -143,7 +72,7 @@ Index: kalzium/src/calculator/gasCalculator.h
===================================================================
--- kalzium.orig/src/calculator/gasCalculator.h
+++ kalzium/src/calculator/gasCalculator.h
-@@ -30,7 +30,7 @@
+@@ -17,7 +17,7 @@
#include "ui_gasCalculator.h"
// The universal Gas constant is defined here.
diff --git a/debian/patches/no_install_rpath_use_link_path.diff b/debian/patches/no_install_rpath_use_link_path.diff
index 7d9a032..292cc9b 100644
--- a/debian/patches/no_install_rpath_use_link_path.diff
+++ b/debian/patches/no_install_rpath_use_link_path.diff
@@ -20,12 +20,12 @@ Index: kalzium/compoundviewer/CMakeLists.txt
+ INSTALL_RPATH_USE_LINK_PATH false
)
- install(TARGETS compoundviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS compoundviewer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
Index: kalzium/src/CMakeLists.txt
===================================================================
--- kalzium.orig/src/CMakeLists.txt
+++ kalzium/src/CMakeLists.txt
-@@ -137,6 +137,7 @@ kconfig_add_kcfg_files(kalzium_SRCS pref
+@@ -182,6 +182,7 @@ kconfig_add_kcfg_files(kalzium_SRCS pref
add_executable(kalzium ${kalzium_SRCS})
More information about the Neon-commits
mailing list