diff options
Diffstat (limited to 'kde-apps/cantor/files')
-rw-r--r-- | kde-apps/cantor/files/cantor-15.12.3-qt56.patch | 27 | ||||
-rw-r--r-- | kde-apps/cantor/files/cantor-15.12.3-tests.patch | 49 |
2 files changed, 0 insertions, 76 deletions
diff --git a/kde-apps/cantor/files/cantor-15.12.3-qt56.patch b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch deleted file mode 100644 index 6434f6592884..000000000000 --- a/kde-apps/cantor/files/cantor-15.12.3-qt56.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 683418b3663ddc588c44063cc11abb20970e8e08 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Thu, 2 Jun 2016 08:56:43 +0200 -Subject: [PATCH] Fix compilation error "qobject.h:300:9: error: static - assertion failed: Signal and slot arguments are not compatible." - -(cherry picked from commit 841b6f6e19d829d6ab9ee13a5d4b0bcc9f1ee2df) ---- - src/worksheettextitem.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/worksheettextitem.cpp b/src/worksheettextitem.cpp -index 503153c..493ed48 100644 ---- a/src/worksheettextitem.cpp -+++ b/src/worksheettextitem.cpp -@@ -180,7 +180,7 @@ void WorksheetTextItem::populateMenu(QMenu *menu, const QPointF& pos) - QKeyEvent* WorksheetTextItem::eventForStandardAction(KStandardAction::StandardAction actionID) - { - // there must be a better way to get the shortcut... -- QAction * action = KStandardAction::create(actionID, this, 0, this); -+ QAction * action = KStandardAction::create(actionID, this, SLOT(copy()), this); - QKeySequence keySeq = action->shortcut(); - // we do not support key sequences with multiple keys here - int code = keySeq[0]; --- -2.7.3 - diff --git a/kde-apps/cantor/files/cantor-15.12.3-tests.patch b/kde-apps/cantor/files/cantor-15.12.3-tests.patch deleted file mode 100644 index 5cea78d6c3a6..000000000000 --- a/kde-apps/cantor/files/cantor-15.12.3-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/backends/maxima/CMakeLists.txt 2016-03-21 02:16:05.549024821 +0100 -+++ b/src/backends/maxima/CMakeLists.txt 2016-03-21 02:22:07.951014021 +0100 -@@ -21,12 +21,14 @@ - target_link_libraries(cantor_maximabackend KF5::Pty) - endif(NOT WIN32) - -+if (BUILD_TESTING) - add_executable( testmaxima testmaxima.cpp) - target_link_libraries( testmaxima - cantorlibs - cantortest - ${QTTEST_LIBRARY} - ) -+endif() - - install( FILES cantor_maxima.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) - install( FILES keywords.xml cantor-initmaxima.lisp DESTINATION ${KDE_INSTALL_DATADIR}/cantor/maximabackend) ---- a/src/backends/sage/CMakeLists.txt 2016-03-21 01:23:19.251791138 +0100 -+++ b/src/backends/sage/CMakeLists.txt 2016-03-21 01:27:16.300827617 +0100 -@@ -17,12 +17,14 @@ - - target_link_libraries( cantor_sagebackend KF5::Pty) - -+if (BUILD_TESTING) - add_executable( testsage testsage.cpp) - target_link_libraries( testsage - ${QT_QTTEST_LIBRARY} - cantorlibs - cantortest - ) -+endif() - - install( FILES cantor_sage.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) - install( FILES keywords.xml DESTINATION ${KDE_INSTALL_DATADIR}/cantor/sagebackend) ---- a/src/backends/python2/CMakeLists.txt 2016-03-21 01:28:39.055793038 +0100 -+++ b/src/backends/python2/CMakeLists.txt 2016-03-21 01:35:01.451012440 +0100 -@@ -20,10 +20,12 @@ - cantor_pythonbackend - ) - -+if (BUILD_TESTING) - add_executable(testpython2 testpython2.cpp) - target_link_libraries(testpython2 ${QT_QTTEST_LIBRARY} cantorlibs cantortest) - - add_test(NAME testpython2 COMMAND testpython2) -+endif() - - install(FILES cantor_python2.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) - install(FILES python2backend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) |