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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205 | diff --git a/debian/patches/enable_dlrestrictions.diff b/debian/patches/enable_dlrestrictions.diff
index f74a9b0..a907f7e 100644
--- a/debian/patches/enable_dlrestrictions.diff
+++ b/debian/patches/enable_dlrestrictions.diff
@@ -7,11 +7,9 @@ Last-Update: 2011-05-25
Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
not stable and structures frequently conflict.
-Index: kde-baseapps/CMakeLists.txt
-===================================================================
---- kde-baseapps.orig/CMakeLists.txt 2013-09-25 11:01:28.931521848 +0000
-+++ kde-baseapps/CMakeLists.txt 2013-09-25 11:02:24.045362189 +0000
-@@ -64,3 +64,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,3 +59,10 @@ add_subdirectory( konq-plugins )
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_disable-failing-test.diff b/debian/patches/kubuntu_disable-failing-test.diff
deleted file mode 100644
index e50df7c..0000000
--- a/debian/patches/kubuntu_disable-failing-test.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: kde-baseapps-14.12.3/lib/konq/tests/CMakeLists.txt
-===================================================================
---- kde-baseapps-14.12.3.orig/lib/konq/tests/CMakeLists.txt
-+++ kde-baseapps-14.12.3/lib/konq/tests/CMakeLists.txt
-@@ -14,13 +14,4 @@ kde4_add_unit_test(konqpopupmenutest kon
- target_link_libraries(konqpopupmenutest konq ${KDE4_KFILE_LIBS}
- ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
-
--########### favicontest ###############
--
--set(favicontest_SRCS favicontest.cpp)
--qt4_add_dbus_interface(favicontest_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../favicons/org.kde.FavIcon.xml favicon_interface)
--kde4_add_unit_test(favicontest ${favicontest_SRCS})
--
--target_link_libraries(favicontest konq ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBRARY} ${QT_QTCORE_LIBRARY}
-- ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTTEST_LIBRARY})
--
- ############################################
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_folderwidget_drawing.diff b/debian/patches/kubuntu_folderwidget_drawing.diff
deleted file mode 100644
index 2d54eb6..0000000
--- a/debian/patches/kubuntu_folderwidget_drawing.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: kde-baseapps-4.10.3/plasma/applets/folderview/iconview.cpp
-===================================================================
---- kde-baseapps-4.10.3.orig/plasma/applets/folderview/iconview.cpp 2013-05-13 10:18:05.000000000 +0000
-+++ kde-baseapps-4.10.3/plasma/applets/folderview/iconview.cpp 2013-05-13 10:18:05.000000000 +0000
-@@ -2510,22 +2510,16 @@
- pixmap.fill(Qt::transparent);
-
- QStyleOptionViewItemV4 option = viewOptions();
-- // ### We can't draw the items as selected or hovered since Qt doesn't
-- // use an ARGB window for the drag pixmap.
-- //option.state |= QStyle::State_Selected;
-- option.state &= ~(QStyle::State_Selected | QStyle::State_MouseOver);
-+ option.state |= QStyle::State_Selected;
-
- QPainter p(&pixmap);
- foreach (const QModelIndex &index, indexes)
- {
- option.rect = visualRect(index).translated(-boundingRect.topLeft());
--#if 0
-- // ### Reenable this code when Qt uses an ARGB window for the drag pixmap
- if (index == m_hoveredIndex)
- option.state |= QStyle::State_MouseOver;
- else
- option.state &= ~QStyle::State_MouseOver;
--#endif
- paintItem(&p, option, index);
- }
- p.end();
diff --git a/debian/patches/kubuntu_ignore-tests.diff b/debian/patches/kubuntu_ignore-tests.diff
deleted file mode 100644
index d0d06ae..0000000
--- a/debian/patches/kubuntu_ignore-tests.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: ignore failing tests
- ignore tests failing due to switch to plasma 5
-Author: Jonathan Riddell
-Origin: me
-Forwarded: nope
-Last-Update: 2015-09-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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})
-
--########### 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})
--
- ########### 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})
-
--########### konqhtmltest ###############
--
--kde4_add_unit_test(konqhtmltest konqhtmltest.cpp)
--target_link_libraries(konqhtmltest kdeinit_konqueror ${KDE4_KHTML_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
--
--########### konqviewtest ###############
--
--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 ccc035c..839028d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
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
diff --git a/debian/patches/upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch b/debian/patches/upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch
deleted file mode 100644
index cc0997d..0000000
--- a/debian/patches/upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 270d2affaafcc9e87ba14f82bfe579e22607e2d2 Mon Sep 17 00:00:00 2001
-From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
-Date: Thu, 30 Apr 2015 10:12:24 +0200
-Subject: [PATCH] Use user-places.xbel instead of bookmarks.xml in places
- model.
-
-FIXED-IN: 15.04.1
-CCBUG: 345174
----
- dolphin/src/panels/places/placesitemmodel.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dolphin/src/panels/places/placesitemmodel.cpp b/dolphin/src/panels/places/placesitemmodel.cpp
-index 637bfc1..1702757 100644
---- a/dolphin/src/panels/places/placesitemmodel.cpp
-+++ b/dolphin/src/panels/places/placesitemmodel.cpp
-@@ -85,8 +85,8 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
- Baloo::IndexerConfig config;
- m_fileIndexingEnabled = config.fileIndexingEnabled();
- #endif
-- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
-- m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
-+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel";
-+ m_bookmarkManager = KBookmarkManager::managerForExternalFile(file);
-
- createSystemBookmarks();
- initializeAvailableDevices();
---
-2.1.4
-
|