Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2014-11-19 20:25:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2014-10-16 18:12:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2014-11-19 20:29:00.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 9 20:32:21 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +------------------------------------------------------------------- Old: ---- cantor-4.14.2.tar.xz New: ---- cantor-4.14.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.j1U52g/_old 2014-11-19 20:29:01.000000000 +0100 +++ /var/tmp/diff_new_pack.j1U52g/_new 2014-11-19 20:29:01.000000000 +0100 @@ -19,7 +19,7 @@ %global libMAJOR 1 Name: cantor -Version: 4.14.2 +Version: 4.14.3 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ ++++++ cantor-4.14.2.tar.xz -> cantor-4.14.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/CMakeLists.txt new/cantor-4.14.3/src/CMakeLists.txt --- old/cantor-4.14.2/src/CMakeLists.txt 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/CMakeLists.txt 2014-11-01 13:56:09.000000000 +0100 @@ -49,7 +49,11 @@ install( FILES cantor_maxima.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES cantor_sage.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES cantor_kalgebra.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES cantor_lua.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES cantor_octave.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES cantor_qalculate.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) install( FILES cantor_python2.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES cantor_scilab.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) if (R_FOUND) install( FILES cantor_r.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) endif (R_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/backends/kalgebra/kalgebrabackend.desktop new/cantor-4.14.3/src/backends/kalgebra/kalgebrabackend.desktop --- old/cantor-4.14.2/src/backends/kalgebra/kalgebrabackend.desktop 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/backends/kalgebra/kalgebrabackend.desktop 2014-11-01 13:56:09.000000000 +0100 @@ -68,7 +68,7 @@ Comment[bs]=KAlgebra vrši računanje za Kantora. Omogućava vam da koristite isti jezik koji koristite u Kalgebra primjeni u Kantorovim listama. Comment[ca]=Dorsal de KAlgebra per al Cantor. Us permet utilitzar als fulls de treball del Cantor el mateix llenguatge que feu servir a l'aplicació KAlgebra. Comment[ca@valencia]=Dorsal de KAlgebra per al Cantor. Vos permet utilitzar als fulls de treball del Cantor el mateix llenguatge que feu servir a l'aplicació KAlgebra. -Comment[cs]=Podpůrná vrstva KAlgebra pro Cantor. Umožňuje v listech Cantoru používat stejný jazyk jako v KAlgebře. +Comment[cs]=Podpůrná vrstva KAlgebra pro Cantor. Umožňuje v listech Cantoru používat stejný jazyk jako v KAlgebra. Comment[da]=KAlgebra-backend til Cantor. Lader dig bruge de samme sprog som du bruger i programmet KAlgebra i Cantor-arbejdsark. Comment[de]=KAlgebra-Modul für Cantor. Damit können Sie für die Arbeitsblätter in Cantor dieselbe Sprache wie in KAlgebra verwenden. Comment[el]=Σύστημα υποστήριξης KAlgebra για το Cantor. Σας επιτρέπει να χρησιμοποιήσετε την ίδια γλώσσα που χρησιμοποιείτε και στην εφαρμογή KAlgebra στα φύλλα εργασίας του Cantor. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/backends/python2/CMakeLists.txt new/cantor-4.14.3/src/backends/python2/CMakeLists.txt --- old/cantor-4.14.2/src/backends/python2/CMakeLists.txt 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/backends/python2/CMakeLists.txt 2014-11-01 13:56:09.000000000 +0100 @@ -26,6 +26,9 @@ kde4_add_plugin(cantor_python2backend ${Python2Backend_SRCS}) target_link_libraries(cantor_python2backend ${PYTHON_LIBRARIES} ${KDE4_KDEUI_LIBS} cantorlibs ${KDE4_KIO_LIBS}) +kde4_add_unit_test(testpython2 testpython2.cpp) +target_link_libraries( testpython2 ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} cantorlibs cantortest ) + install(FILES python2backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}/cantor) install(FILES keywords.xml DESTINATION ${DATA_INSTALL_DIR}/cantor/python2backend) install(TARGETS cantor_python2backend DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/backends/python2/python2backend.cpp new/cantor-4.14.3/src/backends/python2/python2backend.cpp --- old/cantor-4.14.2/src/backends/python2/python2backend.cpp 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/backends/python2/python2backend.cpp 2014-11-01 13:56:09.000000000 +0100 @@ -30,6 +30,8 @@ #include "cantor_macros.h" +#include <QLibrary> + Python2Backend::Python2Backend(QObject* parent,const QList<QVariant> args ) : Cantor::Backend( parent,args) { kDebug()<<"Creating Python2Backend"; @@ -41,6 +43,14 @@ new Python2VariableManagementExtension(this); setObjectName("python2backend"); + + // Because the plugin may not have been loaded with + // ExportExternalSymbols, we load the python symbols again + // to make sure that python modules such as numpy see them + // (see bug #330032) + QLibrary pythonLib("python2.7"); + pythonLib.setLoadHints(QLibrary::ExportExternalSymbolsHint); + pythonLib.load(); } Python2Backend::~Python2Backend() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/backends/python2/testpython2.cpp new/cantor-4.14.3/src/backends/python2/testpython2.cpp --- old/cantor-4.14.2/src/backends/python2/testpython2.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/cantor-4.14.3/src/backends/python2/testpython2.cpp 2014-11-01 13:56:09.000000000 +0100 @@ -0,0 +1,43 @@ +/* + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + + --- + Copyright (C) 2013 Tuukka Verho <tuukka.ve...@aalto.fi> + */ + +#include "testpython2.h" + +#include "session.h" +#include "backend.h" +#include "expression.h" +#include "result.h" + +QString TestPython2::backendName() +{ + return "python2"; +} + +void TestPython2::testImportNumpy() +{ + Cantor::Expression* e=evalExp( "import numpy" ); + + QVERIFY( e!=0 ); + QVERIFY( e->result()!=0 ); +} + +QTEST_MAIN( TestPython2 ) + +#include "testpython2.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/backends/python2/testpython2.h new/cantor-4.14.3/src/backends/python2/testpython2.h --- old/cantor-4.14.2/src/backends/python2/testpython2.h 1970-01-01 01:00:00.000000000 +0100 +++ new/cantor-4.14.3/src/backends/python2/testpython2.h 2014-11-01 13:56:09.000000000 +0100 @@ -0,0 +1,38 @@ +/* + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + + --- + Copyright (C) 2013 Tuukka Verho <tuukka.ve...@aalto.fi> + */ + +#ifndef _TESTPYTHON2_H +#define _TESTPYTHON2_H + +#include "backendtest.h" + + +class TestPython2 : public BackendTest +{ + Q_OBJECT + +private slots: + void testImportNumpy(); + +private: + virtual QString backendName(); +}; + +#endif /* _TESTPYTHON2_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor.knsrc new/cantor-4.14.3/src/cantor.knsrc --- old/cantor-4.14.2/src/cantor.knsrc 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/cantor.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -1,7 +1,7 @@ [KNewStuff3] ProvidersUrl=http://download.kde.org/ocs/providers.xml -Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) -UploadCategories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) +UploadCategories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) TargetDir=cantor/examples Uncompress=never CustomName=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_kalgebra.knsrc new/cantor-4.14.3/src/cantor_kalgebra.knsrc --- old/cantor-4.14.2/src/cantor_kalgebra.knsrc 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/cantor_kalgebra.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -1,6 +1,6 @@ [KNewStuff3] ProvidersUrl=http://download.kde.org/ocs/providers.xml -Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (KAlgebra) TargetDir=cantor/examples Uncompress=never diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_lua.knsrc new/cantor-4.14.3/src/cantor_lua.knsrc --- old/cantor-4.14.2/src/cantor_lua.knsrc 1970-01-01 01:00:00.000000000 +0100 +++ new/cantor-4.14.3/src/cantor_lua.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -0,0 +1,7 @@ +[KNewStuff3] +ProvidersUrl=http://download.kde.org/ocs/providers.xml +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) +UploadCategories=Cantor (Lua) +TargetDir=cantor/examples +Uncompress=never +CustomName=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_maxima.knsrc new/cantor-4.14.3/src/cantor_maxima.knsrc --- old/cantor-4.14.2/src/cantor_maxima.knsrc 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/cantor_maxima.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -1,6 +1,6 @@ [KNewStuff3] ProvidersUrl=http://download.kde.org/ocs/providers.xml -Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Maxima) TargetDir=cantor/examples Uncompress=never diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_octave.knsrc new/cantor-4.14.3/src/cantor_octave.knsrc --- old/cantor-4.14.2/src/cantor_octave.knsrc 1970-01-01 01:00:00.000000000 +0100 +++ new/cantor-4.14.3/src/cantor_octave.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -0,0 +1,7 @@ +[KNewStuff3] +ProvidersUrl=http://download.kde.org/ocs/providers.xml +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) +UploadCategories=Cantor (Octave) +TargetDir=cantor/examples +Uncompress=never +CustomName=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_python2.knsrc new/cantor-4.14.3/src/cantor_python2.knsrc --- old/cantor-4.14.2/src/cantor_python2.knsrc 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/cantor_python2.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -1,6 +1,6 @@ [KNewStuff3] ProvidersUrl=http://download.kde.org/ocs/providers.xml -Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Python2) TargetDir=cantor/examples Uncompress=never diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_qalculate.knsrc new/cantor-4.14.3/src/cantor_qalculate.knsrc --- old/cantor-4.14.2/src/cantor_qalculate.knsrc 1970-01-01 01:00:00.000000000 +0100 +++ new/cantor-4.14.3/src/cantor_qalculate.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -0,0 +1,7 @@ +[KNewStuff3] +ProvidersUrl=http://download.kde.org/ocs/providers.xml +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) +UploadCategories=Cantor (Qalculate) +TargetDir=cantor/examples +Uncompress=never +CustomName=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_r.knsrc new/cantor-4.14.3/src/cantor_r.knsrc --- old/cantor-4.14.2/src/cantor_r.knsrc 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/cantor_r.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -1,6 +1,6 @@ [KNewStuff3] ProvidersUrl=http://download.kde.org/ocs/providers.xml -Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (R) TargetDir=cantor/examples Uncompress=never diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_sage.knsrc new/cantor-4.14.3/src/cantor_sage.knsrc --- old/cantor-4.14.2/src/cantor_sage.knsrc 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/cantor_sage.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -1,6 +1,6 @@ [KNewStuff3] ProvidersUrl=http://download.kde.org/ocs/providers.xml -Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2) +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Sage) TargetDir=cantor/examples Uncompress=never diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/cantor_scilab.knsrc new/cantor-4.14.3/src/cantor_scilab.knsrc --- old/cantor-4.14.2/src/cantor_scilab.knsrc 1970-01-01 01:00:00.000000000 +0100 +++ new/cantor-4.14.3/src/cantor_scilab.knsrc 2014-11-01 13:56:09.000000000 +0100 @@ -0,0 +1,7 @@ +[KNewStuff3] +ProvidersUrl=http://download.kde.org/ocs/providers.xml +Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python2),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) +UploadCategories=Cantor (Scilab) +TargetDir=cantor/examples +Uncompress=never +CustomName=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cantor-4.14.2/src/lib/expression.cpp new/cantor-4.14.3/src/lib/expression.cpp --- old/cantor-4.14.2/src/lib/expression.cpp 2014-10-09 19:37:01.000000000 +0200 +++ new/cantor-4.14.3/src/lib/expression.cpp 2014-11-01 13:56:09.000000000 +0100 @@ -187,17 +187,24 @@ kDebug()<<"rendered a result to "<<renderer->imagePath(); //replace the textresult with the rendered latex image result //ImageResult* latex=new ImageResult( d->latexFilename ); - if(renderer->renderingSuccessful()) + if(renderer->renderingSuccessful()&&result()) { - TextResult* r=dynamic_cast<TextResult*>(result()); - LatexResult* latex=new LatexResult(r->data().toString().trimmed(), KUrl(renderer->imagePath()), r->plain()); - setResult( latex ); + if (result()->type() == TextResult::Type) + { + TextResult* r=dynamic_cast<TextResult*>(result()); + LatexResult* latex=new LatexResult(r->data().toString().trimmed(), KUrl(renderer->imagePath()), r->plain()); + setResult( latex ); + } + else if (result()->type() == LatexResult::Type) + { + LatexResult* previousLatexResult=dynamic_cast<LatexResult*>(result()); + LatexResult* latex=new LatexResult(previousLatexResult->data().toString().trimmed(), KUrl(renderer->imagePath()), previousLatexResult->plain()); + setResult( latex ); + } }else { - //if rendering with latex was not successfull, just use the plain text version - //if available - TextResult* r=dynamic_cast<TextResult*>(result()); - setResult(new TextResult(r->plain())); + //if rendering with latex was not successfull, just + //do nothing and keep the old result. kDebug()<<"error rendering latex: "<<renderer->errorMessage(); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
