Page MenuHomeFreeBSD
Files F171120082

D9755.id.diff
No OneTemporary
Actions

D9755.id.diff
View Options

Index: science/kalzium/Makefile
===================================================================
--- science/kalzium/Makefile
+++ science/kalzium/Makefile
@@ -1,9 +1,9 @@
+# Created by: tcberner
# $FreeBSD$
PORTNAME= kalzium
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
-CATEGORIES= science kde kde-kde4
+PORTVERSION= ${KDE_APPLICATIONS_VERSION}
+CATEGORIES= science kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Periodic table of elements for KDE 4
@@ -16,12 +16,14 @@
${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 kde:4 pkgconfig tar:xz
-USE_KDE= kdelibs automoc4
+USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_QT4= corelib declarative designer opengl script xml \
- moc_build qmake_build rcc_build uic_build
+USE_KDE= ecm archive config coreaddons doctools emoticons i18n itemmodels itemviews \
+ kdelibs4support khtml newstuff parts plotting solid \
+ unitconversion widgetsaddons
+USE_QT5= buildtools_build core opengl qmake_build quick script svg widgets
+
USE_LDCONFIG= yes
.include <bsd.port.mk>
Index: science/kalzium/distinfo
===================================================================
--- science/kalzium/distinfo
+++ science/kalzium/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/kalzium-4.14.3.tar.xz) = 4b8d086c942874c56b4835079991f2d86289d163d2dbb3e86390270c758317e5
-SIZE (KDE/4.14.3/kalzium-4.14.3.tar.xz) = 3944960
+TIMESTAMP = 1486501807
+SHA256 (KDE/applications/16.12.2/kalzium-16.12.2.tar.xz) = 50d7f97edc89544801b75140b08001a51d6f0844d046e08d9ae2f16528ce7710
+SIZE (KDE/applications/16.12.2/kalzium-16.12.2.tar.xz) = 4589232
Index: science/kalzium/files/patch-git_0404879
===================================================================
--- /dev/null
+++ science/kalzium/files/patch-git_0404879
@@ -0,0 +1,152 @@
+From 04048799910fc423a5fa100a1c46b91dbe8e7e61 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sun, 22 Jan 2017 14:46:24 +0100
+Subject: [PATCH] Fix build with extra-cmake-modules > 5.30
+
+Since a5f3a76e14799c68b5e8f74e375baa5f6f6ab4dc in
+extra-cmake-modules.git -fno-operator-names is passed to the build
+(when supported), causing a build error for kalzium.
+
+REVIEW: 129873
+---
+ src/calculator/titrationCalculator.cpp | 39 +++++++++++++++-------------------
+ 1 file changed, 17 insertions(+), 22 deletions(-)
+
+diff --git a/src/calculator/titrationCalculator.cpp b/src/calculator/titrationCalculator.cpp
+index 44ea1527..6ea9ac9b 100644
+--- src/calculator/titrationCalculator.cpp
++++ src/calculator/titrationCalculator.cpp
+@@ -41,11 +41,6 @@
+
+ using namespace std;
+
+-#ifdef _MSC_VER
+-#define and &&
+-#define or ||
+-#endif
+-
+ titrationCalculator::titrationCalculator(QWidget * parent) : QWidget(parent)
+ {
+ xmin = 0;
+@@ -112,7 +107,7 @@ void titrationCalculator::plot()
+ }
+ QString mreporto;
+ int iter = 0;
+- if (uid.xaxis->text() == "" or uid.xaxis->text() == " ") {
++ if (uid.xaxis->text() == "" || uid.xaxis->text() == " ") {
+ uid.xaxis->setText(i18n("nothing"));
+ }
+ if (tmpy == 0) {
+@@ -121,11 +116,11 @@ void titrationCalculator::plot()
+ //now we have to solve the system of equations NOTE:yvalue contains the equation of Y-axis variable
+ //we iterates the process until you have an equation in one only unknown variable or a numeric expression
+ mreporto = solve(yvalue);
+- while (end == 0 or lettere == 1) {
++ while (end == 0 || lettere == 1) {
+ QByteArray ba = mreporto.toLatin1();
+ char *tmreport = ba.data();
+ ++iter;
+- if (end == 1 or lettere == 0) {
++ if (end == 1 || lettere == 0) {
+ break;
+ }
+ if (iter > 100) {
+@@ -273,13 +268,13 @@ QString titrationCalculator::solve(char *yvalue)
+ QString tempyval;
+ QString ptem;
+ for (int i = 0; strlen(yvalue) + 1; ++i) {
+- if (!(yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',')) {
++ if (!(yvalue[i]=='q' || yvalue[i]=='w' || yvalue[i]=='e' || yvalue[i]=='r' || yvalue[i]=='t' || yvalue[i]=='y' || yvalue[i]=='u' || yvalue[i]=='i' || yvalue[i]=='o' || yvalue[i]=='p' || yvalue[i]=='a' || yvalue[i]=='s' || yvalue[i]=='d' || yvalue[i]=='f' || yvalue[i]=='g' || yvalue[i]=='h' || yvalue[i]=='j' || yvalue[i]=='k' || yvalue[i]=='l' || yvalue[i]=='z' || yvalue[i]=='x' || yvalue[i]=='c' || yvalue[i]=='v' || yvalue[i]=='b' || yvalue[i]=='n' || yvalue[i]=='m' || yvalue[i]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='Q' || yvalue[i]=='W' || yvalue[i]=='E' || yvalue[i]=='R' || yvalue[i]=='T' || yvalue[i]=='Y' || yvalue[i]=='U' || yvalue[i]=='I' || yvalue[i]=='O' || yvalue[i]=='P' || yvalue[i]=='A' || yvalue[i]=='S' || yvalue[i]=='D' || yvalue[i]=='F' || yvalue[i]=='G' || yvalue[i]=='H' || yvalue[i]=='J' || yvalue[i]=='K' || yvalue[i]=='L' || yvalue[i]=='Z' || yvalue[i]=='X' || yvalue[i]=='C' || yvalue[i]=='V' || yvalue[i]=='B' || yvalue[i]=='N' || yvalue[i]=='M' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',')) {
+ break; //if current value is not a permitted value, this means that something is wrong
+ }
+- if (yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M' or yvalue[i]=='.' or yvalue[i]==',') {
++ if (yvalue[i]=='q' || yvalue[i]=='w' || yvalue[i]=='e' || yvalue[i]=='r' || yvalue[i]=='t' || yvalue[i]=='y' || yvalue[i]=='u' || yvalue[i]=='i' || yvalue[i]=='o' || yvalue[i]=='p' || yvalue[i]=='a' || yvalue[i]=='s' || yvalue[i]=='d' || yvalue[i]=='f' || yvalue[i]=='g' || yvalue[i]=='h' || yvalue[i]=='j' || yvalue[i]=='k' || yvalue[i]=='l' || yvalue[i]=='z' || yvalue[i]=='x' || yvalue[i]=='c' || yvalue[i]=='v' || yvalue[i]=='b' || yvalue[i]=='n' || yvalue[i]=='m' || yvalue[i]=='Q' || yvalue[i]=='W' || yvalue[i]=='E' || yvalue[i]=='R' || yvalue[i]=='T' || yvalue[i]=='Y' || yvalue[i]=='U' || yvalue[i]=='I' || yvalue[i]=='O' || yvalue[i]=='P' || yvalue[i]=='A' || yvalue[i]=='S' || yvalue[i]=='D' || yvalue[i]=='F' || yvalue[i]=='G' || yvalue[i]=='H' || yvalue[i]=='J' || yvalue[i]=='K' || yvalue[i]=='L' || yvalue[i]=='Z' || yvalue[i]=='X' || yvalue[i]=='C' || yvalue[i]=='V' || yvalue[i]=='B' || yvalue[i]=='N' || yvalue[i]=='M' || yvalue[i]=='.' || yvalue[i]==',') {
+ lettere = 1; //if lettere == 0 then the equation contains only mnumbers
+ }
+- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',') {
++ if (yvalue[i]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',') {
+ tempyval = tempyval + QString(yvalue[i]);
+ } else {
+ tempy = tempy + QString(yvalue[i]);
+@@ -302,7 +297,7 @@ QString titrationCalculator::solve(char *yvalue)
+ end = 1;
+ }
+ if (tempy!=uid.xaxis->text()) {
+- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',') {
++ if (yvalue[i]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',') {
+ //actually nothing
+ } else {
+ end = 0;
+@@ -335,13 +330,13 @@ QString titrationCalculator::solvex(char *yvalue, QString dnum) {
+ QString tempyval;
+ tempy = "";
+ for (int i = 0; strlen(yvalue) + 1; ++i) {
+- if (!(yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',')) {
++ if (!(yvalue[i]=='q' || yvalue[i]=='w' || yvalue[i]=='e' || yvalue[i]=='r' || yvalue[i]=='t' || yvalue[i]=='y' || yvalue[i]=='u' || yvalue[i]=='i' || yvalue[i]=='o' || yvalue[i]=='p' || yvalue[i]=='a' || yvalue[i]=='s' || yvalue[i]=='d' || yvalue[i]=='f' || yvalue[i]=='g' || yvalue[i]=='h' || yvalue[i]=='j' || yvalue[i]=='k' || yvalue[i]=='l' || yvalue[i]=='z' || yvalue[i]=='x' || yvalue[i]=='c' || yvalue[i]=='v' || yvalue[i]=='b' || yvalue[i]=='n' || yvalue[i]=='m' || yvalue[i]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='Q' || yvalue[i]=='W' || yvalue[i]=='E' || yvalue[i]=='R' || yvalue[i]=='T' || yvalue[i]=='Y' || yvalue[i]=='U' || yvalue[i]=='I' || yvalue[i]=='O' || yvalue[i]=='P' || yvalue[i]=='A' || yvalue[i]=='S' || yvalue[i]=='D' || yvalue[i]=='F' || yvalue[i]=='G' || yvalue[i]=='H' || yvalue[i]=='J' || yvalue[i]=='K' || yvalue[i]=='L' || yvalue[i]=='Z' || yvalue[i]=='X' || yvalue[i]=='C' || yvalue[i]=='V' || yvalue[i]=='B' || yvalue[i]=='N' || yvalue[i]=='M' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',')) {
+ break; //if current value is not a permitted value, this means that something is wrong
+ }
+- if (yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='Q' or yvalue[i]=='W' or yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M' or yvalue[i]=='.' or yvalue[i]==',') {
++ if (yvalue[i]=='q' || yvalue[i]=='w' || yvalue[i]=='e' || yvalue[i]=='r' || yvalue[i]=='t' || yvalue[i]=='y' || yvalue[i]=='u' || yvalue[i]=='i' || yvalue[i]=='o' || yvalue[i]=='p' || yvalue[i]=='a' || yvalue[i]=='s' || yvalue[i]=='d' || yvalue[i]=='f' || yvalue[i]=='g' || yvalue[i]=='h' || yvalue[i]=='j' || yvalue[i]=='k' || yvalue[i]=='l' || yvalue[i]=='z' || yvalue[i]=='x' || yvalue[i]=='c' || yvalue[i]=='v' || yvalue[i]=='b' || yvalue[i]=='n' || yvalue[i]=='m' || yvalue[i]=='Q' || yvalue[i]=='W' || yvalue[i]=='E' || yvalue[i]=='R' || yvalue[i]=='T' || yvalue[i]=='Y' || yvalue[i]=='U' || yvalue[i]=='I' || yvalue[i]=='O' || yvalue[i]=='P' || yvalue[i]=='A' || yvalue[i]=='S' || yvalue[i]=='D' || yvalue[i]=='F' || yvalue[i]=='G' || yvalue[i]=='H' || yvalue[i]=='J' || yvalue[i]=='K' || yvalue[i]=='L' || yvalue[i]=='Z' || yvalue[i]=='X' || yvalue[i]=='C' || yvalue[i]=='V' || yvalue[i]=='B' || yvalue[i]=='N' || yvalue[i]=='M' || yvalue[i]=='.' || yvalue[i]==',') {
+ tempy = tempy + yvalue[i]; //if lettere == 0 then the equation contains only mnumbers
+ }
+- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',') {
++ if (yvalue[i]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',') {
+ if (!tempyolda.isEmpty()) {
+ tempy = tempy + yvalue[i];
+ if (tempyolda == uid.xaxis->text()) {
+@@ -359,7 +354,7 @@ QString titrationCalculator::solvex(char *yvalue, QString dnum) {
+ tempyolda = tempyold;
+ } else {
+ tempyold = "";
+- if (((olda != 1) and (yvalue[i + 1] != '^')) or (yvalue[i] == '+' or yvalue[i] == '-' or yvalue[i] == '^' or yvalue[i] == '*' or yvalue[i] == '/' or yvalue[i] == '(' or yvalue[i] == ')')) {
++ if (((olda != 1) && (yvalue[i + 1] != '^')) || (yvalue[i] == '+' || yvalue[i] == '-' || yvalue[i] == '^' || yvalue[i] == '*' || yvalue[i] == '/' || yvalue[i] == '(' || yvalue[i] == ')')) {
+ tempyval = tempyval + QString(yvalue[i]);
+ }
+ }
+@@ -374,7 +369,7 @@ QString titrationCalculator::solvex(char *yvalue, QString dnum) {
+ tempyold = "";
+ olda = 1;
+ }
+- if ((tempy==uid.xaxis->text()) and (!tempyolda.isEmpty())) {
++ if ((tempy==uid.xaxis->text()) && (!tempyolda.isEmpty())) {
+ if (yvalue[i + 1] != '^') {
+ tempyval = tempyval + dnum;
+ }
+@@ -611,7 +606,7 @@ void titrationCalculator::on_actionOpen_triggered()
+ if (tmpchr != '|') {
+ tempyval = tempyval + tmpchr;
+ } else {
+- if ((tablea == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) {
++ if ((tablea == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) {
+ if ((i % 2) != 0) {
+ QTableWidgetItem *titemo = uid.tableWidget->item((i - 1) / 2, 1);
+ if (titemo) {
+@@ -626,7 +621,7 @@ void titrationCalculator::on_actionOpen_triggered()
+ ++i;
+ }
+
+- if ((tableb == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) {
++ if ((tableb == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) {
+ if ((i % 2) != 0) {
+ QTableWidgetItem *titemo = uid.tableWidget_2->item((i - 1) / 2, 1);
+ if (titemo) {
+@@ -641,13 +636,13 @@ void titrationCalculator::on_actionOpen_triggered()
+ }
+ ++i;
+ }
+- if ((xax == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) {
++ if ((xax == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) {
+ uid.xaxis->setText(tempyval);
+ }
+- if ((yax == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) {
++ if ((yax == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) {
+ uid.yaxis->setText(tempyval);
+ }
+- if ((notea == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) {
++ if ((notea == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) {
+ uid.note->setText(tempyval);
+ }
+
+--
+2.11.0
+
Index: science/kalzium/pkg-plist
===================================================================
--- science/kalzium/pkg-plist
+++ science/kalzium/pkg-plist
@@ -1,370 +1,23 @@
bin/kalzium
-include/kde4/libkdeedu/chemicaldataobject.h
-include/kde4/libkdeedu/element.h
-include/kde4/libkdeedu/elementparser.h
-include/kde4/libkdeedu/isotope.h
-include/kde4/libkdeedu/isotopeparser.h
-include/kde4/libkdeedu/libkdeedu_science_export.h
-include/kde4/libkdeedu/moleculeparser.h
-include/kde4/libkdeedu/parser.h
-include/kde4/libkdeedu/psetables.h
-include/kde4/libkdeedu/spectrum.h
-include/kde4/libkdeedu/spectrumparser.h
-lib/kde4/concentrationCalculator.so
-lib/kde4/gasCalculator.so
-lib/kde4/nuclearCalculator.so
-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%%
+etc/xdg/kalzium.knsrc
+include/libkdeedu/chemicaldataobject.h
+include/libkdeedu/element.h
+include/libkdeedu/elementparser.h
+include/libkdeedu/isotope.h
+include/libkdeedu/isotopeparser.h
+include/libkdeedu/libkdeedu_science_export.h
+include/libkdeedu/moleculeparser.h
+include/libkdeedu/parser.h
+include/libkdeedu/psetables.h
+include/libkdeedu/spectrum.h
+include/libkdeedu/spectrumparser.h
lib/libscience.so
-lib/libscience.so.4
-lib/libscience.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libscience.so.5
+lib/libscience.so.5.0.0
man/man1/kalzium.1.gz
-share/appdata/kalzium.appdata.xml
-share/applications/kde4/kalzium.desktop
-share/applications/kde4/kalzium_cml.desktop
-share/apps/desktoptheme/default/widgets/chalkboard.svg
-share/apps/kalzium/data/bg.jpg
-share/apps/kalzium/data/hazardsymbols/hazard_C.png
-share/apps/kalzium/data/hazardsymbols/hazard_E.png
-share/apps/kalzium/data/hazardsymbols/hazard_F.png
-share/apps/kalzium/data/hazardsymbols/hazard_N.png
-share/apps/kalzium/data/hazardsymbols/hazard_O.png
-share/apps/kalzium/data/hazardsymbols/hazard_T.png
-share/apps/kalzium/data/hazardsymbols/hazard_X.png
-share/apps/kalzium/data/htmlview/abundance.png
-share/apps/kalzium/data/htmlview/boilingpoint.png
-share/apps/kalzium/data/htmlview/book.png
-share/apps/kalzium/data/htmlview/characteristics.png
-share/apps/kalzium/data/htmlview/discovery.png
-share/apps/kalzium/data/htmlview/electronaffinity.png
-share/apps/kalzium/data/htmlview/header.png
-share/apps/kalzium/data/htmlview/icons.svg
-share/apps/kalzium/data/htmlview/ionization.png
-share/apps/kalzium/data/htmlview/mass.png
-share/apps/kalzium/data/htmlview/meltingpoint.png
-share/apps/kalzium/data/htmlview/radius.png
-share/apps/kalzium/data/htmlview/structure.png
-share/apps/kalzium/data/htmlview/style.css
-share/apps/kalzium/data/iconsets/school/1.svg
-share/apps/kalzium/data/iconsets/school/10.svg
-share/apps/kalzium/data/iconsets/school/100.svg
-share/apps/kalzium/data/iconsets/school/101.svg
-share/apps/kalzium/data/iconsets/school/102.svg
-share/apps/kalzium/data/iconsets/school/103.svg
-share/apps/kalzium/data/iconsets/school/104.svg
-share/apps/kalzium/data/iconsets/school/105.svg
-share/apps/kalzium/data/iconsets/school/106.svg
-share/apps/kalzium/data/iconsets/school/107.svg
-share/apps/kalzium/data/iconsets/school/108.svg
-share/apps/kalzium/data/iconsets/school/109.svg
-share/apps/kalzium/data/iconsets/school/11.svg
-share/apps/kalzium/data/iconsets/school/110.svg
-share/apps/kalzium/data/iconsets/school/111.svg
-share/apps/kalzium/data/iconsets/school/112.svg
-share/apps/kalzium/data/iconsets/school/113.svg
-share/apps/kalzium/data/iconsets/school/114.svg
-share/apps/kalzium/data/iconsets/school/115.svg
-share/apps/kalzium/data/iconsets/school/116.svg
-share/apps/kalzium/data/iconsets/school/117.svg
-share/apps/kalzium/data/iconsets/school/118.svg
-share/apps/kalzium/data/iconsets/school/12.svg
-share/apps/kalzium/data/iconsets/school/13.svg
-share/apps/kalzium/data/iconsets/school/14.svg
-share/apps/kalzium/data/iconsets/school/15.svg
-share/apps/kalzium/data/iconsets/school/16.svg
-share/apps/kalzium/data/iconsets/school/17.svg
-share/apps/kalzium/data/iconsets/school/18.svg
-share/apps/kalzium/data/iconsets/school/19.svg
-share/apps/kalzium/data/iconsets/school/2.svg
-share/apps/kalzium/data/iconsets/school/20.svg
-share/apps/kalzium/data/iconsets/school/21.svg
-share/apps/kalzium/data/iconsets/school/22.svg
-share/apps/kalzium/data/iconsets/school/23.svg
-share/apps/kalzium/data/iconsets/school/24.svg
-share/apps/kalzium/data/iconsets/school/25.svg
-share/apps/kalzium/data/iconsets/school/26.svg
-share/apps/kalzium/data/iconsets/school/27.svg
-share/apps/kalzium/data/iconsets/school/28.svg
-share/apps/kalzium/data/iconsets/school/29.svg
-share/apps/kalzium/data/iconsets/school/3.svg
-share/apps/kalzium/data/iconsets/school/30.svg
-share/apps/kalzium/data/iconsets/school/31.svg
-share/apps/kalzium/data/iconsets/school/32.svg
-share/apps/kalzium/data/iconsets/school/33.svg
-share/apps/kalzium/data/iconsets/school/34.svg
-share/apps/kalzium/data/iconsets/school/35.svg
-share/apps/kalzium/data/iconsets/school/36.svg
-share/apps/kalzium/data/iconsets/school/37.svg
-share/apps/kalzium/data/iconsets/school/38.svg
-share/apps/kalzium/data/iconsets/school/39.svg
-share/apps/kalzium/data/iconsets/school/4.svg
-share/apps/kalzium/data/iconsets/school/40.svg
-share/apps/kalzium/data/iconsets/school/41.svg
-share/apps/kalzium/data/iconsets/school/42.svg
-share/apps/kalzium/data/iconsets/school/43.svg
-share/apps/kalzium/data/iconsets/school/44.svg
-share/apps/kalzium/data/iconsets/school/45.svg
-share/apps/kalzium/data/iconsets/school/46.svg
-share/apps/kalzium/data/iconsets/school/47.svg
-share/apps/kalzium/data/iconsets/school/48.svg
-share/apps/kalzium/data/iconsets/school/49.svg
-share/apps/kalzium/data/iconsets/school/5.svg
-share/apps/kalzium/data/iconsets/school/50.svg
-share/apps/kalzium/data/iconsets/school/51.svg
-share/apps/kalzium/data/iconsets/school/52.svg
-share/apps/kalzium/data/iconsets/school/53.svg
-share/apps/kalzium/data/iconsets/school/54.svg
-share/apps/kalzium/data/iconsets/school/55.svg
-share/apps/kalzium/data/iconsets/school/56.svg
-share/apps/kalzium/data/iconsets/school/57.svg
-share/apps/kalzium/data/iconsets/school/58.svg
-share/apps/kalzium/data/iconsets/school/59.svg
-share/apps/kalzium/data/iconsets/school/6.svg
-share/apps/kalzium/data/iconsets/school/60.svg
-share/apps/kalzium/data/iconsets/school/61.svg
-share/apps/kalzium/data/iconsets/school/62.svg
-share/apps/kalzium/data/iconsets/school/63.svg
-share/apps/kalzium/data/iconsets/school/64.svg
-share/apps/kalzium/data/iconsets/school/65.svg
-share/apps/kalzium/data/iconsets/school/66.svg
-share/apps/kalzium/data/iconsets/school/67.svg
-share/apps/kalzium/data/iconsets/school/68.svg
-share/apps/kalzium/data/iconsets/school/69.svg
-share/apps/kalzium/data/iconsets/school/7.svg
-share/apps/kalzium/data/iconsets/school/70.svg
-share/apps/kalzium/data/iconsets/school/71.svg
-share/apps/kalzium/data/iconsets/school/72.svg
-share/apps/kalzium/data/iconsets/school/73.svg
-share/apps/kalzium/data/iconsets/school/74.svg
-share/apps/kalzium/data/iconsets/school/75.svg
-share/apps/kalzium/data/iconsets/school/76.svg
-share/apps/kalzium/data/iconsets/school/77.svg
-share/apps/kalzium/data/iconsets/school/78.svg
-share/apps/kalzium/data/iconsets/school/79.svg
-share/apps/kalzium/data/iconsets/school/8.svg
-share/apps/kalzium/data/iconsets/school/80.svg
-share/apps/kalzium/data/iconsets/school/81.svg
-share/apps/kalzium/data/iconsets/school/82.svg
-share/apps/kalzium/data/iconsets/school/83.svg
-share/apps/kalzium/data/iconsets/school/84.svg
-share/apps/kalzium/data/iconsets/school/85.svg
-share/apps/kalzium/data/iconsets/school/86.svg
-share/apps/kalzium/data/iconsets/school/87.svg
-share/apps/kalzium/data/iconsets/school/88.svg
-share/apps/kalzium/data/iconsets/school/89.svg
-share/apps/kalzium/data/iconsets/school/9.svg
-share/apps/kalzium/data/iconsets/school/90.svg
-share/apps/kalzium/data/iconsets/school/91.svg
-share/apps/kalzium/data/iconsets/school/92.svg
-share/apps/kalzium/data/iconsets/school/93.svg
-share/apps/kalzium/data/iconsets/school/94.svg
-share/apps/kalzium/data/iconsets/school/95.svg
-share/apps/kalzium/data/iconsets/school/96.svg
-share/apps/kalzium/data/iconsets/school/97.svg
-share/apps/kalzium/data/iconsets/school/98.svg
-share/apps/kalzium/data/iconsets/school/99.svg
-share/apps/kalzium/data/iconsets/school/iconinformation.txt
-share/apps/kalzium/data/knowledge.xml
-share/apps/kalzium/data/latticeicons/cf.svgz
-share/apps/kalzium/data/latticeicons/ci.svgz
-share/apps/kalzium/data/latticeicons/cp.svgz
-share/apps/kalzium/data/latticeicons/hp.svgz
-share/apps/kalzium/data/latticeicons/hr.svgz
-share/apps/kalzium/data/latticeicons/mp.svgz
-share/apps/kalzium/data/latticeicons/op.svgz
-share/apps/kalzium/data/latticeicons/tp.svgz
-share/apps/kalzium/data/maps/de.png
-share/apps/kalzium/data/maps/dk.png
-share/apps/kalzium/data/maps/es.png
-share/apps/kalzium/data/maps/fi.png
-share/apps/kalzium/data/maps/fr.png
-share/apps/kalzium/data/maps/it.png
-share/apps/kalzium/data/maps/ru.png
-share/apps/kalzium/data/maps/ruus.png
-share/apps/kalzium/data/maps/se.png
-share/apps/kalzium/data/maps/uk.png
-share/apps/kalzium/data/maps/ukfr.png
-share/apps/kalzium/data/maps/ukse.png
-share/apps/kalzium/data/maps/us.png
-share/apps/kalzium/data/molecules/2-aminoethanol.cml
-share/apps/kalzium/data/molecules/2-thioethanol.cml
-share/apps/kalzium/data/molecules/2_2_2-trifluoroethanol.cml
-share/apps/kalzium/data/molecules/but-2-yne-1_4-diol.cml
-share/apps/kalzium/data/molecules/butane.cml
-share/apps/kalzium/data/molecules/carbon_dioxide.cml
-share/apps/kalzium/data/molecules/carbon_monoxide.cml
-share/apps/kalzium/data/molecules/ethane-1_2-diol.cml
-share/apps/kalzium/data/molecules/ethane.cml
-share/apps/kalzium/data/molecules/ethanol.cml
-share/apps/kalzium/data/molecules/methane.cml
-share/apps/kalzium/data/molecules/methanol.cml
-share/apps/kalzium/data/molecules/porphyrin.cml
-share/apps/kalzium/data/molecules/propan-1-ol.cml
-share/apps/kalzium/data/molecules/propan-2-ol.cml
-share/apps/kalzium/data/molecules/propane.cml
-share/apps/kalzium/data/molecules/thiophene.cml
-share/apps/kalzium/data/molecules/water.cml
-share/apps/kalzium/data/toolpics/abzug.jpg
-share/apps/kalzium/data/toolpics/becherglas.jpg
-share/apps/kalzium/data/toolpics/brechungsmesser.jpg
-share/apps/kalzium/data/toolpics/brenner.jpg
-share/apps/kalzium/data/toolpics/destillierbruecke.jpg
-share/apps/kalzium/data/toolpics/dsc.jpg
-share/apps/kalzium/data/toolpics/erlenmeyerkolben.jpg
-share/apps/kalzium/data/toolpics/exikator.jpg
-share/apps/kalzium/data/toolpics/halter.jpg
-share/apps/kalzium/data/toolpics/heizplatte.jpg
-share/apps/kalzium/data/toolpics/hplc.jpg
-share/apps/kalzium/data/toolpics/kolbenprober.png
-share/apps/kalzium/data/toolpics/korkring.jpg
-share/apps/kalzium/data/toolpics/messzylinder.jpg
-share/apps/kalzium/data/toolpics/moerser.jpg
-share/apps/kalzium/data/toolpics/phpapier.jpg
-share/apps/kalzium/data/toolpics/pileusball.jpg
-share/apps/kalzium/data/toolpics/pipette.jpg
-share/apps/kalzium/data/toolpics/rg-halter.jpg
-share/apps/kalzium/data/toolpics/rg-staender.jpg
-share/apps/kalzium/data/toolpics/rg.jpg
-share/apps/kalzium/data/toolpics/rotationsverdampfer.jpg
-share/apps/kalzium/data/toolpics/rueckflusskuehler.jpg
-share/apps/kalzium/data/toolpics/ruehrfisch.jpg
-share/apps/kalzium/data/toolpics/rundkolben.jpg
-share/apps/kalzium/data/toolpics/scheidetrichter.jpg
-share/apps/kalzium/data/toolpics/schutzbrille.jpg
-share/apps/kalzium/data/toolpics/spatel.jpg
-share/apps/kalzium/data/toolpics/spritzflasche.jpg
-share/apps/kalzium/data/toolpics/thermometer.jpg
-share/apps/kalzium/data/toolpics/thermometer2.jpg
-share/apps/kalzium/data/toolpics/tonschale.jpg
-share/apps/kalzium/data/toolpics/trichter.jpg
-share/apps/kalzium/data/toolpics/trockenrohr.jpg
-share/apps/kalzium/data/toolpics/tropftrichter.jpg
-share/apps/kalzium/data/toolpics/uhrglas.jpg
-share/apps/kalzium/data/toolpics/verteiler.jpg
-share/apps/kalzium/data/toolpics/vollpipette.jpg
-share/apps/kalzium/data/toolpics/waage.jpg
-share/apps/kalzium/data/toolpics/wasserstrahlpumpe.jpg
-share/apps/kalzium/data/tools.xml
-share/apps/kalzium/icons/hicolor/16x16/actions/calculate.png
-share/apps/kalzium/icons/hicolor/16x16/actions/chemical.png
-share/apps/kalzium/icons/hicolor/16x16/actions/elempic.png
-share/apps/kalzium/icons/hicolor/16x16/actions/energies.png
-share/apps/kalzium/icons/hicolor/16x16/actions/eqchem.png
-share/apps/kalzium/icons/hicolor/16x16/actions/glossary.png
-share/apps/kalzium/icons/hicolor/16x16/actions/isotopemap.png
-share/apps/kalzium/icons/hicolor/16x16/actions/kalzium_molviewer.png
-share/apps/kalzium/icons/hicolor/16x16/actions/kalzium_rs.png
-share/apps/kalzium/icons/hicolor/16x16/actions/kalzium_tables.png
-share/apps/kalzium/icons/hicolor/16x16/actions/legend.png
-share/apps/kalzium/icons/hicolor/16x16/actions/misc.png
-share/apps/kalzium/icons/hicolor/16x16/actions/numbers.png
-share/apps/kalzium/icons/hicolor/16x16/actions/orbits.png
-share/apps/kalzium/icons/hicolor/16x16/actions/overview.png
-share/apps/kalzium/icons/hicolor/16x16/actions/plot.png
-share/apps/kalzium/icons/hicolor/16x16/actions/sidebar.png
-share/apps/kalzium/icons/hicolor/16x16/actions/spectrum.png
-share/apps/kalzium/icons/hicolor/16x16/actions/statematter.png
-share/apps/kalzium/icons/hicolor/16x16/actions/timeline.png
-share/apps/kalzium/icons/hicolor/16x16/actions/tooltip.png
-share/apps/kalzium/icons/hicolor/22x22/actions/calculate.png
-share/apps/kalzium/icons/hicolor/22x22/actions/chemical.png
-share/apps/kalzium/icons/hicolor/22x22/actions/elempic.png
-share/apps/kalzium/icons/hicolor/22x22/actions/energies.png
-share/apps/kalzium/icons/hicolor/22x22/actions/eqchem.png
-share/apps/kalzium/icons/hicolor/22x22/actions/glossary.png
-share/apps/kalzium/icons/hicolor/22x22/actions/isotopemap.png
-share/apps/kalzium/icons/hicolor/22x22/actions/kalzium_molviewer.png
-share/apps/kalzium/icons/hicolor/22x22/actions/kalzium_rs.png
-share/apps/kalzium/icons/hicolor/22x22/actions/kalzium_tables.png
-share/apps/kalzium/icons/hicolor/22x22/actions/legend.png
-share/apps/kalzium/icons/hicolor/22x22/actions/numbers.png
-share/apps/kalzium/icons/hicolor/22x22/actions/orbits.png
-share/apps/kalzium/icons/hicolor/22x22/actions/overview.png
-share/apps/kalzium/icons/hicolor/22x22/actions/plot.png
-share/apps/kalzium/icons/hicolor/22x22/actions/sidebar.png
-share/apps/kalzium/icons/hicolor/22x22/actions/spectrum.png
-share/apps/kalzium/icons/hicolor/22x22/actions/statematter.png
-share/apps/kalzium/icons/hicolor/22x22/actions/timeline.png
-share/apps/kalzium/icons/hicolor/22x22/actions/tooltip.png
-share/apps/kalzium/icons/hicolor/32x32/actions/calculate.png
-share/apps/kalzium/icons/hicolor/32x32/actions/chemical.png
-share/apps/kalzium/icons/hicolor/32x32/actions/elempic.png
-share/apps/kalzium/icons/hicolor/32x32/actions/energies.png
-share/apps/kalzium/icons/hicolor/32x32/actions/eqchem.png
-share/apps/kalzium/icons/hicolor/32x32/actions/glossary.png
-share/apps/kalzium/icons/hicolor/32x32/actions/isotopemap.png
-share/apps/kalzium/icons/hicolor/32x32/actions/kalzium_molviewer.png
-share/apps/kalzium/icons/hicolor/32x32/actions/kalzium_rs.png
-share/apps/kalzium/icons/hicolor/32x32/actions/kalzium_tables.png
-share/apps/kalzium/icons/hicolor/32x32/actions/legend.png
-share/apps/kalzium/icons/hicolor/32x32/actions/misc.png
-share/apps/kalzium/icons/hicolor/32x32/actions/numbers.png
-share/apps/kalzium/icons/hicolor/32x32/actions/orbits.png
-share/apps/kalzium/icons/hicolor/32x32/actions/overview.png
-share/apps/kalzium/icons/hicolor/32x32/actions/plot.png
-share/apps/kalzium/icons/hicolor/32x32/actions/sidebar.png
-share/apps/kalzium/icons/hicolor/32x32/actions/spectrum.png
-share/apps/kalzium/icons/hicolor/32x32/actions/statematter.png
-share/apps/kalzium/icons/hicolor/32x32/actions/timeline.png
-share/apps/kalzium/icons/hicolor/32x32/actions/tooltip.png
-share/apps/kalzium/icons/hicolor/48x48/actions/calculate.png
-share/apps/kalzium/icons/hicolor/48x48/actions/chemical.png
-share/apps/kalzium/icons/hicolor/48x48/actions/energies.png
-share/apps/kalzium/icons/hicolor/48x48/actions/eqchem.png
-share/apps/kalzium/icons/hicolor/48x48/actions/glossary.png
-share/apps/kalzium/icons/hicolor/48x48/actions/isotopemap.png
-share/apps/kalzium/icons/hicolor/48x48/actions/kalzium_molviewer.png
-share/apps/kalzium/icons/hicolor/48x48/actions/kalzium_rs.png
-share/apps/kalzium/icons/hicolor/48x48/actions/kalzium_tables.png
-share/apps/kalzium/icons/hicolor/48x48/actions/legend.png
-share/apps/kalzium/icons/hicolor/48x48/actions/misc.png
-share/apps/kalzium/icons/hicolor/48x48/actions/numbers.png
-share/apps/kalzium/icons/hicolor/48x48/actions/orbits.png
-share/apps/kalzium/icons/hicolor/48x48/actions/overview.png
-share/apps/kalzium/icons/hicolor/48x48/actions/plot.png
-share/apps/kalzium/icons/hicolor/48x48/actions/sidebar.png
-share/apps/kalzium/icons/hicolor/48x48/actions/spectrum.png
-share/apps/kalzium/icons/hicolor/48x48/actions/statematter.png
-share/apps/kalzium/icons/hicolor/48x48/actions/timeline.png
-share/apps/kalzium/icons/hicolor/48x48/actions/tooltip.png
-share/apps/kalzium/icons/hicolor/64x64/actions/kalzium_molviewer.png
-share/apps/kalzium/icons/hicolor/64x64/actions/kalzium_rs.png
-share/apps/kalzium/icons/hicolor/64x64/actions/kalzium_tables.png
-share/apps/kalzium/icons/hicolor/64x64/actions/numbers.png
-share/apps/kalzium/icons/hicolor/scalable/actions/calculate.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/chemical.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/elempic.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/energies.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/eqchem.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/glossary.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/isotopemap.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/kalzium_molviewer.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/kalzium_rs.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/kalzium_tables.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/misc.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/numbers.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/orbits.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/overview.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/plot.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/sidebar.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/spectrum.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/statematter.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/timeline.svgz
-share/apps/kalzium/icons/hicolor/scalable/actions/tooltip.svgz
-share/apps/kalzium/kalziumui.rc
-share/apps/kalzium/qml/detailview.qml
-share/apps/libkdeedu/data/elements.xml
-share/apps/libkdeedu/data/isotopes.xml
-share/apps/libkdeedu/data/spectra.xml
-share/apps/libkdeedu/data/symbols.csv
-share/apps/libkdeedu/data/symbols2.csv
+share/applications/org.kde.kalzium.desktop
+share/applications/org.kde.kalzium_cml.desktop
share/config.kcfg/kalzium.kcfg
-share/config/kalzium.knsrc
-share/doc/HTML/en/kalzium/common
share/doc/HTML/en/kalzium/gradient.png
share/doc/HTML/en/kalzium/index.cache.bz2
share/doc/HTML/en/kalzium/index.docbook
@@ -374,7 +27,6 @@
share/doc/HTML/en/kalzium/infodialog_isotopes.png
share/doc/HTML/en/kalzium/infodialog_misc.png
share/doc/HTML/en/kalzium/infodialog_spectrum.png
-share/doc/HTML/en/kalzium/man-kalzium.1.docbook
share/doc/HTML/en/kalzium/quick-1.png
share/doc/HTML/en/kalzium/quick-3.png
share/doc/HTML/en/kalzium/quick-4.png
@@ -389,7 +41,6 @@
share/doc/HTML/en/kalzium/screenshot-tables.png
share/doc/HTML/en/kalzium/screenshot1.png
share/doc/HTML/en/kalzium/screenshot2.png
-share/doc/HTML/en/kalzium/screenshot5.png
share/doc/HTML/en/kalzium/screenshot6.png
share/doc/HTML/en/kalzium/screenshot7.png
share/doc/HTML/en/kalzium/screenshotnuclidboard.png
@@ -405,9 +56,339 @@
share/icons/hicolor/48x48/apps/kalzium.png
share/icons/hicolor/64x64/apps/kalzium.png
share/icons/hicolor/scalable/apps/kalzium.svgz
-share/kde4/services/concentrationCalculator.desktop
-share/kde4/services/gasCalculator.desktop
-share/kde4/services/nuclearCalculator.desktop
-share/kde4/services/plasma-applet-Molmasscalculator.desktop
-share/kde4/services/plasma-dataengine-kalzium.desktop
-share/kde4/services/plasma_didyouknow.desktop
+%%DATADIR%%/data/bg.jpg
+%%DATADIR%%/data/hazardsymbols/hazard_C.png
+%%DATADIR%%/data/hazardsymbols/hazard_E.png
+%%DATADIR%%/data/hazardsymbols/hazard_F.png
+%%DATADIR%%/data/hazardsymbols/hazard_N.png
+%%DATADIR%%/data/hazardsymbols/hazard_O.png
+%%DATADIR%%/data/hazardsymbols/hazard_T.png
+%%DATADIR%%/data/hazardsymbols/hazard_X.png
+%%DATADIR%%/data/htmlview/abundance.png
+%%DATADIR%%/data/htmlview/boilingpoint.png
+%%DATADIR%%/data/htmlview/book.png
+%%DATADIR%%/data/htmlview/characteristics.png
+%%DATADIR%%/data/htmlview/discovery.png
+%%DATADIR%%/data/htmlview/electronaffinity.png
+%%DATADIR%%/data/htmlview/header.png
+%%DATADIR%%/data/htmlview/icons.svg
+%%DATADIR%%/data/htmlview/ionization.png
+%%DATADIR%%/data/htmlview/mass.png
+%%DATADIR%%/data/htmlview/meltingpoint.png
+%%DATADIR%%/data/htmlview/radius.png
+%%DATADIR%%/data/htmlview/structure.png
+%%DATADIR%%/data/htmlview/style.css
+%%DATADIR%%/data/iconsets/school/1.svg
+%%DATADIR%%/data/iconsets/school/10.svg
+%%DATADIR%%/data/iconsets/school/100.svg
+%%DATADIR%%/data/iconsets/school/101.svg
+%%DATADIR%%/data/iconsets/school/102.svg
+%%DATADIR%%/data/iconsets/school/103.svg
+%%DATADIR%%/data/iconsets/school/104.svg
+%%DATADIR%%/data/iconsets/school/105.svg
+%%DATADIR%%/data/iconsets/school/106.svg
+%%DATADIR%%/data/iconsets/school/107.svg
+%%DATADIR%%/data/iconsets/school/108.svg
+%%DATADIR%%/data/iconsets/school/109.svg
+%%DATADIR%%/data/iconsets/school/11.svg
+%%DATADIR%%/data/iconsets/school/110.svg
+%%DATADIR%%/data/iconsets/school/111.svg
+%%DATADIR%%/data/iconsets/school/112.svg
+%%DATADIR%%/data/iconsets/school/113.svg
+%%DATADIR%%/data/iconsets/school/114.svg
+%%DATADIR%%/data/iconsets/school/115.svg
+%%DATADIR%%/data/iconsets/school/116.svg
+%%DATADIR%%/data/iconsets/school/117.svg
+%%DATADIR%%/data/iconsets/school/118.svg
+%%DATADIR%%/data/iconsets/school/12.svg
+%%DATADIR%%/data/iconsets/school/13.svg
+%%DATADIR%%/data/iconsets/school/14.svg
+%%DATADIR%%/data/iconsets/school/15.svg
+%%DATADIR%%/data/iconsets/school/16.svg
+%%DATADIR%%/data/iconsets/school/17.svg
+%%DATADIR%%/data/iconsets/school/18.svg
+%%DATADIR%%/data/iconsets/school/19.svg
+%%DATADIR%%/data/iconsets/school/2.svg
+%%DATADIR%%/data/iconsets/school/20.svg
+%%DATADIR%%/data/iconsets/school/21.svg
+%%DATADIR%%/data/iconsets/school/22.svg
+%%DATADIR%%/data/iconsets/school/23.svg
+%%DATADIR%%/data/iconsets/school/24.svg
+%%DATADIR%%/data/iconsets/school/25.svg
+%%DATADIR%%/data/iconsets/school/26.svg
+%%DATADIR%%/data/iconsets/school/27.svg
+%%DATADIR%%/data/iconsets/school/28.svg
+%%DATADIR%%/data/iconsets/school/29.svg
+%%DATADIR%%/data/iconsets/school/3.svg
+%%DATADIR%%/data/iconsets/school/30.svg
+%%DATADIR%%/data/iconsets/school/31.svg
+%%DATADIR%%/data/iconsets/school/32.svg
+%%DATADIR%%/data/iconsets/school/33.svg
+%%DATADIR%%/data/iconsets/school/34.svg
+%%DATADIR%%/data/iconsets/school/35.svg
+%%DATADIR%%/data/iconsets/school/36.svg
+%%DATADIR%%/data/iconsets/school/37.svg
+%%DATADIR%%/data/iconsets/school/38.svg
+%%DATADIR%%/data/iconsets/school/39.svg
+%%DATADIR%%/data/iconsets/school/4.svg
+%%DATADIR%%/data/iconsets/school/40.svg
+%%DATADIR%%/data/iconsets/school/41.svg
+%%DATADIR%%/data/iconsets/school/42.svg
+%%DATADIR%%/data/iconsets/school/43.svg
+%%DATADIR%%/data/iconsets/school/44.svg
+%%DATADIR%%/data/iconsets/school/45.svg
+%%DATADIR%%/data/iconsets/school/46.svg
+%%DATADIR%%/data/iconsets/school/47.svg
+%%DATADIR%%/data/iconsets/school/48.svg
+%%DATADIR%%/data/iconsets/school/49.svg
+%%DATADIR%%/data/iconsets/school/5.svg
+%%DATADIR%%/data/iconsets/school/50.svg
+%%DATADIR%%/data/iconsets/school/51.svg
+%%DATADIR%%/data/iconsets/school/52.svg
+%%DATADIR%%/data/iconsets/school/53.svg
+%%DATADIR%%/data/iconsets/school/54.svg
+%%DATADIR%%/data/iconsets/school/55.svg
+%%DATADIR%%/data/iconsets/school/56.svg
+%%DATADIR%%/data/iconsets/school/57.svg
+%%DATADIR%%/data/iconsets/school/58.svg
+%%DATADIR%%/data/iconsets/school/59.svg
+%%DATADIR%%/data/iconsets/school/6.svg
+%%DATADIR%%/data/iconsets/school/60.svg
+%%DATADIR%%/data/iconsets/school/61.svg
+%%DATADIR%%/data/iconsets/school/62.svg
+%%DATADIR%%/data/iconsets/school/63.svg
+%%DATADIR%%/data/iconsets/school/64.svg
+%%DATADIR%%/data/iconsets/school/65.svg
+%%DATADIR%%/data/iconsets/school/66.svg
+%%DATADIR%%/data/iconsets/school/67.svg
+%%DATADIR%%/data/iconsets/school/68.svg
+%%DATADIR%%/data/iconsets/school/69.svg
+%%DATADIR%%/data/iconsets/school/7.svg
+%%DATADIR%%/data/iconsets/school/70.svg
+%%DATADIR%%/data/iconsets/school/71.svg
+%%DATADIR%%/data/iconsets/school/72.svg
+%%DATADIR%%/data/iconsets/school/73.svg
+%%DATADIR%%/data/iconsets/school/74.svg
+%%DATADIR%%/data/iconsets/school/75.svg
+%%DATADIR%%/data/iconsets/school/76.svg
+%%DATADIR%%/data/iconsets/school/77.svg
+%%DATADIR%%/data/iconsets/school/78.svg
+%%DATADIR%%/data/iconsets/school/79.svg
+%%DATADIR%%/data/iconsets/school/8.svg
+%%DATADIR%%/data/iconsets/school/80.svg
+%%DATADIR%%/data/iconsets/school/81.svg
+%%DATADIR%%/data/iconsets/school/82.svg
+%%DATADIR%%/data/iconsets/school/83.svg
+%%DATADIR%%/data/iconsets/school/84.svg
+%%DATADIR%%/data/iconsets/school/85.svg
+%%DATADIR%%/data/iconsets/school/86.svg
+%%DATADIR%%/data/iconsets/school/87.svg
+%%DATADIR%%/data/iconsets/school/88.svg
+%%DATADIR%%/data/iconsets/school/89.svg
+%%DATADIR%%/data/iconsets/school/9.svg
+%%DATADIR%%/data/iconsets/school/90.svg
+%%DATADIR%%/data/iconsets/school/91.svg
+%%DATADIR%%/data/iconsets/school/92.svg
+%%DATADIR%%/data/iconsets/school/93.svg
+%%DATADIR%%/data/iconsets/school/94.svg
+%%DATADIR%%/data/iconsets/school/95.svg
+%%DATADIR%%/data/iconsets/school/96.svg
+%%DATADIR%%/data/iconsets/school/97.svg
+%%DATADIR%%/data/iconsets/school/98.svg
+%%DATADIR%%/data/iconsets/school/99.svg
+%%DATADIR%%/data/iconsets/school/iconinformation.txt
+%%DATADIR%%/data/knowledge.xml
+%%DATADIR%%/data/latticeicons/cf.svgz
+%%DATADIR%%/data/latticeicons/ci.svgz
+%%DATADIR%%/data/latticeicons/cp.svgz
+%%DATADIR%%/data/latticeicons/hp.svgz
+%%DATADIR%%/data/latticeicons/hr.svgz
+%%DATADIR%%/data/latticeicons/mp.svgz
+%%DATADIR%%/data/latticeicons/op.svgz
+%%DATADIR%%/data/latticeicons/tp.svgz
+%%DATADIR%%/data/maps/de.png
+%%DATADIR%%/data/maps/dk.png
+%%DATADIR%%/data/maps/es.png
+%%DATADIR%%/data/maps/fi.png
+%%DATADIR%%/data/maps/fr.png
+%%DATADIR%%/data/maps/it.png
+%%DATADIR%%/data/maps/ru.png
+%%DATADIR%%/data/maps/ruus.png
+%%DATADIR%%/data/maps/se.png
+%%DATADIR%%/data/maps/uk.png
+%%DATADIR%%/data/maps/ukfr.png
+%%DATADIR%%/data/maps/ukse.png
+%%DATADIR%%/data/maps/us.png
+%%DATADIR%%/data/molecules/2-aminoethanol.cml
+%%DATADIR%%/data/molecules/2-thioethanol.cml
+%%DATADIR%%/data/molecules/2_2_2-trifluoroethanol.cml
+%%DATADIR%%/data/molecules/but-2-yne-1_4-diol.cml
+%%DATADIR%%/data/molecules/butane.cml
+%%DATADIR%%/data/molecules/carbon_dioxide.cml
+%%DATADIR%%/data/molecules/carbon_monoxide.cml
+%%DATADIR%%/data/molecules/ethane-1_2-diol.cml
+%%DATADIR%%/data/molecules/ethane.cml
+%%DATADIR%%/data/molecules/ethanol.cml
+%%DATADIR%%/data/molecules/methane.cml
+%%DATADIR%%/data/molecules/methanol.cml
+%%DATADIR%%/data/molecules/porphyrin.cml
+%%DATADIR%%/data/molecules/propan-1-ol.cml
+%%DATADIR%%/data/molecules/propan-2-ol.cml
+%%DATADIR%%/data/molecules/propane.cml
+%%DATADIR%%/data/molecules/thiophene.cml
+%%DATADIR%%/data/molecules/water.cml
+%%DATADIR%%/data/toolpics/abzug.jpg
+%%DATADIR%%/data/toolpics/becherglas.jpg
+%%DATADIR%%/data/toolpics/brechungsmesser.jpg
+%%DATADIR%%/data/toolpics/brenner.jpg
+%%DATADIR%%/data/toolpics/destillierbruecke.jpg
+%%DATADIR%%/data/toolpics/dsc.jpg
+%%DATADIR%%/data/toolpics/erlenmeyerkolben.jpg
+%%DATADIR%%/data/toolpics/exikator.jpg
+%%DATADIR%%/data/toolpics/halter.jpg
+%%DATADIR%%/data/toolpics/heizplatte.jpg
+%%DATADIR%%/data/toolpics/hplc.jpg
+%%DATADIR%%/data/toolpics/kolbenprober.png
+%%DATADIR%%/data/toolpics/korkring.jpg
+%%DATADIR%%/data/toolpics/messzylinder.jpg
+%%DATADIR%%/data/toolpics/moerser.jpg
+%%DATADIR%%/data/toolpics/phpapier.jpg
+%%DATADIR%%/data/toolpics/pileusball.jpg
+%%DATADIR%%/data/toolpics/pipette.jpg
+%%DATADIR%%/data/toolpics/rg-halter.jpg
+%%DATADIR%%/data/toolpics/rg-staender.jpg
+%%DATADIR%%/data/toolpics/rg.jpg
+%%DATADIR%%/data/toolpics/rotationsverdampfer.jpg
+%%DATADIR%%/data/toolpics/rueckflusskuehler.jpg
+%%DATADIR%%/data/toolpics/ruehrfisch.jpg
+%%DATADIR%%/data/toolpics/rundkolben.jpg
+%%DATADIR%%/data/toolpics/scheidetrichter.jpg
+%%DATADIR%%/data/toolpics/schutzbrille.jpg
+%%DATADIR%%/data/toolpics/spatel.jpg
+%%DATADIR%%/data/toolpics/spritzflasche.jpg
+%%DATADIR%%/data/toolpics/thermometer.jpg
+%%DATADIR%%/data/toolpics/thermometer2.jpg
+%%DATADIR%%/data/toolpics/tonschale.jpg
+%%DATADIR%%/data/toolpics/trichter.jpg
+%%DATADIR%%/data/toolpics/trockenrohr.jpg
+%%DATADIR%%/data/toolpics/tropftrichter.jpg
+%%DATADIR%%/data/toolpics/uhrglas.jpg
+%%DATADIR%%/data/toolpics/verteiler.jpg
+%%DATADIR%%/data/toolpics/vollpipette.jpg
+%%DATADIR%%/data/toolpics/waage.jpg
+%%DATADIR%%/data/toolpics/wasserstrahlpumpe.jpg
+%%DATADIR%%/data/tools.xml
+%%DATADIR%%/icons/hicolor/16x16/actions/calculate.png
+%%DATADIR%%/icons/hicolor/16x16/actions/chemical.png
+%%DATADIR%%/icons/hicolor/16x16/actions/elempic.png
+%%DATADIR%%/icons/hicolor/16x16/actions/energies.png
+%%DATADIR%%/icons/hicolor/16x16/actions/eqchem.png
+%%DATADIR%%/icons/hicolor/16x16/actions/glossary.png
+%%DATADIR%%/icons/hicolor/16x16/actions/isotopemap.png
+%%DATADIR%%/icons/hicolor/16x16/actions/kalzium_molviewer.png
+%%DATADIR%%/icons/hicolor/16x16/actions/kalzium_rs.png
+%%DATADIR%%/icons/hicolor/16x16/actions/kalzium_tables.png
+%%DATADIR%%/icons/hicolor/16x16/actions/legend.png
+%%DATADIR%%/icons/hicolor/16x16/actions/misc.png
+%%DATADIR%%/icons/hicolor/16x16/actions/numbers.png
+%%DATADIR%%/icons/hicolor/16x16/actions/orbits.png
+%%DATADIR%%/icons/hicolor/16x16/actions/overview.png
+%%DATADIR%%/icons/hicolor/16x16/actions/plot.png
+%%DATADIR%%/icons/hicolor/16x16/actions/sidebar.png
+%%DATADIR%%/icons/hicolor/16x16/actions/spectrum.png
+%%DATADIR%%/icons/hicolor/16x16/actions/statematter.png
+%%DATADIR%%/icons/hicolor/16x16/actions/timeline.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tooltip.png
+%%DATADIR%%/icons/hicolor/22x22/actions/calculate.png
+%%DATADIR%%/icons/hicolor/22x22/actions/chemical.png
+%%DATADIR%%/icons/hicolor/22x22/actions/elempic.png
+%%DATADIR%%/icons/hicolor/22x22/actions/energies.png
+%%DATADIR%%/icons/hicolor/22x22/actions/eqchem.png
+%%DATADIR%%/icons/hicolor/22x22/actions/glossary.png
+%%DATADIR%%/icons/hicolor/22x22/actions/isotopemap.png
+%%DATADIR%%/icons/hicolor/22x22/actions/kalzium_molviewer.png
+%%DATADIR%%/icons/hicolor/22x22/actions/kalzium_rs.png
+%%DATADIR%%/icons/hicolor/22x22/actions/kalzium_tables.png
+%%DATADIR%%/icons/hicolor/22x22/actions/legend.png
+%%DATADIR%%/icons/hicolor/22x22/actions/numbers.png
+%%DATADIR%%/icons/hicolor/22x22/actions/orbits.png
+%%DATADIR%%/icons/hicolor/22x22/actions/overview.png
+%%DATADIR%%/icons/hicolor/22x22/actions/plot.png
+%%DATADIR%%/icons/hicolor/22x22/actions/sidebar.png
+%%DATADIR%%/icons/hicolor/22x22/actions/spectrum.png
+%%DATADIR%%/icons/hicolor/22x22/actions/statematter.png
+%%DATADIR%%/icons/hicolor/22x22/actions/timeline.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tooltip.png
+%%DATADIR%%/icons/hicolor/32x32/actions/calculate.png
+%%DATADIR%%/icons/hicolor/32x32/actions/chemical.png
+%%DATADIR%%/icons/hicolor/32x32/actions/elempic.png
+%%DATADIR%%/icons/hicolor/32x32/actions/energies.png
+%%DATADIR%%/icons/hicolor/32x32/actions/eqchem.png
+%%DATADIR%%/icons/hicolor/32x32/actions/glossary.png
+%%DATADIR%%/icons/hicolor/32x32/actions/isotopemap.png
+%%DATADIR%%/icons/hicolor/32x32/actions/kalzium_molviewer.png
+%%DATADIR%%/icons/hicolor/32x32/actions/kalzium_rs.png
+%%DATADIR%%/icons/hicolor/32x32/actions/kalzium_tables.png
+%%DATADIR%%/icons/hicolor/32x32/actions/legend.png
+%%DATADIR%%/icons/hicolor/32x32/actions/misc.png
+%%DATADIR%%/icons/hicolor/32x32/actions/numbers.png
+%%DATADIR%%/icons/hicolor/32x32/actions/orbits.png
+%%DATADIR%%/icons/hicolor/32x32/actions/overview.png
+%%DATADIR%%/icons/hicolor/32x32/actions/plot.png
+%%DATADIR%%/icons/hicolor/32x32/actions/sidebar.png
+%%DATADIR%%/icons/hicolor/32x32/actions/spectrum.png
+%%DATADIR%%/icons/hicolor/32x32/actions/statematter.png
+%%DATADIR%%/icons/hicolor/32x32/actions/timeline.png
+%%DATADIR%%/icons/hicolor/32x32/actions/tooltip.png
+%%DATADIR%%/icons/hicolor/48x48/actions/calculate.png
+%%DATADIR%%/icons/hicolor/48x48/actions/chemical.png
+%%DATADIR%%/icons/hicolor/48x48/actions/energies.png
+%%DATADIR%%/icons/hicolor/48x48/actions/eqchem.png
+%%DATADIR%%/icons/hicolor/48x48/actions/glossary.png
+%%DATADIR%%/icons/hicolor/48x48/actions/isotopemap.png
+%%DATADIR%%/icons/hicolor/48x48/actions/kalzium_molviewer.png
+%%DATADIR%%/icons/hicolor/48x48/actions/kalzium_rs.png
+%%DATADIR%%/icons/hicolor/48x48/actions/kalzium_tables.png
+%%DATADIR%%/icons/hicolor/48x48/actions/legend.png
+%%DATADIR%%/icons/hicolor/48x48/actions/misc.png
+%%DATADIR%%/icons/hicolor/48x48/actions/numbers.png
+%%DATADIR%%/icons/hicolor/48x48/actions/orbits.png
+%%DATADIR%%/icons/hicolor/48x48/actions/overview.png
+%%DATADIR%%/icons/hicolor/48x48/actions/plot.png
+%%DATADIR%%/icons/hicolor/48x48/actions/sidebar.png
+%%DATADIR%%/icons/hicolor/48x48/actions/spectrum.png
+%%DATADIR%%/icons/hicolor/48x48/actions/statematter.png
+%%DATADIR%%/icons/hicolor/48x48/actions/timeline.png
+%%DATADIR%%/icons/hicolor/48x48/actions/tooltip.png
+%%DATADIR%%/icons/hicolor/64x64/actions/kalzium_molviewer.png
+%%DATADIR%%/icons/hicolor/64x64/actions/kalzium_rs.png
+%%DATADIR%%/icons/hicolor/64x64/actions/kalzium_tables.png
+%%DATADIR%%/icons/hicolor/64x64/actions/numbers.png
+%%DATADIR%%/icons/hicolor/scalable/actions/calculate.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/chemical.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/elempic.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/energies.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/eqchem.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/glossary.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/isotopemap.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/kalzium_molviewer.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/kalzium_rs.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/kalzium_tables.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/misc.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/numbers.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/orbits.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/overview.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/plot.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/sidebar.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/spectrum.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/statematter.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/timeline.svgz
+%%DATADIR%%/icons/hicolor/scalable/actions/tooltip.svgz
+%%DATADIR%%/qml/detailview.qml
+share/kxmlgui5/kalzium/kalziumui.rc
+share/libkdeedu/data/elements.xml
+share/libkdeedu/data/isotopes.xml
+share/libkdeedu/data/spectra.xml
+share/libkdeedu/data/symbols.csv
+share/libkdeedu/data/symbols2.csv
+share/metainfo/org.kde.kalzium.appdata.xml
Index: science/step/Makefile
===================================================================
--- science/step/Makefile
+++ science/step/Makefile
@@ -1,20 +1,23 @@
+# Created by: tcberner
# $FreeBSD$
PORTNAME= step
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
-CATEGORIES= science kde kde-kde4
+PORTVERSION= ${KDE_APPLICATIONS_VERSION}
+CATEGORIES= science kde kde-applications
MAINTAINER= kde@FreeBSD.org
-COMMENT= KDE 4 interactive physics simulator
+COMMENT= KDE interactive physics simulator
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
LIB_DEPENDS= libqalculate.so:math/libqalculate \
libgsl.so:math/gsl
-USES= cmake:outsource kde:4 pkgconfig tar:xz
-USE_KDE= kdelibs automoc4
-USE_QT4= opengl moc_build qmake_build rcc_build uic_build
+USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
+USE_KDE= config doctools ecm emoticons init itemmodels \
+ kdelibs4support khtml newstuff plotting
+USE_QT5= buildtools_build core gui network opengl \
+ printsupport qmake_build qml quick svg \
+ widgets xml
pre-configure:
# Avoid building translations, should the user pass
Index: science/step/distinfo
===================================================================
--- science/step/distinfo
+++ science/step/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/step-4.14.3.tar.xz) = 8ba3c71d725a605b37f4c19037385cc63e37062b30635ea7f5415025a650c491
-SIZE (KDE/4.14.3/step-4.14.3.tar.xz) = 378612
+TIMESTAMP = 1486501807
+SHA256 (KDE/applications/16.12.2/step-16.12.2.tar.xz) = 13c7c3c63f1ad2d532d503638f786a962f443354ba9309bcda9010c34801193e
+SIZE (KDE/applications/16.12.2/step-16.12.2.tar.xz) = 390116
Index: science/step/pkg-plist
===================================================================
--- science/step/pkg-plist
+++ science/step/pkg-plist
@@ -1,75 +1,9 @@
bin/step
-share/appdata/step.appdata.xml
-share/applications/kde4/step.desktop
-share/apps/step/examples/brownian.step
-share/apps/step/examples/doublependulum.step
-share/apps/step/examples/eightpendula.step
-share/apps/step/examples/first.step
-share/apps/step/examples/fourpendula.step
-share/apps/step/examples/gas.step
-share/apps/step/examples/graph.step
-share/apps/step/examples/liquid.step
-share/apps/step/examples/lissajous.step
-share/apps/step/examples/motor.step
-share/apps/step/examples/motor1.step
-share/apps/step/examples/note.step
-share/apps/step/examples/resonance.step
-share/apps/step/examples/softbody.step
-share/apps/step/examples/solar.step
-share/apps/step/examples/springs.step
-share/apps/step/examples/wave.step
-share/apps/step/icons/hicolor/22x22/actions/pointer.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Anchor.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Box.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_ChargedParticle.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_CircularMotor.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Controller.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_CoulombForce.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Disk.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Gas.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_GasParticle.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Graph.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_GravitationForce.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_LinearMotor.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Meter.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Note.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Particle.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Pin.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Polygon.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Rope.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_SoftBody.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Spring.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Stick.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_Tracer.png
-share/apps/step/icons/hicolor/22x22/actions/step_object_WeightForce.png
-share/apps/step/objinfo/Anchor.html
-share/apps/step/objinfo/Box.html
-share/apps/step/objinfo/ChargedParticle.html
-share/apps/step/objinfo/CoulombForce.html
-share/apps/step/objinfo/Disk.html
-share/apps/step/objinfo/Gas.html
-share/apps/step/objinfo/GasLJForce.html
-share/apps/step/objinfo/GasParticle.html
-share/apps/step/objinfo/GravitationForce.html
-share/apps/step/objinfo/LinearMotor.html
-share/apps/step/objinfo/Meter.html
-share/apps/step/objinfo/Note.html
-share/apps/step/objinfo/Particle.html
-share/apps/step/objinfo/Pin.html
-share/apps/step/objinfo/Polygon.html
-share/apps/step/objinfo/Spring.html
-share/apps/step/objinfo/WeightForce.html
-share/apps/step/objinfo/World.html
-share/apps/step/stepui.rc
-share/apps/step/tutorials/tutorial1.step
-share/apps/step/tutorials/tutorial2.step
-share/apps/step/tutorials/tutorial3.step
-share/apps/step/tutorials/tutorial4.step
-share/apps/step/tutorials/tutorial5.step
+etc/xdg/step.knsrc
+share/metainfo/org.kde.step.appdata.xml
+share/applications/org.kde.step.desktop
share/config.kcfg/step.kcfg
-share/config/step.knsrc
share/doc/HTML/en/step/circular-motor.png
-share/doc/HTML/en/step/common
share/doc/HTML/en/step/disk-properties.png
share/doc/HTML/en/step/examples.docbook
share/doc/HTML/en/step/index.cache.bz2
@@ -83,7 +17,72 @@
share/doc/HTML/en/step/tutorials.docbook
share/icons/hicolor/128x128/apps/step.png
share/icons/hicolor/16x16/apps/step.png
+share/icons/hicolor/22x22/actions/pointer.png
+share/icons/hicolor/22x22/actions/step_object_Anchor.png
+share/icons/hicolor/22x22/actions/step_object_Box.png
+share/icons/hicolor/22x22/actions/step_object_ChargedParticle.png
+share/icons/hicolor/22x22/actions/step_object_CircularMotor.png
+share/icons/hicolor/22x22/actions/step_object_Controller.png
+share/icons/hicolor/22x22/actions/step_object_CoulombForce.png
+share/icons/hicolor/22x22/actions/step_object_Disk.png
+share/icons/hicolor/22x22/actions/step_object_Gas.png
+share/icons/hicolor/22x22/actions/step_object_GasParticle.png
+share/icons/hicolor/22x22/actions/step_object_Graph.png
+share/icons/hicolor/22x22/actions/step_object_GravitationForce.png
+share/icons/hicolor/22x22/actions/step_object_LinearMotor.png
+share/icons/hicolor/22x22/actions/step_object_Meter.png
+share/icons/hicolor/22x22/actions/step_object_Note.png
+share/icons/hicolor/22x22/actions/step_object_Particle.png
+share/icons/hicolor/22x22/actions/step_object_Pin.png
+share/icons/hicolor/22x22/actions/step_object_Polygon.png
+share/icons/hicolor/22x22/actions/step_object_Rope.png
+share/icons/hicolor/22x22/actions/step_object_SoftBody.png
+share/icons/hicolor/22x22/actions/step_object_Spring.png
+share/icons/hicolor/22x22/actions/step_object_Stick.png
+share/icons/hicolor/22x22/actions/step_object_Tracer.png
+share/icons/hicolor/22x22/actions/step_object_WeightForce.png
share/icons/hicolor/22x22/apps/step.png
share/icons/hicolor/32x32/apps/step.png
share/icons/hicolor/48x48/apps/step.png
share/icons/hicolor/64x64/apps/step.png
+%%DATADIR%%/examples/brownian.step
+%%DATADIR%%/examples/doublependulum.step
+%%DATADIR%%/examples/eightpendula.step
+%%DATADIR%%/examples/first.step
+%%DATADIR%%/examples/fourpendula.step
+%%DATADIR%%/examples/gas.step
+%%DATADIR%%/examples/graph.step
+%%DATADIR%%/examples/liquid.step
+%%DATADIR%%/examples/lissajous.step
+%%DATADIR%%/examples/motor.step
+%%DATADIR%%/examples/motor1.step
+%%DATADIR%%/examples/note.step
+%%DATADIR%%/examples/resonance.step
+%%DATADIR%%/examples/softbody.step
+%%DATADIR%%/examples/solar.step
+%%DATADIR%%/examples/springs.step
+%%DATADIR%%/examples/wave.step
+%%DATADIR%%/objinfo/Anchor.html
+%%DATADIR%%/objinfo/Box.html
+%%DATADIR%%/objinfo/ChargedParticle.html
+%%DATADIR%%/objinfo/CoulombForce.html
+%%DATADIR%%/objinfo/Disk.html
+%%DATADIR%%/objinfo/Gas.html
+%%DATADIR%%/objinfo/GasLJForce.html
+%%DATADIR%%/objinfo/GasParticle.html
+%%DATADIR%%/objinfo/GravitationForce.html
+%%DATADIR%%/objinfo/LinearMotor.html
+%%DATADIR%%/objinfo/Meter.html
+%%DATADIR%%/objinfo/Note.html
+%%DATADIR%%/objinfo/Particle.html
+%%DATADIR%%/objinfo/Pin.html
+%%DATADIR%%/objinfo/Polygon.html
+%%DATADIR%%/objinfo/Spring.html
+%%DATADIR%%/objinfo/WeightForce.html
+%%DATADIR%%/objinfo/World.html
+%%DATADIR%%/stepui.rc
+%%DATADIR%%/tutorials/tutorial1.step
+%%DATADIR%%/tutorials/tutorial2.step
+%%DATADIR%%/tutorials/tutorial3.step
+%%DATADIR%%/tutorials/tutorial4.step
+%%DATADIR%%/tutorials/tutorial5.step

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 9, 8:08 PM (6 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38608845
Default Alt Text
D9755.id.diff (64 KB)

Event Timeline