* [gentoo-commits] proj/kde:master commit in: kde-plasma/kde-gtk-config/files/, kde-plasma/powerdevil/files/, ...
@ 2016-09-14 18:29 Michael Palimaka
0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-09-14 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 3109857bdf1c9a936caf83095596a5a462ab524b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 18:29:09 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 18:29:13 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3109857b
kde-plasma: remove unused patches
...fig-5.7.4-look-for-cursors-in-right-place.patch | 109 -------------
.../ksysguard/files/ksysguard-5.6.5-gui.patch | 40 -----
.../powerdevil-5.6.95-wireless-optional.patch | 177 ---------------------
3 files changed, 326 deletions(-)
diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch
deleted file mode 100644
index 81da8d6..0000000
--- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.7.4-look-for-cursors-in-right-place.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit fa473a1c4572ef3c2614318b0ce7090613878005
-Author: Jason A. Donenfeld <Jason@zx2c4.com>
-Date: Tue Sep 13 04:13:47 2016 +0200
-
- cursor model: look for cursors in correct place
-
- plasma-desktop's cursor theme kcm does the right thing, by consulting
- the libXcursor library for the right search paths. Unfortunately, the
- kcm here does a pretty butchered job of it. So, we copy, more or less,
- the same algorithm used by plasma-desktop. Now there's parity in cursor
- selection.
-
- For reference, please see line 165 of:
- https://quickgit.kde.org/?p=plasma-desktop.git&a=blob&f=kcms%2Fcursortheme%2Fxcursor%2Fthememodel.cpp
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07d313c..88f5a47 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_P
-
- find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Widgets Test)
- find_package(KF5 REQUIRED COMPONENTS I18n KIO ConfigWidgets NewStuff Archive KCMUtils IconThemes)
-+find_package(X11 REQUIRED)
-
- include_directories(
- ${CMAKE_SOURCE_DIR}
-@@ -54,7 +55,7 @@ ki18n_wrap_ui(kcm_SRCS
- )
- add_library(kcm_kdegtkconfig MODULE ${kcm_SRCS})
- target_compile_definitions(kcm_kdegtkconfig PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
--target_link_libraries(kcm_kdegtkconfig KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
-+target_link_libraries(kcm_kdegtkconfig ${X11_Xcursor_LIB} KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
-
- kcoreaddons_desktop_to_json(kcm_kdegtkconfig kde-gtk-config.desktop)
-
-diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
-index 5238714..0e58230 100644
---- a/src/cursorthemesmodel.cpp
-+++ b/src/cursorthemesmodel.cpp
-@@ -24,12 +24,14 @@
- #include <QDir>
- #include <QDirIterator>
- #include <QSet>
--#include <KIconTheme>
- #include <QStandardPaths>
-+#include <KIconTheme>
-+#include <KShell>
-+
-+#include <X11/Xcursor/Xcursor.h>
-
--CursorThemesModel::CursorThemesModel(bool onlyHome, QObject* parent)
-+CursorThemesModel::CursorThemesModel(QObject* parent)
- : IconThemesModel(parent)
-- , m_onlyHome(onlyHome)
- {
- reload();
- }
-@@ -37,13 +39,11 @@ CursorThemesModel::CursorThemesModel(bool onlyHome, QObject* parent)
- QList<QDir> CursorThemesModel::installedThemesPaths()
- {
- QList<QDir> availableIcons;
-+ QStringList dirs(QString(XcursorLibraryPath()).split(':', QString::SkipEmptyParts));
-+
-+ std::transform(dirs.begin(), dirs.end(), dirs.begin(), KShell::tildeExpand);
-+ dirs.removeDuplicates();
-
-- QSet<QString> dirs;
-- dirs += QDir::home().filePath(".icons");
-- if(!m_onlyHome) {
-- dirs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory).toSet();
-- }
--
- foreach(const QString& dir, dirs) {
- QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
-diff --git a/src/cursorthemesmodel.h b/src/cursorthemesmodel.h
-index 7658bd5..4acfa4b 100644
---- a/src/cursorthemesmodel.h
-+++ b/src/cursorthemesmodel.h
-@@ -29,14 +29,13 @@ class QDir;
- class CursorThemesModel : public IconThemesModel
- {
- public:
-- explicit CursorThemesModel(bool onlyHome=false, QObject* parent = 0);
-+ explicit CursorThemesModel(QObject* parent = 0);
-
- void reload();
-
- private:
- static void fillItem(const QDir& dir, QStandardItem* item);
- QList<QDir> installedThemesPaths();
-- bool m_onlyHome;
- };
-
- #endif // CURSORTHEMESMODEL_H
-diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
-index 7afe698..d36c6a3 100644
---- a/src/gtkconfigkcmodule.cpp
-+++ b/src/gtkconfigkcmodule.cpp
-@@ -71,7 +71,7 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
- setButtons(KCModule::Default | KCModule::Apply);
- ui->setupUi(this);
- appareance = new AppearenceGTK;
-- m_cursorsModel = new CursorThemesModel(false, this);
-+ m_cursorsModel = new CursorThemesModel(this);
- ui->cb_cursor->setModel(m_cursorsModel);
- m_iconsModel = new IconThemesModel(false, this);
- ui->cb_icon->setModel(m_iconsModel);
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.6.5-gui.patch b/kde-plasma/ksysguard/files/ksysguard-5.6.5-gui.patch
deleted file mode 100644
index afd9800..0000000
--- a/kde-plasma/ksysguard/files/ksysguard-5.6.5-gui.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 181202b59dcda03ec3f13de5a79336da4247c447 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Fri, 17 Jun 2016 05:42:23 +1000
-Subject: [PATCH] Remove Qt5WebKitWidgets dependency and build gui
- unconditionally.
-
-Summary: Qt5WebKitWidgets is not actually used anywhere.
-
-Reviewers: #plasma, sgaist
-
-Differential Revision: https://phabricator.kde.org/D1919
----
- CMakeLists.txt | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 56aaafc..5ee0946 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,16 +46,7 @@ set_package_properties(Sensors PROPERTIES
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-
--find_package(Qt5WebKitWidgets CONFIG)
--set_package_properties(Qt5WebKitWidgets PROPERTIES
-- URL "git://gitorious.org/qt/qtwebkit.git"
-- DESCRIPTION "Qt Webkit module (web browsing engine)"
-- TYPE OPTIONAL
-- PURPOSE "Used by the HTML-based GUI ksysguard library"
-- )
--if(Qt5WebKitWidgets_FOUND)
-- add_subdirectory( gui )
--endif()
-+add_subdirectory( gui )
-
- add_subdirectory( doc )
- add_subdirectory( pics )
---
-2.7.3
-
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch b/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch
deleted file mode 100644
index b1731c7..0000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.6.95-wireless-optional.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-commit 7d8a12c65dbbb8166beee53b4bb0c1f2fdede6c6
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Jun 19 12:14:25 2016 +0200
-
- Revert-Revert "Make NetworkManagerQt and BluezQt optional"
-
- This reverts commit f2018a8d3c5f2824278bb167cb48d938ca2670c4.
-
- commit 3257be562b2c48eb11c9e32f7e4fd82ea7fb090b
- Author: Heiko Becker <heirecka@exherbo.org>
- Date: Wed Jun 15 23:07:46 2016 +0200
-
- Summary:
- While it is most certainly sensible and helpful on a system equipped
- with Bluetooth and Wi-Fi hardware, it serves no purpose on a desktop
- system without these and just pulls in a long chain of unwanted
- dependencies.
-
- Test Plan: Successfully built with BluezQt and NetworkManagerQt present and missing.
-
- Reviewers: #plasma, broulik
-
- Subscribers: plasma-devel
-
- Tags: #plasma
-
- Differential Revision: https://phabricator.kde.org/D1944
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6b631b4..6117f75 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,9 +22,32 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- endif()
-
- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets DBus X11Extras)
--find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support Wayland NetworkManagerQt BluezQt)
-+find_package(KF5 REQUIRED COMPONENTS Activities Auth IdleTime Config DBusAddons Solid I18n GlobalAccel KIO NotifyConfig Screen KDELibs4Support Wayland)
- find_package(LibKWorkspace CONFIG REQUIRED)
-
-+find_package(KF5BluezQt)
-+set_package_properties(KF5BluezQt
-+ PROPERTIES DESCRIPTION "Qt wrapper for BlueZ 5 DBus API"
-+ TYPE OPTIONAL
-+ PURPOSE "Support for wireless energy saving actions"
-+)
-+find_package(KF5NetworkManagerQt)
-+set_package_properties(KF5NetworkManagerQt
-+ PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API"
-+ TYPE OPTIONAL
-+ PURPOSE "Support for wireless energy saving actions"
-+)
-+
-+set(HAVE_WIRELESS_SUPPORT FALSE)
-+if(KF5NetworkManagerQt_FOUND AND KF5BluezQt_FOUND)
-+ set(HAVE_WIRELESS_SUPPORT TRUE)
-+endif()
-+add_feature_info(
-+ "Wireless power saving"
-+ HAVE_WIRELESS_SUPPORT
-+ "Support turning off signal-transmitting devices to save energy"
-+)
-+
- find_package(UDev REQUIRED)
-
- find_package(XCB REQUIRED COMPONENTS XCB RANDR DPMS)
-diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
-index 4b0aafd..9c9b897 100644
---- a/daemon/CMakeLists.txt
-+++ b/daemon/CMakeLists.txt
-@@ -19,9 +19,14 @@ set(powerdevil_bundled_actions_SRCS
- actions/bundled/dimdisplay.cpp
- actions/bundled/runscript.cpp
- actions/bundled/handlebuttonevents.cpp
-- actions/bundled/wirelesspowersaving.cpp
- )
-
-+if(HAVE_WIRELESS_SUPPORT)
-+ set(powerdevil_bundled_actions_SRCS ${powerdevil_bundled_actions_SRCS}
-+ actions/bundled/wirelesspowersaving.cpp
-+ )
-+endif()
-+
- # target no.1 - powerdevil core library
- set(powerdevilcore_SRCS
- powerdevil_debug.cpp
-@@ -49,8 +54,10 @@ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerMana
- actions/bundled/handlebuttonevents.h PowerDevil::BundledActions::HandleButtonEvents)
- qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.SuspendSession.xml
- actions/bundled/suspendsession.h PowerDevil::BundledActions::SuspendSession)
--qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
-- actions/bundled/wirelesspowersaving.h PowerDevil::BundledActions::WirelessPowerSaving)
-+if(HAVE_WIRELESS_SUPPORT)
-+ qt5_add_dbus_adaptor(powerdevilcore_SRCS actions/bundled/org.kde.Solid.PowerManagement.Actions.WirelessPowerSaving.xml
-+ actions/bundled/wirelesspowersaving.h PowerDevil::BundledActions::WirelessPowerSaving)
-+endif()
-
- add_library(powerdevilcore SHARED ${powerdevilcore_SRCS} ${powerdevil_bundled_actions_SRCS})
- set_target_properties(powerdevilcore PROPERTIES VERSION ${POWERDEVIL_CORE_VERSION_STRING} SOVERSION ${POWERDEVIL_CORE_VERSION_MAJOR})
-@@ -70,11 +77,16 @@ target_link_libraries(powerdevilcore
- KF5::WidgetsAddons
- KF5::Notifications
- KF5::XmlGui
-- KF5::NetworkManagerQt
-- KF5::BluezQt
- PW::KWorkspace
- )
-
-+if(HAVE_WIRELESS_SUPPORT)
-+ target_link_libraries(powerdevilcore
-+ KF5::NetworkManagerQt
-+ KF5::BluezQt
-+ )
-+endif()
-+
- if (XCB_FOUND) # kwin kscreen helper effect
- target_link_libraries(powerdevilcore Qt5::X11Extras XCB::XCB)
- endif ()
-diff --git a/daemon/actions/bundled/CMakeLists.txt b/daemon/actions/bundled/CMakeLists.txt
-index e3e8eeb..9623b57 100644
---- a/daemon/actions/bundled/CMakeLists.txt
-+++ b/daemon/actions/bundled/CMakeLists.txt
-@@ -19,8 +19,9 @@ add_powerdevil_bundled_action(keyboardbrightnesscontrol)
- add_powerdevil_bundled_action(dimdisplay)
- add_powerdevil_bundled_action(runscript KF5::KIOCore KF5::KIOWidgets)
- add_powerdevil_bundled_action(suspendsession KF5::KIOCore KF5::KIOWidgets KF5::Solid KF5::KDELibs4Support)
--add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt)
--
-+if(HAVE_WIRELESS_SUPPORT)
-+ add_powerdevil_bundled_action(wirelesspowersaving KF5::NetworkManagerQt KF5::BluezQt)
-+endif()
-
- set(actionconfig_SRCS handlebuttoneventsconfig.cpp)
- qt5_add_dbus_interface(actionconfig_SRCS
-diff --git a/daemon/config-powerdevil.h.cmake b/daemon/config-powerdevil.h.cmake
-index 62938dc..042317d 100644
---- a/daemon/config-powerdevil.h.cmake
-+++ b/daemon/config-powerdevil.h.cmake
-@@ -1,2 +1,5 @@
- /* Defines if you have XCB */
- #cmakedefine HAVE_XCB 1
-+
-+/* Define to 1 if you have NetworkManagerQt and BluezQt libs. */
-+#cmakedefine HAVE_WIRELESS_SUPPORT 1
-diff --git a/daemon/powerdevilactionpool.cpp b/daemon/powerdevilactionpool.cpp
-index 7ef823a..2864483 100644
---- a/daemon/powerdevilactionpool.cpp
-+++ b/daemon/powerdevilactionpool.cpp
-@@ -24,6 +24,8 @@
- #include "powerdevilcore.h"
- #include "powerdevil_debug.h"
-
-+#include <config-powerdevil.h>
-+
- #include <KConfigGroup>
- #include <KServiceTypeTrader>
- #include <KPluginInfo>
-@@ -38,7 +40,9 @@
- #include "actions/bundled/dimdisplay.h"
- #include "actions/bundled/runscript.h"
- #include "actions/bundled/handlebuttonevents.h"
-+#ifdef HAVE_WIRELESS_SUPPORT
- #include "actions/bundled/wirelesspowersaving.h"
-+#endif
-
- namespace PowerDevil
- {
-@@ -127,7 +131,9 @@ void ActionPool::init(PowerDevil::Core *parent)
- m_actionPool.insert("DimDisplay", new BundledActions::DimDisplay(parent));
- m_actionPool.insert("RunScript", new BundledActions::RunScript(parent));
- m_actionPool.insert("HandleButtonEvents", new BundledActions::HandleButtonEvents(parent));
-+#ifdef HAVE_WIRELESS_SUPPORT
- m_actionPool.insert("WirelessPowerSaving", new BundledActions::WirelessPowerSaving(parent));
-+#endif
-
- // Verify support
- QHash<QString,Action*>::iterator i = m_actionPool.begin();
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-14 18:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-14 18:29 [gentoo-commits] proj/kde:master commit in: kde-plasma/kde-gtk-config/files/, kde-plasma/powerdevil/files/, Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox