cantor 16.08.3
authorYaakov Selkowitz <yselkowi@redhat.com>
Thu, 16 Feb 2017 07:39:12 +0000 (01:39 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Thu, 16 Feb 2017 07:39:12 +0000 (01:39 -0600)
15.04.3-cmake-part.patch [deleted file]
15.04.3-fix-qalculate-backend.patch [deleted file]
16.08.3-cmake-part.patch [new file with mode: 0644]
16.08.3-dllexport.patch [new file with mode: 0644]
cantor.cygport

diff --git a/15.04.3-cmake-part.patch b/15.04.3-cmake-part.patch
deleted file mode 100644 (file)
index 445d37d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/cantor-15.04.3/src/CMakeLists.txt  2015-05-31 07:00:53.000000000 -0500
-+++ src/cantor-15.04.3/src/CMakeLists.txt      2015-09-16 18:11:53.922524600 -0500
-@@ -86,7 +86,7 @@ ki18n_wrap_ui(cantor_PART_SRCS extendeds
- configure_file (config-cantor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-cantor.h )
- add_library(cantorpart MODULE ${cantor_PART_SRCS})
--set_target_properties(cantorpart PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
-+set_target_properties(cantorpart PROPERTIES PREFIX "lib")
- target_link_libraries(cantorpart KF5::Parts KF5::NewStuff
-                      KF5::TextEditor ${Qt5XmlPatterns_LIBRARIES}
diff --git a/15.04.3-fix-qalculate-backend.patch b/15.04.3-fix-qalculate-backend.patch
deleted file mode 100644 (file)
index b9d75d8..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- origsrc/cantor-15.04.3/src/backends/qalculate/qalculateexpression.cpp      2015-05-31 07:00:53.000000000 -0500
-+++ src/cantor-15.04.3/src/backends/qalculate/qalculateexpression.cpp  2015-09-16 18:06:49.475864700 -0500
-@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCo
-       if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
-           plotParameters.filetype == PLOT_FILETYPE_PS  ||
-           (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
--           plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
-+           plotParameters.filename.substr(p-4,4) == ".eps") ||
-           (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
--           plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
-+           plotParameters.filename.substr(p-3,3) == ".ps"))
-           setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
-       else
-           setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
diff --git a/16.08.3-cmake-part.patch b/16.08.3-cmake-part.patch
new file mode 100644 (file)
index 0000000..b0df318
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/cantor-16.08.3/src/CMakeLists.txt  2016-11-06 17:12:36.000000000 -0600
++++ src/cantor-16.08.3/src/CMakeLists.txt      2016-11-14 12:27:57.307218600 -0600
+@@ -91,7 +91,7 @@ kcoreaddons_add_plugin(cantorpart
+     JSON "cantor_part.json"
+     INSTALL_NAMESPACE ".")
+-set_target_properties(cantorpart PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
++set_target_properties(cantorpart PROPERTIES PREFIX "lib")
+ target_link_libraries(cantorpart KF5::Parts KF5::NewStuff
+                      KF5::TextEditor ${Qt5XmlPatterns_LIBRARIES}
diff --git a/16.08.3-dllexport.patch b/16.08.3-dllexport.patch
new file mode 100644 (file)
index 0000000..b11b5c0
--- /dev/null
@@ -0,0 +1,8 @@
+--- origsrc/cantor-16.08.3/src/lib/test/CMakeLists.txt 2016-11-06 17:12:36.000000000 -0600
++++ src/cantor-16.08.3/src/lib/test/CMakeLists.txt     2016-11-14 13:17:25.417738100 -0600
+@@ -1,4 +1,5 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
++add_definitions(-UMAKE_CANTORLIBS_LIB -DMAKE_CANTORTEST_LIB)
+ set(cantortest_SRCS
+     backendtest.cpp)
index 0ac3b02229a37a5b9fbb47920485950539fcb8dc..aa89376fc1af26e1768173774a61e4a4c28e4306 100644 (file)
@@ -1,14 +1,14 @@
 inherit kf5
 
 NAME="cantor"
-VERSION=15.04.3
+VERSION=16.08.3
 RELEASE=1
 CATEGORY="Math"
 SUMMARY="KDE frontend for mathematical software"
 DESCRIPTION="Part of the KDE education suite"
 PATCH_URI="
-       15.04.3-cmake-part.patch
-       15.04.3-fix-qalculate-backend.patch
+       16.08.3-cmake-part.patch
+       16.08.3-dllexport.patch
 "
 
 PKG_NAMES="cantor cantor-backend-kalgebra cantor-backend-lua cantor-backend-maxima
@@ -16,15 +16,16 @@ PKG_NAMES="cantor cantor-backend-kalgebra cantor-backend-lua cantor-backend-maxi
           cantor-backend-python3 cantor-backend-r cantor-devel"
 cantor_REQUIRES="texlive-collection-latex"
 cantor_CONTENTS="
-       --exclude=*[^ln_]backend.[dkr]*
        --exclude=*qalculateplotassistant.[dkr]*
        etc/postinstall/cantor.sh
        etc/xdg/cantor.knsrc
        usr/bin/cantor.exe
        usr/bin/cygcantor_config.dll
        usr/bin/cygcantor_pythonbackend.dll
-       usr/bin/cygcantorlibs-6.dll
-       usr/lib/qt5/plugins/cantor_*.dll
+       usr/bin/cygcantorlibs-*.dll
+       usr/lib/qt5/plugins/cantor/assistants/
+       usr/lib/qt5/plugins/cantor/backends/cantor_nullbackend.dll
+       usr/lib/qt5/plugins/cantor/panels/
        usr/lib/qt5/plugins/libcantorpart.dll
        usr/share/appdata/org.kde.cantor.appdata.xml
        usr/share/applications/org.kde.cantor.desktop
@@ -35,8 +36,6 @@ cantor_CONTENTS="
        usr/share/doc/cantor/
        usr/share/icons/hicolor/*/apps/cantor.*
        usr/share/icons/hicolor/*/apps/*backend.*
-       usr/share/kservices5/cantor/
-       usr/share/kservicetypes5/cantor_*
        usr/share/kxmlgui5/cantor/
 "
 cantor_devel_CONTENTS="
@@ -46,83 +45,73 @@ cantor_devel_CONTENTS="
 cantor_backend_kalgebra_SUMMARY="KAlgebra backend for Cantor mathematical software"
 cantor_backend_kalgebra_CONTENTS="
        etc/xdg/cantor_kalgebra.knsrc
-       usr/lib/qt5/plugins/cantor_kalgebrabackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_kalgebrabackend.dll
        usr/share/config.kcfg/kalgebrabackend.kcfg
-       usr/share/kservices5/cantor/kalgebrabackend.desktop
 "
 cantor_backend_lua_SUMMARY="Lua backend for Cantor mathematical software"
 cantor_backend_lua_CONTENTS="
        etc/xdg/cantor_lua.knsrc
-       usr/lib/qt5/plugins/cantor_luabackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_luabackend.dll
        usr/share/config.kcfg/luabackend.kcfg
-       usr/share/kservices5/cantor/luabackend.desktop
 "
 cantor_backend_maxima_SUMMARY="Maxima backend for Cantor mathematical software"
 cantor_backend_maxima_REQUIRES="maxima"
 cantor_backend_maxima_CONTENTS="
        etc/xdg/cantor_maxima.knsrc
-       usr/lib/qt5/plugins/cantor_maximabackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_maximabackend.dll
        usr/share/cantor/maximabackend/
        usr/share/config.kcfg/maximabackend.kcfg
-       usr/share/kservices5/cantor/maximabackend.desktop
 "
 cantor_backend_octave_SUMMARY="Octave backend for Cantor mathematical software"
 cantor_backend_octave_REQUIRES="octave"
 cantor_backend_octave_CONTENTS="
        etc/xdg/cantor_octave.knsrc
-       usr/lib/qt5/plugins/cantor_octavebackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_octavebackend.dll
        usr/share/cantor/octavebackend/
        usr/share/config.kcfg/octavebackend.kcfg
-       usr/share/kservices5/cantor/octavebackend.desktop
 "
 cantor_backend_python2_SUMMARY="Python2 backend for Cantor mathematical software"
 cantor_backend_python2_REQUIRES="python-numpy"
 cantor_backend_python2_CONTENTS="
        etc/xdg/cantor_python2.knsrc
-       usr/lib/qt5/plugins/cantor_python2backend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_python2backend.dll
        usr/share/config.kcfg/python2backend.kcfg
-       usr/share/kservices5/cantor/python2backend.desktop
 "
 cantor_backend_python3_SUMMARY="Python3 backend for Cantor mathematical software"
 cantor_backend_python3_REQUIRES="python3-numpy"
 cantor_backend_python3_CONTENTS="
        etc/xdg/cantor_python3.knsrc
        usr/bin/cantor_python3server.exe
-       usr/lib/qt5/plugins/cantor_python3backend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_python3backend.dll
        usr/share/config.kcfg/python3backend.kcfg
-       usr/share/kservices5/cantor/python3backend.desktop
 "
 cantor_backend_qalculate_SUMMARY="Qalculate backend for Cantor mathematical software"
 cantor_backend_qalculate_CONTENTS="
        etc/xdg/cantor_qalculate.knsrc
-       usr/lib/qt5/plugins/cantor_qalculatebackend.dll
-       usr/lib/qt5/plugins/cantor_qalculateplotassistant.dll
+       usr/lib/qt5/plugins/cantor/assistants/cantor_qalculateplotassistant.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_qalculatebackend.dll
        usr/share/cantor/cantor_qalculateplotassistant.rc
        usr/share/config.kcfg/qalculatebackend.kcfg
-       usr/share/kservices5/cantor/qalculate*.desktop
 "
 cantor_backend_r_SUMMARY="R backend for Cantor mathematical software"
 cantor_backend_r_CONTENTS="
        etc/xdg/cantor_r.knsrc
        usr/bin/cantor_rserver.exe
-       usr/lib/qt5/plugins/cantor_rbackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_rbackend.dll
        usr/share/config.kcfg/rserver.kcfg
-       usr/share/kservices5/cantor/rbackend.desktop
 "
 cantor_backend_sage_SUMMARY="Sage backend for Cantor mathematical software"
 cantor_backend_sage_CONTENTS="
        etc/xdg/cantor_sage.knsrc
-       usr/lib/qt5/plugins/cantor_sagebackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_sagebackend.dll
        usr/share/cantor/sagebackend/
        usr/share/config.kcfg/sagebackend.kcfg
-       usr/share/kservices5/cantor/sagebackend.desktop
 "
 cantor_backend_scilab_SUMMARY="Scilab backend for Cantor mathematical software"
 cantor_backend_scilab_CONTENTS="
        etc/xdg/cantor_scilab.knsrc
-       usr/lib/qt5/plugins/cantor_scilabbackend.dll
+       usr/lib/qt5/plugins/cantor/backends/cantor_scilabbackend.dll
        usr/share/config.kcfg/scilabbackend.kcfg
-       usr/share/kservices5/cantor/scilabbackend.desktop
 "
 # sage and scilab have yet to be built for cygwin
 PKG_IGNORE="
This page took 0.032753 seconds and 5 git commands to generate.