[neon/kde/kalzium/Neon/unstable] debian/patches: refresh patch

[Jonathan Esk-Riddell]

Git commit 34109d73765adf4e3bd4bf53795cf1e9b570045b by Jonathan Esk-Riddell.
Committed on 13/07/2022 at 14:40.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patch

M  +18   -18   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/34109d73765adf4e3bd4bf53795cf1e9b570045b

diff --git a/debian/patches/avoid_nameclash.patch b/debian/patches/avoid_nameclash.patch
index 6f30e5f..d3900fb 100644
--- a/debian/patches/avoid_nameclash.patch
+++ b/debian/patches/avoid_nameclash.patch
@@ -14,7 +14,7 @@ Index: kalzium/src/calculator/gasCalculator.cpp
 ===================================================================
 --- kalzium.orig/src/calculator/gasCalculator.cpp
 +++ kalzium/src/calculator/gasCalculator.cpp
-@@ -130,7 +130,7 @@ void gasCalculator::calculatePressure()
+@@ -112,7 +112,7 @@ void gasCalculator::calculatePressure()
      double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
      double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
  
@@ -23,16 +23,16 @@ Index: kalzium/src/calculator/gasCalculator.cpp
  
      m_pressure = Value(pressure, KUnitConversion::Atmosphere);
      m_pressure = m_pressure.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.pressure_unit)));
-@@ -145,7 +145,7 @@ void gasCalculator::calculateMolarMass()
+@@ -127,7 +127,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 * GAS_R * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume)\
-                   / (volume - m_moles * b);
+-    m_molarMass = mass * R * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume) / (volume - m_moles * b);
++    m_molarMass = mass * GAS_R * temp / (pressure + m_moles * m_moles * m_Vand_a / volume / volume) / (volume - m_moles * b);
      ui.molarMass->setValue(m_molarMass);
  }
-@@ -156,7 +156,7 @@ void gasCalculator::calculateVol()
+ 
+@@ -137,7 +137,7 @@ void gasCalculator::calculateVol()
      double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
      double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
  
@@ -41,30 +41,30 @@ 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());
-@@ -169,7 +169,7 @@ void gasCalculator::calculateTemp()
+@@ -149,7 +149,7 @@ void gasCalculator::calculateTemp()
+     double pressure = m_pressure.convertTo(KUnitConversion::Atmosphere).number();
      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 / GAS_R;
+-    double temp = (pressure + (m_moles * m_moles * m_Vand_a / volume / volume)) * (volume - m_moles * b) / m_moles / R;
++    double temp = (pressure + (m_moles * m_moles * m_Vand_a / volume / volume)) * (volume - m_moles * b) / m_moles / GAS_R;
      m_temp = Value(temp, KUnitConversion::Kelvin);
      m_temp = m_temp.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.temp_unit)));
      ui.temp->setValue(m_temp.number());
-@@ -183,7 +183,7 @@ void gasCalculator::calculateMoles()
+@@ -162,7 +162,7 @@ void gasCalculator::calculateMoles()
+     double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
      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) / GAS_R / temp;
+-    m_moles = (pressure + m_moles * m_moles * m_Vand_a / volume / volume) * (volume - m_moles * b) / R / temp;
++    m_moles = (pressure + m_moles * m_moles * m_Vand_a / volume / volume) * (volume - m_moles * b) / GAS_R / temp;
      ui.moles->setValue(m_moles);
  }
  
-@@ -195,7 +195,7 @@ void gasCalculator::calculateMass()
+@@ -173,7 +173,7 @@ void gasCalculator::calculateMass()
+     double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
      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 / GAS_R / temp;
+-    double mass = (pressure + m_moles * m_moles * m_Vand_a / volume / volume) * (volume - m_moles * b) * m_molarMass / R / temp;
++    double mass = (pressure + m_moles * m_moles * m_Vand_a / volume / volume) * (volume - m_moles * b) * m_molarMass / GAS_R / temp;
      m_mass = Value(mass, KUnitConversion::Gram);
      m_mass = m_mass.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.mass_unit)));
      ui.mass->setValue(m_mass.number());
diff --git a/debian/patches/no_install_rpath_use_link_path.diff b/debian/patches/no_install_rpath_use_link_path.diff
index 292cc9b..1a734a4 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 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ generate_export_header(compoundviewer)
 Index: kalzium/src/CMakeLists.txt
 ===================================================================
 --- kalzium.orig/src/CMakeLists.txt
 +++ kalzium/src/CMakeLists.txt
-@@ -182,6 +182,7 @@ kconfig_add_kcfg_files(kalzium_SRCS pref
+@@ -187,6 +187,7 @@ kconfig_add_kcfg_files(kalzium_SRCS GENE
  
  add_executable(kalzium ${kalzium_SRCS})