1 |
commit: f3c83699277b9f82ee2b861ef99f7820f1e2c26f |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 28 07:33:21 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 28 07:33:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3c83699 |
7 |
|
8 |
kde-base/kdelibs: Remove package |
9 |
|
10 |
Deprecated. Stable and testing versions in gentoo main tree available. |
11 |
|
12 |
.../dist/01_gentoo_set_xdg_menu_prefix-1.patch | 18 -- |
13 |
.../dist/02_gentoo_append_xdg_config_dirs-1.patch | 30 --- |
14 |
kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch | 51 ---- |
15 |
.../kdelibs/files/kdelibs-4.14.13-FindQt4.patch | 38 --- |
16 |
.../files/kdelibs-4.14.5-fatalwarnings.patch | 16 -- |
17 |
.../kdelibs/files/kdelibs-4.14.5-mimetypes.patch | 27 -- |
18 |
.../kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch | 46 ---- |
19 |
kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch | 12 - |
20 |
.../files/kdelibs-4.6.3-no_suid_kdeinit.patch | 19 -- |
21 |
kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch | 18 -- |
22 |
kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch | 20 -- |
23 |
kde-base/kdelibs/kdelibs-4.9999.ebuild | 300 --------------------- |
24 |
kde-base/kdelibs/metadata.xml | 11 - |
25 |
13 files changed, 606 deletions(-) |
26 |
|
27 |
diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch |
28 |
deleted file mode 100644 |
29 |
index c12c2ab..0000000 |
30 |
--- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch |
31 |
+++ /dev/null |
32 |
@@ -1,18 +0,0 @@ |
33 |
-Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running |
34 |
-KDE4 applications outside of KDE4 environment. |
35 |
- |
36 |
-Index: kded/vfolder_menu.cpp |
37 |
-=================================================================== |
38 |
---- a/kded/vfolder_menu.cpp (revision 1014368) |
39 |
-+++ b/kded/vfolder_menu.cpp (working copy) |
40 |
-@@ -770,7 +770,9 @@ |
41 |
- QString result; |
42 |
- |
43 |
- QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX")); |
44 |
-- if (!xdgMenuPrefix.isEmpty()) |
45 |
-+ if (xdgMenuPrefix.isEmpty()) |
46 |
-+ xdgMenuPrefix = "kde-4-"; |
47 |
-+ |
48 |
- { |
49 |
- QFileInfo fileInfo(fileName); |
50 |
- |
51 |
|
52 |
diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch |
53 |
deleted file mode 100644 |
54 |
index 074847a..0000000 |
55 |
--- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch |
56 |
+++ /dev/null |
57 |
@@ -1,30 +0,0 @@ |
58 |
-Set up XDG_CONFIG_DIRS lookup in order: |
59 |
-1. custom XDG_CONFIG_DIRS from env |
60 |
-2. kdeprefix xdg config dirs |
61 |
-3. /etc/xdg |
62 |
- |
63 |
-Index: kdecore/kernel/kstandarddirs.cpp |
64 |
-=================================================================== |
65 |
---- a/kdecore/kernel/kstandarddirs.cpp (revision 1014759) |
66 |
-+++ b/kdecore/kernel/kstandarddirs.cpp (working copy) |
67 |
-@@ -1664,16 +1664,13 @@ |
68 |
- { |
69 |
- tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR))); |
70 |
- } |
71 |
-- else |
72 |
-- { |
73 |
-- xdgdirList.clear(); |
74 |
-- xdgdirList.append(QString::fromLatin1("/etc/xdg")); |
75 |
-+ |
76 |
- #ifdef Q_WS_WIN |
77 |
-- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); |
78 |
-+ xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); |
79 |
- #else |
80 |
-- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); |
81 |
-+ xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); |
82 |
- #endif |
83 |
-- } |
84 |
-+ xdgdirList.append(QString::fromLatin1("/etc/xdg")); |
85 |
- |
86 |
- QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); |
87 |
- if (!localXdgDir.isEmpty()) |
88 |
|
89 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch |
90 |
deleted file mode 100644 |
91 |
index 63e9b30..0000000 |
92 |
--- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch |
93 |
+++ /dev/null |
94 |
@@ -1,51 +0,0 @@ |
95 |
-udisks1 is deprecated and going away, so removing this clause |
96 |
-will permit us to build without udisks at all. |
97 |
- |
98 |
---- a/solid/solid/CMakeLists.txt |
99 |
-+++ b/solid/solid/CMakeLists.txt |
100 |
-@@ -283,20 +283,6 @@ |
101 |
- backends/udisks2/udisksgenericinterface.cpp |
102 |
- backends/udisks2/dbus/manager.cpp |
103 |
- ) |
104 |
-- else ( WITH_SOLID_UDISKS2 ) |
105 |
-- message(STATUS "Building Solid UDisks backend." ) |
106 |
-- set(solid_LIB_SRCS ${solid_LIB_SRCS} |
107 |
-- backends/udisks/udisksmanager.cpp |
108 |
-- backends/udisks/udisksdevice.cpp |
109 |
-- backends/udisks/udisksblock.cpp |
110 |
-- backends/udisks/udisksstoragevolume.cpp |
111 |
-- backends/udisks/udisksdeviceinterface.cpp |
112 |
-- backends/udisks/udisksopticaldisc.cpp |
113 |
-- backends/udisks/udisksopticaldrive.cpp |
114 |
-- backends/udisks/udisksstoragedrive.cpp |
115 |
-- backends/udisks/udisksstorageaccess.cpp |
116 |
-- backends/udisks/udisksgenericinterface.cpp |
117 |
-- ) |
118 |
- endif ( WITH_SOLID_UDISKS2 ) |
119 |
- endif (CMAKE_SYSTEM_NAME MATCHES Linux) |
120 |
- |
121 |
---- a/solid/solid/managerbase.cpp |
122 |
-+++ b/solid/solid/managerbase.cpp |
123 |
-@@ -33,8 +33,6 @@ |
124 |
- #include "backends/hal/halmanager.h" |
125 |
- #if defined (WITH_SOLID_UDISKS2) |
126 |
- #include "backends/udisks2/udisksmanager.h" |
127 |
--#else |
128 |
--#include "backends/udisks/udisksmanager.h" |
129 |
- #endif |
130 |
- #include "backends/upower/upowermanager.h" |
131 |
- |
132 |
-@@ -88,11 +86,9 @@ |
133 |
- m_backends << new Solid::Backends::UDev::UDevManager(0); |
134 |
- # endif |
135 |
- # if defined(WITH_SOLID_UDISKS2) |
136 |
-- m_backends << new Solid::Backends::UDisks2::Manager(0) |
137 |
--# else |
138 |
-- m_backends << new Solid::Backends::UDisks::UDisksManager(0) |
139 |
-+ m_backends << new Solid::Backends::UDisks2::Manager(0); |
140 |
- # endif |
141 |
-- << new Solid::Backends::UPower::UPowerManager(0) |
142 |
-+ m_backends << new Solid::Backends::UPower::UPowerManager(0) |
143 |
- << new Solid::Backends::Fstab::FstabManager(0); |
144 |
- } |
145 |
- # endif |
146 |
|
147 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch |
148 |
deleted file mode 100644 |
149 |
index dcd27a5..0000000 |
150 |
--- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch |
151 |
+++ /dev/null |
152 |
@@ -1,38 +0,0 @@ |
153 |
-Ensure that the correct version of Qt is always used. |
154 |
- |
155 |
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to |
156 |
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. |
157 |
- |
158 |
-There is no guarantee to which version of Qt these symlinks might point, so it |
159 |
-is necessary to find the correct version explicitly. |
160 |
- |
161 |
-Once qmake is found, it is queried for the correct location of all other items. |
162 |
- |
163 |
-Gentoo-bug: 562746 |
164 |
- |
165 |
---- a/cmake/modules/FindQt4.cmake |
166 |
-+++ b/cmake/modules/FindQt4.cmake |
167 |
-@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte |
168 |
- # check for qmake |
169 |
- # Debian uses qmake-qt4 |
170 |
- # macports' Qt uses qmake-mac |
171 |
-+if(CMAKE_BUILD_TYPE STREQUAL Gentoo) |
172 |
-+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake |
173 |
-+ PATHS |
174 |
-+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin |
175 |
-+ /usr/bin |
176 |
-+ NO_DEFAULT_PATH |
177 |
-+ DOC "The qmake executable for the Qt installation to use" |
178 |
-+ ) |
179 |
-+else() |
180 |
- FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS |
181 |
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" |
182 |
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" |
183 |
-@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS |
184 |
- $ENV{QTDIR}/bin |
185 |
- DOC "The qmake executable for the Qt installation to use" |
186 |
- ) |
187 |
-+endif() |
188 |
- |
189 |
- IF (QT_QMAKE_EXECUTABLE) |
190 |
- |
191 |
|
192 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch |
193 |
deleted file mode 100644 |
194 |
index 3f571d6..0000000 |
195 |
--- a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch |
196 |
+++ /dev/null |
197 |
@@ -1,16 +0,0 @@ |
198 |
-Avoid build failure due to harmless warnings on some platforms (eg. ARM) being |
199 |
-forced fatal. |
200 |
- |
201 |
---- a/cmake/modules/FindKDE4Internal.cmake |
202 |
-+++ b/cmake/modules/FindKDE4Internal.cmake |
203 |
-@@ -1100,8 +1100,8 @@ |
204 |
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) |
205 |
- if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") |
206 |
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE) |
207 |
-- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
208 |
-- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") |
209 |
-+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") |
210 |
-+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") |
211 |
- |
212 |
- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") |
213 |
- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") |
214 |
|
215 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch |
216 |
deleted file mode 100644 |
217 |
index 38cac84..0000000 |
218 |
--- a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch |
219 |
+++ /dev/null |
220 |
@@ -1,27 +0,0 @@ |
221 |
-Remove fake MIME types that cause warnings. |
222 |
- |
223 |
-The offending MIME types are commented out rather than |
224 |
-physically removed because doing so would cause the patch |
225 |
-to be too large. |
226 |
- |
227 |
---- a/mimetypes/kde.xml |
228 |
-+++ b/mimetypes/kde.xml |
229 |
-@@ -1784,7 +1784,8 @@ |
230 |
- <glob pattern="*.abc"/> |
231 |
- </mime-type> |
232 |
- |
233 |
-- <!-- all/ fake mime types --> |
234 |
-+ <!-- |
235 |
-+ all/ fake mime types |
236 |
- <mime-type type="all/all"> |
237 |
- <comment>all files and folders</comment> |
238 |
- <comment xml:lang="ar">كل الملفات و المجلدات</comment> |
239 |
-@@ -1901,7 +1902,7 @@ |
240 |
- <comment xml:lang="zh_CN">全部文件</comment> |
241 |
- <comment xml:lang="zh_TW">所有檔案</comment> |
242 |
- </mime-type> |
243 |
-- |
244 |
-+ --> |
245 |
- <mime-type type="application/vnd.kde.fontspackage"> |
246 |
- <sub-class-of type="application/zip"/> |
247 |
- <comment>fonts package</comment> |
248 |
|
249 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch |
250 |
deleted file mode 100644 |
251 |
index 006ca00..0000000 |
252 |
--- a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch |
253 |
+++ /dev/null |
254 |
@@ -1,46 +0,0 @@ |
255 |
-diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp |
256 |
---- a/kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500 |
257 |
-+++ b/kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500 |
258 |
-@@ -68,7 +68,7 @@ namespace KKeyServer { |
259 |
- #ifdef QT_MAC_USE_COCOA |
260 |
- static TISInputSourceRef lastLayout = 0; |
261 |
- #else |
262 |
-- static KeyboardLayoutRef lastLayout = NULL; |
263 |
-+ static TISInputSourceRef lastLayout = NULL; |
264 |
- #endif |
265 |
- |
266 |
- void updateScancodes() { |
267 |
-@@ -125,16 +125,27 @@ namespace KKeyServer { |
268 |
- #endif |
269 |
- lastLayout = layout; |
270 |
- scancodes.clear(); |
271 |
-- void *kchr; |
272 |
-- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) { |
273 |
-+ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData); |
274 |
-+ if (uchr == NULL) { |
275 |
- kWarning() << "Couldn't load active keyboard layout"; |
276 |
- } else { |
277 |
- for (int i = 0; i < 128; i++) { |
278 |
- UInt32 tmpState = 0; |
279 |
-- UInt32 chr = KeyTranslate(kchr, i, &tmpState); |
280 |
-- if (chr && chr != kFunctionKeyCharCode) { |
281 |
-- scancodes.insert(chr, i); |
282 |
-- } |
283 |
-+ UInt32 deadKeyState = 0; |
284 |
-+ UInt32 flags = 0; |
285 |
-+ UniCharCount maxStringLength = 255; |
286 |
-+ UniCharCount actualStringLength = 0; |
287 |
-+ UniChar unicodeString[maxStringLength]; |
288 |
-+ |
289 |
-+ UCKeyTranslate(uchr, i, kUCKeyActionDown, |
290 |
-+ flags, LMGetKbdType(), |
291 |
-+ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString); |
292 |
-+ fprintf(stderr, "Got key: %s\n", unicodeString); |
293 |
-+ fflush(stderr); |
294 |
-+ //UInt32 chr = KeyTranslate(kchr, i, &tmpState); |
295 |
-+ //if (chr && chr != kFunctionKeyCharCode) { |
296 |
-+ // scancodes.insert(chr, i); |
297 |
-+ //} |
298 |
- } |
299 |
- } |
300 |
- } |
301 |
|
302 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch |
303 |
deleted file mode 100644 |
304 |
index 0d25ada..0000000 |
305 |
--- a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch |
306 |
+++ /dev/null |
307 |
@@ -1,12 +0,0 @@ |
308 |
-diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl |
309 |
---- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl 2008-05-21 13:07:13.000000000 +0200 |
310 |
-+++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl 2010-07-08 23:32:28.184204481 +0200 |
311 |
-@@ -35,7 +35,7 @@ |
312 |
- </entry> |
313 |
- </xsl:template> |
314 |
- |
315 |
--<xsl:template match="sect*/title|emphasis"> |
316 |
-+<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis"> |
317 |
- <entry header="2"> |
318 |
- <xsl:apply-templates/> |
319 |
- </entry> |
320 |
|
321 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch |
322 |
deleted file mode 100644 |
323 |
index 4b34f62..0000000 |
324 |
--- a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch |
325 |
+++ /dev/null |
326 |
@@ -1,19 +0,0 @@ |
327 |
-diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt |
328 |
---- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200 |
329 |
-+++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200 |
330 |
-@@ -170,15 +170,6 @@ |
331 |
- install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) |
332 |
- endif (NOT WIN32) |
333 |
- |
334 |
--if (CMAKE_SYSTEM_NAME MATCHES Linux) |
335 |
-- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") |
336 |
-- set(KDEINIT_OOM_PROTECT 1) |
337 |
-- install(CODE " |
338 |
-- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\") |
339 |
-- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\") |
340 |
-- ") |
341 |
--endif (CMAKE_SYSTEM_NAME MATCHES Linux) |
342 |
-- |
343 |
- ########### install files ############### |
344 |
- |
345 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) |
346 |
|
347 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch |
348 |
deleted file mode 100644 |
349 |
index 83d5576..0000000 |
350 |
--- a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch |
351 |
+++ /dev/null |
352 |
@@ -1,18 +0,0 @@ |
353 |
-diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake |
354 |
---- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 22:55:52.000000000 +0100 |
355 |
-+++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:59.452942648 +0100 |
356 |
-@@ -1045,7 +1045,13 @@ |
357 |
- |
358 |
- set(CMAKE_SKIP_BUILD_RPATH FALSE) |
359 |
- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) |
360 |
-- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
361 |
-+ |
362 |
-+ # the RPATH to be used when installing |
363 |
-+ SET(CMAKE_INSTALL_RPATH "") |
364 |
-+ |
365 |
-+ # don't add the automatically determined parts of the RPATH |
366 |
-+ # which point to directories outside the build tree to the install RPATH |
367 |
-+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) |
368 |
- endif (APPLE) |
369 |
- endif (UNIX) |
370 |
- |
371 |
|
372 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch |
373 |
deleted file mode 100644 |
374 |
index b094d12..0000000 |
375 |
--- a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch |
376 |
+++ /dev/null |
377 |
@@ -1,20 +0,0 @@ |
378 |
---- a/cmake/modules/FindKDE4Internal.cmake |
379 |
-+++ b/cmake/modules/FindKDE4Internal.cmake |
380 |
-@@ -1204,7 +1204,7 @@ |
381 |
- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") |
382 |
- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") |
383 |
- |
384 |
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") |
385 |
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") |
386 |
- # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions |
387 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") |
388 |
- |
389 |
-@@ -1295,7 +1295,7 @@ |
390 |
- endif(NOT _compile_result) |
391 |
- |
392 |
- if (GCC_IS_NEWER_THAN_4_2) |
393 |
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") |
394 |
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") |
395 |
- endif (GCC_IS_NEWER_THAN_4_2) |
396 |
- else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) |
397 |
- set (__KDE_HAVE_GCC_VISIBILITY 0) |
398 |
|
399 |
diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild |
400 |
deleted file mode 100644 |
401 |
index bcfc4d9..0000000 |
402 |
--- a/kde-base/kdelibs/kdelibs-4.9999.ebuild |
403 |
+++ /dev/null |
404 |
@@ -1,300 +0,0 @@ |
405 |
-# Copyright 1999-2016 Gentoo Foundation |
406 |
-# Distributed under the terms of the GNU General Public License v2 |
407 |
-# $Id$ |
408 |
- |
409 |
-EAPI=6 |
410 |
- |
411 |
-CMAKE_MIN_VERSION="3.3.1-r1" |
412 |
-CPPUNIT_REQUIRED="optional" |
413 |
-DECLARATIVE_REQUIRED="always" |
414 |
-OPENGL_REQUIRED="optional" |
415 |
-KDE_HANDBOOK="optional" |
416 |
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic |
417 |
- |
418 |
-EGIT_BRANCH="KDE/4.14" |
419 |
-APPS_VERSION="16.04.0" # Don't forget to bump this |
420 |
- |
421 |
-DESCRIPTION="KDE libraries needed by all KDE programs" |
422 |
-[[ ${KDE_BUILD_TYPE} != live ]] && \ |
423 |
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" |
424 |
- |
425 |
-KEYWORDS="" |
426 |
-LICENSE="LGPL-2.1" |
427 |
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k |
428 |
-kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell |
429 |
-cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" |
430 |
- |
431 |
-REQUIRED_USE=" |
432 |
- udisks? ( udev ) |
433 |
- upower? ( udev ) |
434 |
-" |
435 |
- |
436 |
-# needs the kate regression testsuite from svn |
437 |
-RESTRICT="test" |
438 |
- |
439 |
-COMMONDEPEND=" |
440 |
- >=app-misc/strigi-0.7.7 |
441 |
- app-text/docbook-xml-dtd:4.2 |
442 |
- app-text/docbook-xsl-stylesheets |
443 |
- >=dev-libs/libattica-0.4.2 |
444 |
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] |
445 |
- dev-libs/libpcre[unicode] |
446 |
- dev-libs/libxml2 |
447 |
- dev-libs/libxslt |
448 |
- media-libs/fontconfig |
449 |
- media-libs/freetype:2 |
450 |
- media-libs/giflib:= |
451 |
- media-libs/libpng:0= |
452 |
- media-libs/phonon[qt4] |
453 |
- sys-libs/zlib |
454 |
- virtual/jpeg:0 |
455 |
- >=x11-misc/shared-mime-info-0.60 |
456 |
- acl? ( virtual/acl ) |
457 |
- !aqua? ( |
458 |
- x11-libs/libICE |
459 |
- x11-libs/libSM |
460 |
- x11-libs/libX11 |
461 |
- x11-libs/libXau |
462 |
- x11-libs/libXcursor |
463 |
- x11-libs/libXdmcp |
464 |
- x11-libs/libXext |
465 |
- x11-libs/libXfixes |
466 |
- x11-libs/libXft |
467 |
- x11-libs/libXpm |
468 |
- x11-libs/libXrender |
469 |
- x11-libs/libXScrnSaver |
470 |
- x11-libs/libXtst |
471 |
- !kernel_SunOS? ( |
472 |
- || ( |
473 |
- sys-libs/libutempter |
474 |
- >=sys-freebsd/freebsd-lib-9.0 |
475 |
- ) |
476 |
- ) |
477 |
- ) |
478 |
- bzip2? ( app-arch/bzip2 ) |
479 |
- crypt? ( app-crypt/qca:2[qt4(+)] ) |
480 |
- fam? ( virtual/fam ) |
481 |
- jpeg2k? ( media-libs/jasper ) |
482 |
- kerberos? ( virtual/krb5 ) |
483 |
- openexr? ( |
484 |
- media-libs/openexr:= |
485 |
- media-libs/ilmbase:= |
486 |
- ) |
487 |
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) |
488 |
- spell? ( app-text/enchant ) |
489 |
- ssl? ( |
490 |
- libressl? ( dev-libs/libressl ) |
491 |
- !libressl? ( dev-libs/openssl:0 ) |
492 |
- ) |
493 |
- udev? ( virtual/udev ) |
494 |
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
495 |
-" |
496 |
-DEPEND="${COMMONDEPEND} |
497 |
- doc? ( app-doc/doxygen ) |
498 |
- nls? ( virtual/libintl ) |
499 |
-" |
500 |
-RDEPEND="${COMMONDEPEND} |
501 |
- !dev-qt/qtphonon |
502 |
- !<=kde-base/plasma-workspace-4.7.1:4 |
503 |
- !<=kde-base/kcontrol-4.4.50:4 |
504 |
- >=app-crypt/gnupg-2.0.11 |
505 |
- app-misc/ca-certificates |
506 |
- $(add_kdebase_dep kde-env '' 4.14.3) |
507 |
- sys-apps/dbus[X] |
508 |
- !aqua? ( |
509 |
- udisks? ( sys-fs/udisks:2 ) |
510 |
- x11-apps/iceauth |
511 |
- x11-apps/rgb |
512 |
- >=x11-misc/xdg-utils-1.0.2-r3 |
513 |
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) |
514 |
- ) |
515 |
- udev? ( app-misc/media-player-info ) |
516 |
-" |
517 |
-PDEPEND=" |
518 |
- $(add_kdebase_dep katepart '' 4.14.3) |
519 |
- || ( |
520 |
- $(add_kdeapps_dep kfmclient '' 4.14.3) |
521 |
- x11-misc/xdg-utils |
522 |
- ) |
523 |
- handbook? ( kde-apps/khelpcenter:* ) |
524 |
- policykit? ( || ( |
525 |
- >=sys-auth/polkit-kde-agent-0.99 |
526 |
- kde-plasma/polkit-kde-agent |
527 |
- ) ) |
528 |
-" |
529 |
- |
530 |
-PATCHES=( |
531 |
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
532 |
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
533 |
- "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" |
534 |
- "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" |
535 |
- "${FILESDIR}/${PN}-4.4.90-xslt.patch" |
536 |
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
537 |
- "${FILESDIR}/${PN}-4.8.1-norpath.patch" |
538 |
- "${FILESDIR}/${PN}-4.9.3-werror.patch" |
539 |
- "${FILESDIR}/${PN}-4.10.0-udisks.patch" |
540 |
- "${FILESDIR}/${PN}-4.14.13-FindQt4.patch" |
541 |
-) |
542 |
- |
543 |
-pkg_pretend() { |
544 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
545 |
- [[ $(gcc-major-version) -lt 4 ]] || \ |
546 |
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
547 |
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
548 |
- fi |
549 |
-} |
550 |
- |
551 |
-src_prepare() { |
552 |
- kde4-base_src_prepare |
553 |
- |
554 |
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
555 |
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
556 |
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
557 |
- |
558 |
- if use aqua; then |
559 |
- sed -i -e \ |
560 |
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ |
561 |
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" |
562 |
- |
563 |
- #if [[ ${CHOST} == *-darwin8 ]]; then |
564 |
- sed -i -e \ |
565 |
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ |
566 |
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" |
567 |
- #fi |
568 |
- |
569 |
- # solid/solid/backends/iokit doesn't properly link, so disable it. |
570 |
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ |
571 |
- || die "disabling solid/solid/backends/iokit failed" |
572 |
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ |
573 |
- || die "disabling solid/solid/backends/iokit failed" |
574 |
- |
575 |
- # There's no fdatasync on OSX and the check fails to detect that. |
576 |
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ |
577 |
- || die "disabling fdatasync failed" |
578 |
- |
579 |
- # Fix nameser include to nameser8_compat |
580 |
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ |
581 |
- || die "fixing nameser include failed" |
582 |
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 |
583 |
- |
584 |
- # Try to fix kkeyserver_mac |
585 |
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch |
586 |
- fi |
587 |
-} |
588 |
- |
589 |
-src_configure() { |
590 |
- local mycmakeargs=( |
591 |
- -DWITH_HSPELL=OFF |
592 |
- -DWITH_ASPELL=OFF |
593 |
- -DWITH_DNSSD=OFF |
594 |
- -DKDE_DEFAULT_HOME=.kde4 |
595 |
- -DKAUTH_BACKEND=POLKITQT-1 |
596 |
- -DBUILD_libkactivities=OFF |
597 |
- -DWITH_Soprano=OFF |
598 |
- -DWITH_SharedDesktopOntologies=OFF |
599 |
- -DBUILD_doc=$(usex handbook) |
600 |
- -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) |
601 |
- -DHAVE_PPC_ALTIVEC=$(usex altivec) |
602 |
- -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) |
603 |
- -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) |
604 |
- -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) |
605 |
- -DWITH_ACL=$(usex acl) |
606 |
- -DWITH_BZip2=$(usex bzip2) |
607 |
- -DWITH_QCA2=$(usex crypt) |
608 |
- -DWITH_FAM=$(usex fam) |
609 |
- -DWITH_Jasper=$(usex jpeg2k) |
610 |
- -DWITH_GSSAPI=$(usex kerberos) |
611 |
- -DWITH_LibLZMA=$(usex lzma) |
612 |
- -DWITH_Libintl=$(usex nls) |
613 |
- -DWITH_OpenEXR=$(usex openexr) |
614 |
- -DWITH_OpenGL=$(usex opengl) |
615 |
- -DWITH_PolkitQt-1=$(usex policykit) |
616 |
- -DWITH_ENCHANT=$(usex spell) |
617 |
- -DWITH_OpenSSL=$(usex ssl) |
618 |
- -DWITH_UDev=$(usex udev) |
619 |
- -DWITH_SOLID_UDISKS2=$(usex udisks) |
620 |
- -DWITH_Avahi=$(usex zeroconf) |
621 |
- ) |
622 |
- |
623 |
- kde4-base_src_configure |
624 |
-} |
625 |
- |
626 |
-src_compile() { |
627 |
- kde4-base_src_compile |
628 |
- |
629 |
- # The building of apidox is not managed anymore by the build system |
630 |
- if use doc; then |
631 |
- einfo "Building API documentation" |
632 |
- cd "${S}"/doc/api/ |
633 |
- ./doxygen.sh "${S}" || die "APIDOX generation failed" |
634 |
- fi |
635 |
-} |
636 |
- |
637 |
-src_install() { |
638 |
- kde4-base_src_install |
639 |
- |
640 |
- # use system certificates |
641 |
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
642 |
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
643 |
- |
644 |
- if use doc; then |
645 |
- einfo "Installing API documentation. This could take a bit of time." |
646 |
- cd "${S}"/doc/api/ |
647 |
- docinto /HTML/en/kdelibs-apidox |
648 |
- dohtml -r ${P}-apidocs/* |
649 |
- fi |
650 |
- |
651 |
- if use aqua; then |
652 |
- einfo "fixing ${PN} plugins" |
653 |
- |
654 |
- local _PV=${PV:0:3}.0 |
655 |
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script |
656 |
- |
657 |
- install_name_tool -id \ |
658 |
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
659 |
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ |
660 |
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib" |
661 |
- |
662 |
- einfo "fixing ${PN} cmake detection files" |
663 |
- #sed -i -e \ |
664 |
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ |
665 |
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ |
666 |
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ |
667 |
- || die "failed fixing FindXKB.cmake" |
668 |
- fi |
669 |
- |
670 |
- einfo Installing environment file. |
671 |
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
672 |
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
673 |
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
674 |
- doenvd "${T}/77kde" |
675 |
-} |
676 |
- |
677 |
-pkg_postinst() { |
678 |
- fdo-mime_mime_database_update |
679 |
- |
680 |
- if use zeroconf; then |
681 |
- echo |
682 |
- elog "To make zeroconf support available in KDE make sure that the avahi daemon" |
683 |
- elog "is running." |
684 |
- echo |
685 |
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
686 |
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
687 |
- einfo "to include 'mdns', e.g.:" |
688 |
- einfo " hosts: files mdns dns" |
689 |
- echo |
690 |
- fi |
691 |
- |
692 |
- kde4-base_pkg_postinst |
693 |
-} |
694 |
- |
695 |
-pkg_prerm() { |
696 |
- # Remove ksycoca4 global database |
697 |
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 |
698 |
-} |
699 |
- |
700 |
-pkg_postrm() { |
701 |
- fdo-mime_mime_database_update |
702 |
- |
703 |
- kde4-base_pkg_postrm |
704 |
-} |
705 |
|
706 |
diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml |
707 |
deleted file mode 100644 |
708 |
index 63ad9f4..0000000 |
709 |
--- a/kde-base/kdelibs/metadata.xml |
710 |
+++ /dev/null |
711 |
@@ -1,11 +0,0 @@ |
712 |
-<?xml version="1.0" encoding="UTF-8"?> |
713 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
714 |
-<pkgmetadata> |
715 |
- <maintainer type="project"> |
716 |
- <email>kde@g.o</email> |
717 |
- <name>Gentoo KDE Project</name> |
718 |
- </maintainer> |
719 |
- <use> |
720 |
- <flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag> |
721 |
- </use> |
722 |
-</pkgmetadata> |