Fix patches

4 files changed, 26 insertions, 52 deletions

diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 1953ef7..3eec824 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -5,12 +5,11 @@ Forwarded: not-needed
 For more information about DebianABIManager, refer to
 /usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
 
-Index: kde-baseapps/CMakeLists.txt
-===================================================================
---- kde-baseapps.orig/CMakeLists.txt	2013-09-25 10:54:47.035271854 +0000
-+++ kde-baseapps/CMakeLists.txt	2013-09-25 10:56:01.880338522 +0000
-@@ -63,3 +63,4 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,3 +57,5 @@ add_subdirectory( konq-plugins )
+ # endif ()
  
  feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
++
 +include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/kubuntu_folderview_livecd_directory.diff b/debian/patches/kubuntu_folderview_livecd_directory.diff
deleted file mode 100644
index 7a9789b..0000000
--- a/debian/patches/kubuntu_folderview_livecd_directory.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Set folderview to point at Desktop folder if running from a live CD.
-Author: Jonathan Riddell <jriddell@ubuntu.com>
-Origin: vendor
-Forwaded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/613834
-Index: kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp
-===================================================================
---- kde-baseapps-4.10.3.orig/plasma/applets/folderview/folderview.cpp	2013-05-13 10:17:46.000000000 +0000
-+++ kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp	2013-05-13 10:17:46.000000000 +0000
-@@ -27,6 +27,7 @@
- #include <QGraphicsSceneDragDropEvent>
- #include <QImageReader>
- #include <QItemSelectionModel>
-+#include <QFile>
- 
- #include <KAction>
- #include <KAuthorized>
-@@ -430,6 +431,10 @@
-                 path = QString("desktop:/");
-             }
-         }
-+
-+        if (QFile::exists("/usr/share/applications/kde4/oem-config-prepare-kde.desktop") || QFile::exists("/usr/share/applications/kde4/ubiquity-kdeui.desktop")) {
-+            path = QString("desktop:/");
-+        }
-         setUrl(cg.readEntry("url", KUrl(path)));
-     }
- 
diff --git a/debian/patches/kubuntu_ignore-tests.diff b/debian/patches/kubuntu_ignore-tests.diff
index d0d06ae..9087ff4 100644
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ b/debian/patches/kubuntu_ignore-tests.diff
@@ -10,31 +10,37 @@ Index: kde-baseapps-15.08.0/konqueror/src/tests/CMakeLists.txt
 ===================================================================
 --- kde-baseapps-15.08.0.orig/konqueror/src/tests/CMakeLists.txt
 +++ kde-baseapps-15.08.0/konqueror/src/tests/CMakeLists.txt
-@@ -9,12 +9,6 @@ kde4_add_executable(centralwidget TEST c
- target_link_libraries(centralwidget konq ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
-                       ${QT_QTTEST_LIBRARY})
+@@ -13,14 +13,6 @@ ecm_mark_as_test(centralwidget)
+ target_link_libraries(centralwidget KF5::Konq KF5::KDELibs4Support Qt5::Core Qt5::Gui
+                       Qt5::Test)
  
 -########### konqviewmgrtest ###############
 -
--kde4_add_unit_test(konqviewmgrtest TEST konqviewmgrtest.cpp)
--target_link_libraries(konqviewmgrtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
--                      ${KDE4_KHTML_LIBS} ${QT_QTTEST_LIBRARY})
+-add_executable(konqviewmgrtest konqviewmgrtest.cpp)
+-add_test(konqviewmgrtest konqviewmgrtest)
+-ecm_mark_as_test(konqviewmgrtest)
+-target_link_libraries(konqviewmgrtest kdeinit_konqueror Qt5::Core Qt5::Gui
+-                      KF5::KHtml Qt5::Test)
 -
  ########### historymanagertest ###############
  
- kde4_add_unit_test(historymanagertest historymanagertest.cpp)
-@@ -25,14 +19,4 @@ target_link_libraries(historymanagertest
- kde4_add_unit_test(undomanagertest undomanagertest.cpp)
- target_link_libraries(undomanagertest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+ add_executable(historymanagertest historymanagertest.cpp)
+@@ -35,18 +27,4 @@ add_test(undomanagertest undomanagertest
+ ecm_mark_as_test(undomanagertest)
+ target_link_libraries(undomanagertest kdeinit_konqueror Qt5::Core Qt5::Test)
  
 -########### konqhtmltest ###############
 -
--kde4_add_unit_test(konqhtmltest konqhtmltest.cpp)
--target_link_libraries(konqhtmltest kdeinit_konqueror ${KDE4_KHTML_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+-add_executable(konqhtmltest konqhtmltest.cpp)
+-add_test(konqhtmltest konqhtmltest)
+-ecm_mark_as_test(konqhtmltest)
+-target_link_libraries(konqhtmltest kdeinit_konqueror KF5::KHtml Qt5::Core Qt5::Test)
 -
 -########### konqviewtest ###############
 -
--kde4_add_unit_test(konqviewtest konqviewtest.cpp)
--target_link_libraries(konqviewtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+-add_executable(konqviewtest konqviewtest.cpp)
+-add_test(konqviewtest konqviewtest)
+-ecm_mark_as_test(konqviewtest)
+-target_link_libraries(konqviewtest kdeinit_konqueror Qt5::Core Qt5::Test)
 -
  endif (NOT WIN32)
diff --git a/debian/patches/series b/debian/patches/series
index ccc035c..d121500 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
+kubuntu_ignore-tests.diff
 enable_debianabimanager.diff
 enable_dlrestrictions.diff
-kubuntu_folderview_livecd_directory.diff
-kubuntu_folderwidget_drawing.diff
 # kubuntu_install_flash.diff
-kubuntu_disable-failing-test.diff
-kubuntu_ignore-tests.diff