summaryrefslogtreecommitdiff
path: root/kde-base/kdelibs/files
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-04-28 09:33:21 +0200
committerJohannes Huber <johu@gentoo.org>2016-04-28 09:33:21 +0200
commitf3c83699277b9f82ee2b861ef99f7820f1e2c26f (patch)
tree6af838814caa6d3c07e6e1675c237b81ec56bb72 /kde-base/kdelibs/files
parent8499bef3721a34b0c33048f8c5082d58347eb292 (diff)
downloadkde-f3c83699277b9f82ee2b861ef99f7820f1e2c26f.tar.gz
kde-f3c83699277b9f82ee2b861ef99f7820f1e2c26f.tar.bz2
kde-f3c83699277b9f82ee2b861ef99f7820f1e2c26f.zip
kde-base/kdelibs: Remove package
Deprecated. Stable and testing versions in gentoo main tree available.
Diffstat (limited to 'kde-base/kdelibs/files')
-rw-r--r--kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch18
-rw-r--r--kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch30
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch51
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch38
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch16
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch27
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch46
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch12
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch19
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch18
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch20
11 files changed, 0 insertions, 295 deletions
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
deleted file mode 100644
index c12c2aba9ae..00000000000
--- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running
-KDE4 applications outside of KDE4 environment.
-
-Index: kded/vfolder_menu.cpp
-===================================================================
---- a/kded/vfolder_menu.cpp (revision 1014368)
-+++ b/kded/vfolder_menu.cpp (working copy)
-@@ -770,7 +770,9 @@
- QString result;
-
- QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
-- if (!xdgMenuPrefix.isEmpty())
-+ if (xdgMenuPrefix.isEmpty())
-+ xdgMenuPrefix = "kde-4-";
-+
- {
- QFileInfo fileInfo(fileName);
-
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
deleted file mode 100644
index 074847ae995..00000000000
--- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Set up XDG_CONFIG_DIRS lookup in order:
-1. custom XDG_CONFIG_DIRS from env
-2. kdeprefix xdg config dirs
-3. /etc/xdg
-
-Index: kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- a/kdecore/kernel/kstandarddirs.cpp (revision 1014759)
-+++ b/kdecore/kernel/kstandarddirs.cpp (working copy)
-@@ -1664,16 +1664,13 @@
- {
- tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));
- }
-- else
-- {
-- xdgdirList.clear();
-- xdgdirList.append(QString::fromLatin1("/etc/xdg"));
-+
- #ifdef Q_WS_WIN
-- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
-+ xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
- #else
-- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
-+ xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
- #endif
-- }
-+ xdgdirList.append(QString::fromLatin1("/etc/xdg"));
-
- QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
- if (!localXdgDir.isEmpty())
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
deleted file mode 100644
index 63e9b308838..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-udisks1 is deprecated and going away, so removing this clause
-will permit us to build without udisks at all.
-
---- a/solid/solid/CMakeLists.txt
-+++ b/solid/solid/CMakeLists.txt
-@@ -283,20 +283,6 @@
- backends/udisks2/udisksgenericinterface.cpp
- backends/udisks2/dbus/manager.cpp
- )
-- else ( WITH_SOLID_UDISKS2 )
-- message(STATUS "Building Solid UDisks backend." )
-- set(solid_LIB_SRCS ${solid_LIB_SRCS}
-- backends/udisks/udisksmanager.cpp
-- backends/udisks/udisksdevice.cpp
-- backends/udisks/udisksblock.cpp
-- backends/udisks/udisksstoragevolume.cpp
-- backends/udisks/udisksdeviceinterface.cpp
-- backends/udisks/udisksopticaldisc.cpp
-- backends/udisks/udisksopticaldrive.cpp
-- backends/udisks/udisksstoragedrive.cpp
-- backends/udisks/udisksstorageaccess.cpp
-- backends/udisks/udisksgenericinterface.cpp
-- )
- endif ( WITH_SOLID_UDISKS2 )
- endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
---- a/solid/solid/managerbase.cpp
-+++ b/solid/solid/managerbase.cpp
-@@ -33,8 +33,6 @@
- #include "backends/hal/halmanager.h"
- #if defined (WITH_SOLID_UDISKS2)
- #include "backends/udisks2/udisksmanager.h"
--#else
--#include "backends/udisks/udisksmanager.h"
- #endif
- #include "backends/upower/upowermanager.h"
-
-@@ -88,11 +86,9 @@
- m_backends << new Solid::Backends::UDev::UDevManager(0);
- # endif
- # if defined(WITH_SOLID_UDISKS2)
-- m_backends << new Solid::Backends::UDisks2::Manager(0)
--# else
-- m_backends << new Solid::Backends::UDisks::UDisksManager(0)
-+ m_backends << new Solid::Backends::UDisks2::Manager(0);
- # endif
-- << new Solid::Backends::UPower::UPowerManager(0)
-+ m_backends << new Solid::Backends::UPower::UPowerManager(0)
- << new Solid::Backends::Fstab::FstabManager(0);
- }
- # endif
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
deleted file mode 100644
index dcd27a5762c..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
-Gentoo-bug: 562746
-
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
-+if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake
-+ PATHS
-+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
-+ /usr/bin
-+ NO_DEFAULT_PATH
-+ DOC "The qmake executable for the Qt installation to use"
-+ )
-+else()
- FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
- $ENV{QTDIR}/bin
- DOC "The qmake executable for the Qt installation to use"
- )
-+endif()
-
- IF (QT_QMAKE_EXECUTABLE)
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
deleted file mode 100644
index 3f571d63a03..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid build failure due to harmless warnings on some platforms (eg. ARM) being
-forced fatal.
-
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1100,8 +1100,8 @@
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
-- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-
- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
deleted file mode 100644
index 38cac84f620..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Remove fake MIME types that cause warnings.
-
-The offending MIME types are commented out rather than
-physically removed because doing so would cause the patch
-to be too large.
-
---- a/mimetypes/kde.xml
-+++ b/mimetypes/kde.xml
-@@ -1784,7 +1784,8 @@
- <glob pattern="*.abc"/>
- </mime-type>
-
-- <!-- all/ fake mime types -->
-+ <!--
-+ all/ fake mime types
- <mime-type type="all/all">
- <comment>all files and folders</comment>
- <comment xml:lang="ar">كل الملفات و المجلدات</comment>
-@@ -1901,7 +1902,7 @@
- <comment xml:lang="zh_CN">全部文件</comment>
- <comment xml:lang="zh_TW">所有檔案</comment>
- </mime-type>
--
-+ -->
- <mime-type type="application/vnd.kde.fontspackage">
- <sub-class-of type="application/zip"/>
- <comment>fonts package</comment>
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
deleted file mode 100644
index 006ca00a458..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp
---- a/kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500
-+++ b/kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500
-@@ -68,7 +68,7 @@ namespace KKeyServer {
- #ifdef QT_MAC_USE_COCOA
- static TISInputSourceRef lastLayout = 0;
- #else
-- static KeyboardLayoutRef lastLayout = NULL;
-+ static TISInputSourceRef lastLayout = NULL;
- #endif
-
- void updateScancodes() {
-@@ -125,16 +125,27 @@ namespace KKeyServer {
- #endif
- lastLayout = layout;
- scancodes.clear();
-- void *kchr;
-- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) {
-+ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData);
-+ if (uchr == NULL) {
- kWarning() << "Couldn't load active keyboard layout";
- } else {
- for (int i = 0; i < 128; i++) {
- UInt32 tmpState = 0;
-- UInt32 chr = KeyTranslate(kchr, i, &tmpState);
-- if (chr && chr != kFunctionKeyCharCode) {
-- scancodes.insert(chr, i);
-- }
-+ UInt32 deadKeyState = 0;
-+ UInt32 flags = 0;
-+ UniCharCount maxStringLength = 255;
-+ UniCharCount actualStringLength = 0;
-+ UniChar unicodeString[maxStringLength];
-+
-+ UCKeyTranslate(uchr, i, kUCKeyActionDown,
-+ flags, LMGetKbdType(),
-+ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString);
-+ fprintf(stderr, "Got key: %s\n", unicodeString);
-+ fflush(stderr);
-+ //UInt32 chr = KeyTranslate(kchr, i, &tmpState);
-+ //if (chr && chr != kFunctionKeyCharCode) {
-+ // scancodes.insert(chr, i);
-+ //}
- }
- }
- }
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch
deleted file mode 100644
index 0d25ada337b..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl
---- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl 2008-05-21 13:07:13.000000000 +0200
-+++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl 2010-07-08 23:32:28.184204481 +0200
-@@ -35,7 +35,7 @@
- </entry>
- </xsl:template>
-
--<xsl:template match="sect*/title|emphasis">
-+<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis">
- <entry header="2">
- <xsl:apply-templates/>
- </entry>
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
deleted file mode 100644
index 4b34f62c2be..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt
---- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200
-+++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200
-@@ -170,15 +170,6 @@
- install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR})
- endif (NOT WIN32)
-
--if (CMAKE_SYSTEM_NAME MATCHES Linux)
-- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
-- set(KDEINIT_OOM_PROTECT 1)
-- install(CODE "
-- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\")
-- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\")
-- ")
--endif (CMAKE_SYSTEM_NAME MATCHES Linux)
--
- ########### install files ###############
-
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch
deleted file mode 100644
index 83d5576ac02..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 22:55:52.000000000 +0100
-+++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:59.452942648 +0100
-@@ -1045,7 +1045,13 @@
-
- set(CMAKE_SKIP_BUILD_RPATH FALSE)
- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
-+ # the RPATH to be used when installing
-+ SET(CMAKE_INSTALL_RPATH "")
-+
-+ # don't add the automatically determined parts of the RPATH
-+ # which point to directories outside the build tree to the install RPATH
-+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
- endif (APPLE)
- endif (UNIX)
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch
deleted file mode 100644
index b094d12f722..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1204,7 +1204,7 @@
- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-
-- 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")
-+ 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")
- # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
- 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")
-
-@@ -1295,7 +1295,7 @@
- endif(NOT _compile_result)
-
- if (GCC_IS_NEWER_THAN_4_2)
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden")
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
- endif (GCC_IS_NEWER_THAN_4_2)
- else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32)
- set (__KDE_HAVE_GCC_VISIBILITY 0)