1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133 | commit 712f35b26c74bbc9d67bdf81ad15c10352c34fff
Author: Simon Quigley <tsimonq2@ubuntu.com>
Date: Wed Aug 3 20:34:55 2016 -0500
Revert "Fix patches"
This reverts commit c6d67e5ff88332f34f11ef3d4ddaaa213b905166.
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 3eec824..1953ef7 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -5,11 +5,12 @@ Forwarded: not-needed
For more information about DebianABIManager, refer to
/usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,3 +57,5 @@ add_subdirectory( konq-plugins )
- # endif ()
+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 @@
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
new file mode 100644
index 0000000..7a9789b
--- /dev/null
+++ b/debian/patches/kubuntu_folderview_livecd_directory.diff
@@ -0,0 +1,28 @@
+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 9087ff4..d0d06ae 100644
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ b/debian/patches/kubuntu_ignore-tests.diff
@@ -10,37 +10,31 @@ 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
-@@ -13,14 +13,6 @@ ecm_mark_as_test(centralwidget)
- target_link_libraries(centralwidget KF5::Konq KF5::KDELibs4Support Qt5::Core Qt5::Gui
- Qt5::Test)
+@@ -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})
-########### konqviewmgrtest ###############
-
--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)
+-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})
-
########### historymanagertest ###############
- 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)
+ 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})
-########### konqhtmltest ###############
-
--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)
+-kde4_add_unit_test(konqhtmltest konqhtmltest.cpp)
+-target_link_libraries(konqhtmltest kdeinit_konqueror ${KDE4_KHTML_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
-
-########### konqviewtest ###############
-
--add_executable(konqviewtest konqviewtest.cpp)
--add_test(konqviewtest konqviewtest)
--ecm_mark_as_test(konqviewtest)
--target_link_libraries(konqviewtest kdeinit_konqueror Qt5::Core Qt5::Test)
+-kde4_add_unit_test(konqviewtest konqviewtest.cpp)
+-target_link_libraries(konqviewtest kdeinit_konqueror ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
-
endif (NOT WIN32)
diff --git a/debian/patches/series b/debian/patches/series
index d121500..ccc035c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,7 @@
-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
|