summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-10-14 09:59:40 +0200
committerJohannes Huber <johu@gentoo.org>2016-10-14 10:22:22 +0200
commit743e84d6a370cd8ad771b20caab43c55eb1a6bb7 (patch)
tree9fb50cff3396ca298e2c51f981f8cdb2021ede9f /kde-plasma/plasma-sdk/files
parentnet-irc/hexchat: Minor correction to the previous commit. (diff)
downloadgentoo-743e84d6a370cd8ad771b20caab43c55eb1a6bb7.tar.gz
gentoo-743e84d6a370cd8ad771b20caab43c55eb1a6bb7.tar.bz2
gentoo-743e84d6a370cd8ad771b20caab43c55eb1a6bb7.zip
kde-plasma: Remove KDE Plasma 5.6.5
Package-Manager: portage-2.3.2
Diffstat (limited to 'kde-plasma/plasma-sdk/files')
-rw-r--r--kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch51
-rw-r--r--kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch32
2 files changed, 0 insertions, 83 deletions
diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
deleted file mode 100644
index e585eefceef8..000000000000
--- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-dependencies.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 56676709a8a0ecf51429bc1ac508513f72d0a761
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Mar 13 14:43:50 2016 +0100
-
- Make Qt5Test really optional, fix plasmate dependencies
-
- KF5NewStuff, KF5Parts are only required for plasmate.
- Could not push KF5ItemModels down into plasmate without breaking
- build. Is it a problem within KDevPlatform?
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b556de6..bc982ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,7 +74,7 @@ endif()
- # Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
- find_package(KF5 REQUIRED COMPONENTS
- Archive Completion Config ConfigWidgets CoreAddons DBusAddons Declarative I18n IconThemes ItemModels
-- KIO NewStuff Parts Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui WindowSystem)
-+ KIO Plasma PlasmaQuick Service TextEditor WidgetsAddons XmlGui WindowSystem)
-
- #########################################################################
-
-diff --git a/cuttlefish/CMakeLists.txt b/cuttlefish/CMakeLists.txt
-index 6eaa78a..5b90fef 100644
---- a/cuttlefish/CMakeLists.txt
-+++ b/cuttlefish/CMakeLists.txt
-@@ -2,7 +2,9 @@ project(cuttlefish)
- add_definitions(-DTRANSLATION_DOMAIN=\"cuttlefish\")
-
- add_subdirectory(src)
--add_subdirectory(autotests)
-+if(BUILD_TESTING)
-+ add_subdirectory(autotests)
-+endif()
-
-
- plasma_install_package(package org.kde.plasma.cuttlefish packages package)
-diff --git a/plasmate/CMakeLists.txt b/plasmate/CMakeLists.txt
-index 8f28ec4..4586102 100644
---- a/plasmate/CMakeLists.txt
-+++ b/plasmate/CMakeLists.txt
-@@ -13,6 +13,8 @@ add_feature_info(GIT_EXECUTABLE_FOUND "Git" "Distributed Revision Control System
-
- find_package(KF5 REQUIRED COMPONENTS
- KDELibs4Support
-+ NewStuff
-+ Parts
- )
-
- #install( FILES previewer/windowswitcher/thumbnails/konqueror.png
diff --git a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch b/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
deleted file mode 100644
index 7aa92ccbdb3c..000000000000
--- a/kde-plasma/plasma-sdk/files/plasma-sdk-5.5.5-qtwebkit-optional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,18 @@
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
--find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg WebKit WebKitWidgets Widgets Xml)
-+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core DBus Gui Qml Quick Svg Widgets Xml)
-+
-+find_package(Qt5WebKit ${QT_MIN_VERSION} CONFIG)
-+set_package_properties(Qt5WebKit PROPERTIES
-+ PURPOSE "Required for plasmate"
-+ TYPE OPTIONAL
-+ )
-+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} CONFIG)
-+set_package_properties(Qt5WebKitWidgets PROPERTIES
-+ PURPOSE "Required for plasmate"
-+ TYPE OPTIONAL
-+ )
-
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG QUIET)
- set_package_properties(Qt5Test PROPERTIES
-@@ -78,7 +89,7 @@
- add_subdirectory(themeexplorer)
- #add_subdirectory(remote-widgets-browser)
- #add_subdirectory(wallpaperviewer)
--if (KDevPlatform_FOUND)
-+if (KDevPlatform_FOUND AND Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
- add_subdirectory(plasmate)
- endif()
-
-