[SCM] kalzium packaging branch, master, updated. debian/16.08.3-1-69-gd174ceb

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:07:21 UTC 2017 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalzium.git;a=commitdiff;h=5dd97e5

The following commit has been merged in the master branch:
commit 5dd97e507cd872ef9fca26e239c540ac03cdbfde
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Mar 1 16:16:52 2017 +0000

    refresh patches
---
 debian/patches/avoid_nameclash.patch               | 56 +++++++++++-----------
 debian/patches/no_install_rpath_use_link_path.diff | 31 ++++--------
 2 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/debian/patches/avoid_nameclash.patch b/debian/patches/avoid_nameclash.patch
index c2a7106..6212549 100644
--- a/debian/patches/avoid_nameclash.patch
+++ b/debian/patches/avoid_nameclash.patch
@@ -10,10 +10,10 @@ Subject: avoid_nameclash
  src/calculator/gasCalculator.h                |  2 +-
  4 files changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/plasmoid/applet/gasPlasmoid/gasCalculator.cpp b/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
-index de78078..a777a06 100644
---- a/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
-+++ b/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
+Index: kalzium/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
+===================================================================
+--- kalzium.orig/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
++++ kalzium/plasmoid/applet/gasPlasmoid/gasCalculator.cpp
 @@ -427,7 +427,7 @@ void gasCalculator::calculatePressure()
      double temp = (m_converter->convert(m_Temp, "kelvins")).number();
      double b = (m_converter->convert(m_Vand_B, "liters")).number();
@@ -68,10 +68,10 @@ index de78078..a777a06 100644
      m_Mass = Value(mass, "grams");
      m_Mass = (m_converter->convert(m_Mass, m_massUnit->nativeWidget()->currentText()));
      m_mass->setValue(m_Mass.number());
-diff --git a/plasmoid/applet/gasPlasmoid/gasCalculator.h b/plasmoid/applet/gasPlasmoid/gasCalculator.h
-index f552742..c8936fd 100644
---- a/plasmoid/applet/gasPlasmoid/gasCalculator.h
-+++ b/plasmoid/applet/gasPlasmoid/gasCalculator.h
+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"
@@ -81,11 +81,11 @@ index f552742..c8936fd 100644
  
  namespace Plasma{
      class ComboBox;
-diff --git a/src/calculator/gasCalculator.cpp b/src/calculator/gasCalculator.cpp
-index adef7f5..047496d 100644
---- a/src/calculator/gasCalculator.cpp
-+++ b/src/calculator/gasCalculator.cpp
-@@ -140,7 +140,7 @@ void gasCalculator::calculatePressure()
+Index: kalzium/src/calculator/gasCalculator.cpp
+===================================================================
+--- kalzium.orig/src/calculator/gasCalculator.cpp
++++ kalzium/src/calculator/gasCalculator.cpp
+@@ -142,7 +142,7 @@ void gasCalculator::calculatePressure()
      double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
      double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
  
@@ -93,8 +93,8 @@ index adef7f5..047496d 100644
 +    double pressure = m_moles * GAS_R * 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));
-@@ -155,7 +155,7 @@ void gasCalculator::calculateMolarMass()
+     m_pressure = m_pressure.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.pressure_unit)));
+@@ -157,7 +157,7 @@ void gasCalculator::calculateMolarMass()
      double temp = m_temp.convertTo(KUnitConversion::Kelvin).number();
      double b = m_Vand_b.convertTo(KUnitConversion::Liter).number();
  
@@ -103,25 +103,25 @@ index adef7f5..047496d 100644
                    / (volume - m_moles * b);
      ui.molarMass->setValue(m_molarMass);
  }
-@@ -166,7 +166,7 @@ void gasCalculator::calculateVol()
+@@ -168,7 +168,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 * GAS_R * temp / pressure + (m_moles * b);
      m_vol = Value(volume, KUnitConversion::Liter);
-     m_vol = m_vol.convertTo(getCurrentUnitId(ui.volume_unit));
+     m_vol = m_vol.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.volume_unit)));
      ui.volume->setValue(m_vol.number());
-@@ -179,7 +179,7 @@ void gasCalculator::calculateTemp()
+@@ -181,7 +181,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 / GAS_R;
      m_temp = Value(temp, KUnitConversion::Kelvin);
-     m_temp = m_temp.convertTo(getCurrentUnitId(ui.temp_unit));
+     m_temp = m_temp.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.temp_unit)));
      ui.temp->setValue(m_temp.number());
-@@ -193,7 +193,7 @@ void gasCalculator::calculateMoles()
+@@ -195,7 +195,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,25 +130,25 @@ index adef7f5..047496d 100644
      ui.moles->setValue(m_moles);
  }
  
-@@ -205,7 +205,7 @@ void gasCalculator::calculateMass()
+@@ -207,7 +207,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 / GAS_R / temp;
      m_mass = Value(mass, KUnitConversion::Gram);
-     m_mass = m_mass.convertTo(getCurrentUnitId(ui.mass_unit));
+     m_mass = m_mass.convertTo(KUnitConversion::UnitId(getCurrentUnitId(ui.mass_unit)));
      ui.mass->setValue(m_mass.number());
-diff --git a/src/calculator/gasCalculator.h b/src/calculator/gasCalculator.h
-index 4cbcecf..dfa990e 100644
---- a/src/calculator/gasCalculator.h
-+++ b/src/calculator/gasCalculator.h
+Index: kalzium/src/calculator/gasCalculator.h
+===================================================================
+--- kalzium.orig/src/calculator/gasCalculator.h
++++ kalzium/src/calculator/gasCalculator.h
 @@ -28,7 +28,7 @@
  #include "ui_gasCalculator.h"
  
  // The universal Gas constant is defined here.
--#define R 0.08206
-+#define GAS_R 0.08206
+-const double R = 0.08206;
++const double GAS_R = 0.08206;
  
  using namespace KUnitConversion;
  
diff --git a/debian/patches/no_install_rpath_use_link_path.diff b/debian/patches/no_install_rpath_use_link_path.diff
index 3dc2562..1bed476 100644
--- a/debian/patches/no_install_rpath_use_link_path.diff
+++ b/debian/patches/no_install_rpath_use_link_path.diff
@@ -9,28 +9,15 @@ Subject: disable INSTALL_RPATH_USE_LINK_PATH where it triggers useless RPATH
  src/CMakeLists.txt            | 1 +
  2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/compoundviewer/CMakeLists.txt b/compoundviewer/CMakeLists.txt
-index 0971248..4a7fdbb 100644
---- a/compoundviewer/CMakeLists.txt
-+++ b/compoundviewer/CMakeLists.txt
-@@ -22,6 +22,7 @@ target_link_libraries(compoundviewer
-    avogadro
+Index: kalzium/compoundviewer/CMakeLists.txt
+===================================================================
+--- kalzium.orig/compoundviewer/CMakeLists.txt
++++ kalzium/compoundviewer/CMakeLists.txt
+@@ -30,6 +30,7 @@ target_link_libraries(compoundviewer
+ set_target_properties(compoundviewer PROPERTIES
+     VERSION ${KALZIUMLIB_VERSION}
+     SOVERSION ${KALZIUMLIB_SOVERSION}
++    INSTALL_RPATH_USE_LINK_PATH false
  )
  
--set_target_properties(compoundviewer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-+set_target_properties(compoundviewer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}
-+   INSTALL_RPATH_USE_LINK_PATH false)
- 
  install(TARGETS compoundviewer ${INSTALL_TARGETS_DEFAULT_ARGS})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3cefc58..076bdb2 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -133,6 +133,7 @@ kde4_add_app_icon(kalzium_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kalzium.png"
- 
- kde4_add_executable(kalzium ${kalzium_SRCS})
- 
-+set_target_properties(kalzium PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
- target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} science)
- 
- if (OPENBABEL2_FOUND)

-- 
kalzium packaging

More information about the pkg-kde-commits mailing list