Update to KDE SC 4.11.3 bugfixes, many new features, improved stability and performance.diff -r1.18 -r1.19 pkgsrc/math/analitza/Makefile
(markd)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.18 2013/07/15 02:02:25 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2013/11/07 11:59:58 markd Exp $ | |
2 | 2 | |||
3 | DISTNAME= analitza-${_KDE_VERSION} | 3 | DISTNAME= analitza-${_KDE_VERSION} | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= math | 4 | CATEGORIES= math | |
6 | COMMENT= KDE library for mathematical features | 5 | COMMENT= KDE library for mathematical features | |
7 | 6 | |||
8 | .include "../../meta-pkgs/kde4/Makefile.kde4" | 7 | .include "../../meta-pkgs/kde4/Makefile.kde4" | |
9 | 8 | |||
10 | BROKEN_READLINE_DETECTION= yes | 9 | BROKEN_READLINE_DETECTION= yes | |
11 | 10 | |||
12 | .include "../../meta-pkgs/kde4/kde4.mk" | 11 | .include "../../meta-pkgs/kde4/kde4.mk" | |
13 | 12 | |||
14 | .include "../../devel/readline/buildlink3.mk" | 13 | .include "../../devel/readline/buildlink3.mk" | |
15 | .include "../../x11/kdelibs4/buildlink3.mk" | 14 | .include "../../x11/kdelibs4/buildlink3.mk" | |
16 | 15 | |||
17 | .include "../../mk/bsd.pkg.mk" | 16 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:56 markd Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2013/11/07 11:59:58 markd Exp $ | |
2 | bin/calgebra | 2 | bin/calgebra | |
3 | include/analitza/abstractlexer.h | 3 | include/analitza/abstractlexer.h | |
4 | include/analitza/analitzaexport.h | 4 | include/analitza/analitzaexport.h | |
5 | include/analitza/analitzautils.h | 5 | include/analitza/analitzautils.h | |
6 | include/analitza/analyzer.h | 6 | include/analitza/analyzer.h | |
7 | include/analitza/builtinmethods.h | 7 | include/analitza/builtinmethods.h | |
8 | include/analitza/expression.h | 8 | include/analitza/expression.h | |
9 | include/analitza/expressionstream.h | 9 | include/analitza/expressionstream.h | |
10 | include/analitza/expressiontype.h | 10 | include/analitza/expressiontype.h | |
11 | include/analitza/importqobjectmetatype.h | 11 | include/analitza/importqobjectmetatype.h | |
12 | include/analitza/object.h | 12 | include/analitza/object.h | |
13 | include/analitza/operations.h | 13 | include/analitza/operations.h | |
14 | include/analitza/operator.h | 14 | include/analitza/operator.h | |
@@ -29,22 +29,22 @@ include/analitzaplot/planecurve.h | @@ -29,22 +29,22 @@ include/analitzaplot/planecurve.h | |||
29 | include/analitzaplot/plotitem.h | 29 | include/analitzaplot/plotitem.h | |
30 | include/analitzaplot/plotsdictionarymodel.h | 30 | include/analitzaplot/plotsdictionarymodel.h | |
31 | include/analitzaplot/plotsfactory.h | 31 | include/analitzaplot/plotsfactory.h | |
32 | include/analitzaplot/plotsmodel.h | 32 | include/analitzaplot/plotsmodel.h | |
33 | include/analitzaplot/plotter2d.h | 33 | include/analitzaplot/plotter2d.h | |
34 | include/analitzaplot/plotter3d.h | 34 | include/analitzaplot/plotter3d.h | |
35 | include/analitzaplot/plottingenums.h | 35 | include/analitzaplot/plottingenums.h | |
36 | include/analitzaplot/spacecurve.h | 36 | include/analitzaplot/spacecurve.h | |
37 | include/analitzaplot/surface.h | 37 | include/analitzaplot/surface.h | |
38 | lib/cmake/analitza/AnalitzaConfig.cmake | 38 | lib/cmake/analitza/AnalitzaConfig.cmake | |
39 | lib/cmake/analitza/AnalitzaTargets-${TARGET}.cmake | 39 | lib/cmake/analitza/AnalitzaTargets-${TARGET}.cmake | |
40 | lib/cmake/analitza/AnalitzaTargets.cmake | 40 | lib/cmake/analitza/AnalitzaTargets.cmake | |
41 | lib/libanalitza.so | 41 | lib/libanalitza.so | |
42 | lib/libanalitza.so.4 | 42 | lib/libanalitza.so.5 | |
43 | lib/libanalitza.so.${PKGVERSION} | 43 | lib/libanalitza.so.5.0.0 | |
44 | lib/libanalitzagui.so | 44 | lib/libanalitzagui.so | |
45 | lib/libanalitzagui.so.4 | 45 | lib/libanalitzagui.so.5 | |
46 | lib/libanalitzagui.so.${PKGVERSION} | 46 | lib/libanalitzagui.so.5.0.0 | |
47 | lib/libanalitzaplot.so | 47 | lib/libanalitzaplot.so | |
48 | lib/libanalitzaplot.so.4 | 48 | lib/libanalitzaplot.so.5 | |
49 | lib/libanalitzaplot.so.${PKGVERSION} | 49 | lib/libanalitzaplot.so.5.0.0 | |
50 | share/kde/apps/libanalitza/plots/basic_curves.plots | 50 | share/kde/apps/libanalitza/plots/basic_curves.plots |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2013/05/21 12:49:33 markd Exp $ | 1 | $NetBSD: distinfo,v 1.6 2013/11/07 11:59:58 markd Exp $ | |
2 | 2 | |||
3 | SHA1 (analitza-4.10.3.tar.xz) = d2b986516a5f9ecaa1ed4151afe9f0958b68c868 | 3 | SHA1 (analitza-4.11.3.tar.xz) = 525844959de2c21888496eb5aaf5b7996ccf823e | |
4 | RMD160 (analitza-4.10.3.tar.xz) = 0e26b22c1297cb0d6c25c632c40b3ce00c2c3675 | 4 | RMD160 (analitza-4.11.3.tar.xz) = aec91198364ec9f40ffd899c6b4d9601e74f191c | |
5 | Size (analitza-4.10.3.tar.xz) = 178036 bytes | 5 | Size (analitza-4.11.3.tar.xz) = 186672 bytes |
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/07/05 13:29:37 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2013/11/07 11:59:58 markd Exp $ | |
2 | 2 | |||
3 | DISTNAME= cantor-${_KDE_VERSION} | 3 | DISTNAME= cantor-${_KDE_VERSION} | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= math | 4 | CATEGORIES= math | |
6 | COMMENT= KDE frontend to mathematical software | 5 | COMMENT= KDE frontend to mathematical software | |
7 | 6 | |||
8 | .include "../../meta-pkgs/kde4/Makefile.kde4" | 7 | .include "../../meta-pkgs/kde4/Makefile.kde4" | |
9 | 8 | |||
10 | CMAKE_ARGS+= -DWITH_Qalculate=OFF | 9 | CMAKE_ARGS+= -DWITH_Qalculate=OFF | |
11 | CMAKE_ARGS+= -DWITH_R=OFF | 10 | CMAKE_ARGS+= -DWITH_R=OFF | |
12 | 11 | |||
13 | .include "../../meta-pkgs/kde4/kde4.mk" | 12 | .include "../../meta-pkgs/kde4/kde4.mk" | |
14 | 13 | |||
15 | .include "../../math/analitza/buildlink3.mk" | 14 | .include "../../math/analitza/buildlink3.mk" | |
16 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 15 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
17 | .include "../../print/libspectre/buildlink3.mk" | 16 | .include "../../print/libspectre/buildlink3.mk" |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2013/05/21 12:49:33 markd Exp $ | 1 | $NetBSD: distinfo,v 1.6 2013/11/07 11:59:58 markd Exp $ | |
2 | 2 | |||
3 | SHA1 (cantor-4.10.3.tar.xz) = ae2c9c50cc79030a3f15106d059997da5c37a886 | 3 | SHA1 (cantor-4.11.3.tar.xz) = fb0e450c0591db62ec9f71532a90c1ad15187c2e | |
4 | RMD160 (cantor-4.10.3.tar.xz) = 76f95d8061da1d95601cff5ca239e6fb76483f35 | 4 | RMD160 (cantor-4.11.3.tar.xz) = e8b99cb05df4331ee5a342f68b3ee2bace122aa2 | |
5 | Size (cantor-4.10.3.tar.xz) = 318200 bytes | 5 | Size (cantor-4.11.3.tar.xz) = 313116 bytes |
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/07/05 13:29:37 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2013/11/07 11:59:58 markd Exp $ | |
2 | 2 | |||
3 | DISTNAME= kalgebra-${_KDE_VERSION} | 3 | DISTNAME= kalgebra-${_KDE_VERSION} | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= math | 4 | CATEGORIES= math | |
6 | COMMENT= KDE graph calculator | 5 | COMMENT= KDE graph calculator | |
7 | 6 | |||
8 | .include "../../meta-pkgs/kde4/Makefile.kde4" | 7 | .include "../../meta-pkgs/kde4/Makefile.kde4" | |
9 | 8 | |||
10 | .include "../../meta-pkgs/kde4/kde4.mk" | 9 | .include "../../meta-pkgs/kde4/kde4.mk" | |
11 | 10 | |||
12 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 11 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
13 | .include "../../math/analitza/buildlink3.mk" | 12 | .include "../../math/analitza/buildlink3.mk" | |
14 | .include "../../misc/libkdeedu/buildlink3.mk" | 13 | .include "../../misc/libkdeedu/buildlink3.mk" | |
15 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 14 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
16 | .include "../../x11/kdelibs4/buildlink3.mk" | 15 | .include "../../x11/kdelibs4/buildlink3.mk" | |
17 | 16 |
@@ -1,31 +1,32 @@ | @@ -1,31 +1,32 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:58 markd Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2013/11/07 11:59:58 markd Exp $ | |
2 | bin/kalgebra | 2 | bin/kalgebra | |
3 | bin/kalgebramobile | 3 | bin/kalgebramobile | |
4 | lib/kde4/imports/org/kde/analitza/Graph2D.qml | 4 | lib/kde4/imports/org/kde/analitza/Graph2D.qml | |
5 | lib/kde4/imports/org/kde/analitza/libanalitzadeclarativeplugin.so | 5 | lib/kde4/imports/org/kde/analitza/libanalitzadeclarativeplugin.so | |
6 | lib/kde4/imports/org/kde/analitza/qmldir | 6 | lib/kde4/imports/org/kde/analitza/qmldir | |
7 | lib/kde4/plasma_applet_kalgebra.so | 7 | lib/kde4/plasma_applet_kalgebra.so | |
8 | share/applications/kde4/kalgebra.desktop | 8 | share/applications/kde4/kalgebra.desktop | |
9 | share/applications/kde4/kalgebramobile.desktop | 9 | share/applications/kde4/kalgebramobile.desktop | |
10 | share/doc/kde/HTML/en/kalgebra/commands.docbook | 10 | share/doc/kde/HTML/en/kalgebra/commands.docbook | |
11 | share/doc/kde/HTML/en/kalgebra/common | 11 | share/doc/kde/HTML/en/kalgebra/common | |
12 | share/doc/kde/HTML/en/kalgebra/index.cache.bz2 | 12 | share/doc/kde/HTML/en/kalgebra/index.cache.bz2 | |
13 | share/doc/kde/HTML/en/kalgebra/index.docbook | 13 | share/doc/kde/HTML/en/kalgebra/index.docbook | |
14 | share/doc/kde/HTML/en/kalgebra/kalgebra-2dgraph-window.png | 14 | share/doc/kde/HTML/en/kalgebra/kalgebra-2dgraph-window.png | |
15 | share/doc/kde/HTML/en/kalgebra/kalgebra-3dgraph-window.png | 15 | share/doc/kde/HTML/en/kalgebra/kalgebra-3dgraph-window.png | |
16 | share/doc/kde/HTML/en/kalgebra/kalgebra-console-window.png | 16 | share/doc/kde/HTML/en/kalgebra/kalgebra-console-window.png | |
17 | share/doc/kde/HTML/en/kalgebra/kalgebra-dictionary-window.png | 17 | share/doc/kde/HTML/en/kalgebra/kalgebra-dictionary-window.png | |
18 | share/doc/kde/HTML/en/kalgebra/kalgebra-main-window.png | 18 | share/doc/kde/HTML/en/kalgebra/kalgebra-main-window.png | |
19 | share/doc/kde/HTML/en/kalgebra/view-fullscreen.png | |||
19 | share/icons/hicolor/128x128/apps/kalgebra.png | 20 | share/icons/hicolor/128x128/apps/kalgebra.png | |
20 | share/icons/hicolor/16x16/apps/kalgebra.png | 21 | share/icons/hicolor/16x16/apps/kalgebra.png | |
21 | share/icons/hicolor/32x32/apps/kalgebra.png | 22 | share/icons/hicolor/32x32/apps/kalgebra.png | |
22 | share/icons/hicolor/48x48/apps/kalgebra.png | 23 | share/icons/hicolor/48x48/apps/kalgebra.png | |
23 | share/icons/hicolor/64x64/apps/kalgebra.png | 24 | share/icons/hicolor/64x64/apps/kalgebra.png | |
24 | share/icons/hicolor/scalable/apps/kalgebra.svgz | 25 | share/icons/hicolor/scalable/apps/kalgebra.svgz | |
25 | share/kde/apps/kalgebramobile/plugins/About.qml | 26 | share/kde/apps/kalgebramobile/plugins/About.qml | |
26 | share/kde/apps/kalgebramobile/plugins/Console.qml | 27 | share/kde/apps/kalgebramobile/plugins/Console.qml | |
27 | share/kde/apps/kalgebramobile/plugins/Plot2D.qml | 28 | share/kde/apps/kalgebramobile/plugins/Plot2D.qml | |
28 | share/kde/apps/kalgebramobile/plugins/Tables.qml | 29 | share/kde/apps/kalgebramobile/plugins/Tables.qml | |
29 | share/kde/apps/kalgebramobile/plugins/VariablesView.qml | 30 | share/kde/apps/kalgebramobile/plugins/VariablesView.qml | |
30 | share/kde/apps/kalgebramobile/plugins/kalgebraabout.desktop | 31 | share/kde/apps/kalgebramobile/plugins/kalgebraabout.desktop | |
31 | share/kde/apps/kalgebramobile/plugins/kalgebraconsole.desktop | 32 | share/kde/apps/kalgebramobile/plugins/kalgebraconsole.desktop |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2013/05/21 12:49:33 markd Exp $ | 1 | $NetBSD: distinfo,v 1.6 2013/11/07 11:59:58 markd Exp $ | |
2 | 2 | |||
3 | SHA1 (kalgebra-4.10.3.tar.xz) = c3c237cdf891259b2bef399d2b5c75a420e21d55 | 3 | SHA1 (kalgebra-4.11.3.tar.xz) = 3852c19219164403c21ab4cab0ffa4e1599ddfa3 | |
4 | RMD160 (kalgebra-4.10.3.tar.xz) = dc50734738a8158faf8fe7ca1407f04426b71ad9 | 4 | RMD160 (kalgebra-4.11.3.tar.xz) = be42836a9bf26e550c6400eb9981110dfa1963cf | |
5 | Size (kalgebra-4.10.3.tar.xz) = 445880 bytes | 5 | Size (kalgebra-4.11.3.tar.xz) = 279520 bytes |
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/07/05 13:29:37 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2013/11/07 11:59:59 markd Exp $ | |
2 | 2 | |||
3 | DISTNAME= kcalc-${_KDE_VERSION} | 3 | DISTNAME= kcalc-${_KDE_VERSION} | |
4 | PKGREVISION= 4 | |||
5 | CATEGORIES= math | 4 | CATEGORIES= math | |
6 | COMMENT= KDE scientific calculator | 5 | COMMENT= KDE scientific calculator | |
7 | 6 | |||
8 | .include "../../meta-pkgs/kde4/Makefile.kde4" | 7 | .include "../../meta-pkgs/kde4/Makefile.kde4" | |
9 | 8 | |||
10 | .include "../../meta-pkgs/kde4/kde4.mk" | 9 | .include "../../meta-pkgs/kde4/kde4.mk" | |
11 | 10 | |||
12 | .include "../../devel/gmp/buildlink3.mk" | 11 | .include "../../devel/gmp/buildlink3.mk" | |
13 | .include "../../math/mpfr/buildlink3.mk" | 12 | .include "../../math/mpfr/buildlink3.mk" | |
14 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 13 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
15 | .include "../../x11/kdelibs4/buildlink3.mk" | 14 | .include "../../x11/kdelibs4/buildlink3.mk" | |
16 | 15 | |||
17 | .include "../../mk/bsd.pkg.mk" | 16 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2013/05/21 12:49:33 markd Exp $ | 1 | $NetBSD: distinfo,v 1.6 2013/11/07 11:59:59 markd Exp $ | |
2 | 2 | |||
3 | SHA1 (kcalc-4.10.3.tar.xz) = c80f91c2f41a60cca670c8cb1b5e2c395e935fac | 3 | SHA1 (kcalc-4.11.3.tar.xz) = a62a37a16a699fdba715cda33b9f75755d81cb76 | |
4 | RMD160 (kcalc-4.10.3.tar.xz) = 6542004b478c6e3cf60131a1f8678808556dc80d | 4 | RMD160 (kcalc-4.11.3.tar.xz) = 211c77b1e54374313bff7909cd47c3b0282805cc | |
5 | Size (kcalc-4.10.3.tar.xz) = 93972 bytes | 5 | Size (kcalc-4.11.3.tar.xz) = 82916 bytes | |
6 | SHA1 (patch-CMakeLists.txt) = 3267b41b6a6a25a18b3dc450747beedb2976b45e | 6 | SHA1 (patch-CMakeLists.txt) = 41012666b695fbaad04261cbf566d875d9f83ed8 | |
7 | SHA1 (patch-knumber_knumber_float.cpp) = 413c778069c0d38272e67b00eaca1a76a933e5cb | 7 | SHA1 (patch-knumber_knumber_float.cpp) = dc5e8434cc1e206b7ed11a68639bf3076f67d774 | |
8 | SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df | 8 | SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/03 10:52:24 markd Exp $ | 1 | $NetBSD: patch-CMakeLists.txt,v 1.2 2013/11/07 11:59:59 markd Exp $ | |
2 | 2 | |||
3 | use mpfr (alternate code doesnt build on BSD) | 3 | use mpfr (alternate code doesnt build on BSD) | |
4 | 4 | |||
5 | --- CMakeLists.txt.orig 2013-04-01 23:12:26.000000000 +0000 | 5 | --- CMakeLists.txt.orig 2013-04-01 23:12:26.000000000 +0000 | |
6 | +++ CMakeLists.txt | 6 | +++ CMakeLists.txt | |
7 | @@ -36,6 +36,9 @@ if(NOT GMP_FOUND) | 7 | @@ -36,6 +36,9 @@ if(NOT GMP_FOUND) | |
8 | endif() | 8 | endif() | |
9 | endif(NOT GMP_FOUND) | 9 | endif(NOT GMP_FOUND) | |
10 | 10 | |||
11 | +find_package (MPFR REQUIRED) | 11 | +find_package (MPFR REQUIRED) | |
12 | +add_definitions (-DKNUMBER_USE_MPFR) | 12 | +add_definitions (-DKNUMBER_USE_MPFR) | |
13 | + | 13 | + | |
14 | include(CheckTypeSize) | 14 | include(CheckTypeSize) | |
15 | include(CheckFunctionExists) | |||
16 | include(CheckIncludeFiles) | 15 | include(CheckIncludeFiles) | |
16 |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-knumber_knumber_float.cpp,v 1.1 2013/04/03 10:52:24 markd Exp $ | 1 | $NetBSD: patch-knumber_knumber_float.cpp,v 1.2 2013/11/07 11:59:59 markd Exp $ | |
2 | 2 | |||
3 | use namespace std for isinf() and isnan() | 3 | use namespace std for isinf() and isnan() | |
4 | 4 | |||
5 | --- knumber/knumber_float.cpp.orig 2013-03-01 07:05:02.000000000 +0000 | 5 | --- knumber/knumber_float.cpp.orig 2013-03-01 07:05:02.000000000 +0000 | |
6 | +++ knumber/knumber_float.cpp | 6 | +++ knumber/knumber_float.cpp | |
7 | @@ -25,6 +25,8 @@ along with this program. If not, see <h | 7 | @@ -25,6 +25,8 @@ along with this program. If not, see <h | |
8 | #include <QDebug> | 8 | #include <QDebug> | |
9 | #include <cmath> | 9 | #include <math.h> | |
10 | 10 | |||
11 | +using namespace std; | 11 | +using namespace std; | |
12 | + | 12 | + | |
13 | // NOTE: these assume IEEE floats.. | 13 | // NOTE: these assume IEEE floats.. | |
14 | #ifndef HAVE_FUNC_ISINF | 14 | #ifndef isinf | |
15 | #define isinf(x) ((x) != 0.0 && (x) + (x) == (x)) | 15 | #define isinf(x) ((x) != 0.0 && (x) + (x) == (x)) |