Attachment 198599 Details for Bug 232593 – patch

[patch] patch

kalzium-kde4.patch (text/plain), 7.06 KB, created by Yuri Victorovich on 2018-10-24 20:00:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2018-10-24 20:00:43 UTC

Size: 7.06 KB

patch

obsolete

>Index: science/kalzium-kde4/Makefile
>===================================================================
>--- science/kalzium-kde4/Makefile	(revision 482679)
>+++ science/kalzium-kde4/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	kalzium
> PORTVERSION=	${KDE4_VERSION}
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	science kde kde-kde4
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -17,7 +17,7 @@
> 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
> RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
> 
>-USES=		cmake:outsource eigen:3 kde:4 pkgconfig qt:4 tar:xz
>+USES=		cmake:outsource eigen:2 kde:4 pkgconfig qt:4 tar:xz
> USE_KDE=	kdelibs automoc4
> USE_OCAML=	yes
> NO_OCAML_RUNDEPENDS=	yes
>Index: science/kalzium-kde4/files/patch-KalziumConfigureChecks.cmake
>===================================================================
>--- science/kalzium-kde4/files/patch-KalziumConfigureChecks.cmake	(nonexistent)
>+++ science/kalzium-kde4/files/patch-KalziumConfigureChecks.cmake	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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)
>
>Property changes on: science/kalzium-kde4/files/patch-KalziumConfigureChecks.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/kalzium-kde4/files/patch-src_calculator_gasCalculator.cpp
>===================================================================
>--- science/kalzium-kde4/files/patch-src_calculator_gasCalculator.cpp	(nonexistent)
>+++ science/kalzium-kde4/files/patch-src_calculator_gasCalculator.cpp	(working copy)
>@@ -0,0 +1,56 @@
>+--- 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());
>
>Property changes on: science/kalzium-kde4/files/patch-src_calculator_gasCalculator.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/kalzium-kde4/files/patch-src_calculator_gasCalculator.h
>===================================================================
>--- science/kalzium-kde4/files/patch-src_calculator_gasCalculator.h	(nonexistent)
>+++ science/kalzium-kde4/files/patch-src_calculator_gasCalculator.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/calculator/gasCalculator.h.orig	2018-10-24 05:31:16 UTC
>++++ src/calculator/gasCalculator.h
>+@@ -28,7 +28,7 @@
>+ #include "ui_gasCalculator.h"
>+ 
>+ // The universal Gas constant is defined here.
>+-#define R 0.08206
>++#define Rgas 0.08206
>+ 
>+ using namespace KUnitConversion;
>+ 
>
>Property changes on: science/kalzium-kde4/files/patch-src_calculator_gasCalculator.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/kalzium-kde4/pkg-plist
>===================================================================
>--- science/kalzium-kde4/pkg-plist	(revision 482679)
>+++ science/kalzium-kde4/pkg-plist	(working copy)
>@@ -16,9 +16,6 @@
> lib/kde4/plasma_applet_didyouknow.so
> lib/kde4/plasma_applet_molmassCalculator.so
> lib/kde4/plasma_engine_kalzium.so
>-lib/libcompoundviewer.so
>-lib/libcompoundviewer.so.4
>-lib/libcompoundviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
> lib/libscience.so
> lib/libscience.so.4
> lib/libscience.so.%%KDE4_GENERIC_LIB_VERSION%%

Flags:

tcberner: maintainer-approval+

Actions: View | Diff

Attachments on bug 232593: 198531 | 198599