diff options
author | Johannes Huber <johu@gentoo.org> | 2016-10-14 09:59:40 +0200 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2016-10-14 10:22:22 +0200 |
commit | 743e84d6a370cd8ad771b20caab43c55eb1a6bb7 (patch) | |
tree | 9fb50cff3396ca298e2c51f981f8cdb2021ede9f /kde-plasma/kwin | |
parent | net-irc/hexchat: Minor correction to the previous commit. (diff) | |
download | gentoo-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/kwin')
-rw-r--r-- | kde-plasma/kwin/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch | 24 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch | 140 | ||||
-rw-r--r-- | kde-plasma/kwin/kwin-5.6.5-r1.ebuild | 99 |
4 files changed, 0 insertions, 264 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index c9eea60fd471..d45a54204320 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,4 +1,3 @@ -DIST kwin-5.6.5.tar.xz 3915556 SHA256 e4c358f828d9c30b7067f32a9efb515b99f6c8a9d16c116b13b1f271464d7884 SHA512 8aef16af5242b08c4e78f1712d295072434229f3500a7312bb731835ef24ac8b2ee8e3bba139b9fd404ed630dd691eee2f0f284d3679796a32882083ff6783eb WHIRLPOOL 4d6e3299c30fbc580331bb2a91e50a199e49c1b85d31691b5558182ac1d19b55ba5ff80963788d127dd7dfbeef3a4676af89deb257dd1186352532a4cbaed6c2 DIST kwin-5.7.5.tar.xz 3936628 SHA256 ab1e98d3ff19699c89343a51861202dd93c913eb9d9215118c3fab86e99126d6 SHA512 6a7dbf9cf66006516179c5868e47038e0f967f3b2bbe6b431a707cd8ce03cc8dcea800f1dfd6a9482c30321e3b3b84593162bb050f045be4cffdadbc0090f9d7 WHIRLPOOL 75537ec4717e6a41280f97fb137ff28459d03789e79897a81da558c7fcae0ac08c64e9f034d6d9ef42e290d894173c96a1a3ab9dbaa9c6193b3d1272fedbaaf6 DIST kwin-5.8.0.tar.xz 3970260 SHA256 0c9710a7959fde3c468e255c938c41d94f92458483a509e9c3cdfaca9d0b999e SHA512 bcc8fbc1dc0f9bf3bd975da3db629d3ecca1223f1cfd06c8b261f8d892603008b3861cddd3c8c01f18d9c85300f0688dd0139d2899293bf7f685951d3d441759 WHIRLPOOL 5e7f500b43de270dc0fb4f09e7a43b94d3891289bc432dab556ac4540cd612a9676efbbf184d7aa45ed819b5cda3063dd6bcf5c6e186f477ab02946dd8fe7ad1 DIST kwin-5.8.1.tar.xz 3972880 SHA256 74a976769cdcaca0b8c52e83cc2895d0860870b0e9dba22418deb983fe36372c SHA512 a91a024ea7eb7c317d38fb62a600717732d56a064a31d3fc067559967f0c2457bd55b5b889f241a1c0c86eca8e72fc957c0fbf5a6d3668fb922790e04c96bbc9 WHIRLPOOL 5195bcc3aca753b799ead2072b97cad98439c596bd413887e285513355a4c6cdad2f6361de81c2008bad33970c7bd3fe2400f666442ad75b885e10560f2a128d diff --git a/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch deleted file mode 100644 index 06016e0320d9..000000000000 --- a/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/logind.cpp b/logind.cpp -index 22a86cdfceaac3138a186cb2f7ab3eae674a1c77..7be9366614c0b70808c6944161a5801773f34a24 100644 ---- a/logind.cpp -+++ b/logind.cpp -@@ -28,6 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. - #include <QDBusUnixFileDescriptor> - - #include <sys/stat.h> -+#include <sys/sysmacros.h> - #include <unistd.h> - #include "utils.h" - -diff --git a/virtual_terminal.cpp b/virtual_terminal.cpp -index 40628315620e3d943b7ae0462c4415072fc256b8..8ceb74d3adaae610d99fa7e8349d93cea366d2e8 100644 ---- a/virtual_terminal.cpp -+++ b/virtual_terminal.cpp -@@ -36,6 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. - #include <sys/ioctl.h> - #include <sys/signalfd.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - - #define RELEASE_SIGNAL SIGUSR1 - #define ACQUISITION_SIGNAL SIGUSR2 diff --git a/kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch b/kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch deleted file mode 100644 index 067124a55640..000000000000 --- a/kde-plasma/kwin/files/kwin-5.6.5-legacy-session-mgmt.patch +++ /dev/null @@ -1,140 +0,0 @@ -commit 59740e7416bb2b3a9852212fa4b213e5ba76deb7 -Author: Andreas Hartmetz <ahartmetz@gmail.com> -Date: Thu Jun 23 19:40:40 2016 +0200 - - Revert "Remove saving and loading (and client matching by) WM_COMMAND." - - This reverts commit 2eac7634cc524bf5e425cf081a639a6b6407e380. - - CCBUG: 362671 - -diff --git a/activities.cpp b/activities.cpp -index 25eb1c1..42c5db8 100644 ---- a/activities.cpp -+++ b/activities.cpp -@@ -169,7 +169,7 @@ void Activities::reallyStop(const QString &id) - const Client* c = (*it); - const QByteArray sessionId = c->sessionId(); - if (sessionId.isEmpty()) { -- continue; -+ continue; //TODO support old wm_command apps too? - } - - //qDebug() << sessionId; -diff --git a/sm.cpp b/sm.cpp -index 08810a4..ca1edea 100644 ---- a/sm.cpp -+++ b/sm.cpp -@@ -109,8 +109,12 @@ void Workspace::storeSession(KConfig* config, SMSavePhase phase) - for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it) { - Client* c = (*it); - QByteArray sessionId = c->sessionId(); -+ QByteArray wmCommand = c->wmCommand(); - if (sessionId.isEmpty()) -- continue; -+ // remember also applications that are not XSMP capable -+ // and use the obsolete WM_COMMAND / WM_SAVE_YOURSELF -+ if (wmCommand.isEmpty()) -+ continue; - count++; - if (c->isActive()) - active_client = count; -@@ -140,6 +144,7 @@ void Workspace::storeClient(KConfigGroup &cg, int num, Client *c) - QString n = QString::number(num); - cg.writeEntry(QLatin1String("sessionId") + n, c->sessionId().constData()); - cg.writeEntry(QLatin1String("windowRole") + n, c->windowRole().constData()); -+ cg.writeEntry(QLatin1String("wmCommand") + n, c->wmCommand().constData()); - cg.writeEntry(QLatin1String("resourceName") + n, c->resourceName().constData()); - cg.writeEntry(QLatin1String("resourceClass") + n, c->resourceClass().constData()); - cg.writeEntry(QLatin1String("geometry") + n, QRect(c->calculateGravitation(true), c->clientSize())); // FRAME -@@ -180,8 +185,12 @@ void Workspace::storeSubSession(const QString &name, QSet<QByteArray> sessionIds - for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it) { - Client* c = (*it); - QByteArray sessionId = c->sessionId(); -+ QByteArray wmCommand = c->wmCommand(); - if (sessionId.isEmpty()) -- continue; -+ // remember also applications that are not XSMP capable -+ // and use the obsolete WM_COMMAND / WM_SAVE_YOURSELF -+ if (wmCommand.isEmpty()) -+ continue; - if (!sessionIds.contains(sessionId)) - continue; - -@@ -221,6 +230,7 @@ void Workspace::addSessionInfo(KConfigGroup &cg) - session.append(info); - info->sessionId = cg.readEntry(QLatin1String("sessionId") + n, QString()).toLatin1(); - info->windowRole = cg.readEntry(QLatin1String("windowRole") + n, QString()).toLatin1(); -+ info->wmCommand = cg.readEntry(QLatin1String("wmCommand") + n, QString()).toLatin1(); - info->resourceName = cg.readEntry(QLatin1String("resourceName") + n, QString()).toLatin1(); - info->resourceClass = cg.readEntry(QLatin1String("resourceClass") + n, QString()).toLower().toLatin1(); - info->geometry = cg.readEntry(QLatin1String("geometry") + n, QRect()); -@@ -269,6 +279,7 @@ SessionInfo* Workspace::takeSessionInfo(Client* c) - SessionInfo *realInfo = 0; - QByteArray sessionId = c->sessionId(); - QByteArray windowRole = c->windowRole(); -+ QByteArray wmCommand = c->wmCommand(); - QByteArray resourceName = c->resourceName(); - QByteArray resourceClass = c->resourceClass(); - -@@ -302,8 +313,10 @@ SessionInfo* Workspace::takeSessionInfo(Client* c) - if (info->resourceName == resourceName - && info->resourceClass == resourceClass - && sessionInfoWindowTypeMatch(c, info)) { -- realInfo = info; -- session.removeAll(info); -+ if (wmCommand.isEmpty() || info->wmCommand == wmCommand) { -+ realInfo = info; -+ session.removeAll(info); -+ } - } - } - } -diff --git a/sm.h b/sm.h -index 4c5fda6..529187d 100644 ---- a/sm.h -+++ b/sm.h -@@ -41,6 +41,7 @@ class Client; - struct SessionInfo { - QByteArray sessionId; - QByteArray windowRole; -+ QByteArray wmCommand; - QByteArray wmClientMachine; - QByteArray resourceName; - QByteArray resourceClass; -diff --git a/toplevel.cpp b/toplevel.cpp -index af368b5..4a7ec6d 100644 ---- a/toplevel.cpp -+++ b/toplevel.cpp -@@ -177,6 +177,19 @@ QByteArray Toplevel::sessionId() const - return result; - } - -+/*! -+ Returns command property for this client, -+ taken either from its window or from the leader window. -+ */ -+QByteArray Toplevel::wmCommand() -+{ -+ QByteArray result = Xcb::StringProperty(window(), XCB_ATOM_WM_COMMAND); -+ if (result.isEmpty() && wmClientLeaderWin && wmClientLeaderWin != window()) -+ result = Xcb::StringProperty(wmClientLeaderWin, XCB_ATOM_WM_COMMAND); -+ result.replace(0, ' '); -+ return result; -+} -+ - void Toplevel::getWmClientMachine() - { - m_clientMachine->resolve(window(), wmClientLeader()); -diff --git a/toplevel.h b/toplevel.h -index 3133851..91eee5f 100644 ---- a/toplevel.h -+++ b/toplevel.h -@@ -274,6 +274,7 @@ public: - QByteArray sessionId() const; - QByteArray resourceName() const; - QByteArray resourceClass() const; -+ QByteArray wmCommand(); - QByteArray wmClientMachine(bool use_localhost) const; - const ClientMachine *clientMachine() const; - Window wmClientLeader() const; diff --git a/kde-plasma/kwin/kwin-5.6.5-r1.ebuild b/kde-plasma/kwin/kwin-5.6.5-r1.ebuild deleted file mode 100644 index 3827863e2101..000000000000 --- a/kde-plasma/kwin/kwin-5.6.5-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE window manager" -LICENSE="GPL-2+" -KEYWORDS="amd64 ~arm x86" -IUSE="gles2 multimedia" - -# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem X) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_plasma_dep kdecoration) - $(add_plasma_dep kscreenlocker) - $(add_qt_dep qtcore '' '' '5=') - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'gles2=,opengl(+)') - $(add_qt_dep qtscript) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - >=dev-libs/libinput-0.10 - >=dev-libs/wayland-1.2 - media-libs/fontconfig - media-libs/freetype - media-libs/libepoxy - media-libs/mesa[egl,gbm,gles2?,wayland] - virtual/libudev:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 - >=x11-libs/libxkbcommon-0.4.1 - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - multimedia? ( - || ( - $(add_qt_dep qtmultimedia 'gstreamer,qml') - $(add_qt_dep qtmultimedia 'gstreamer010,qml') - ) - ) - !<kde-apps/kdeartwork-meta-15.08.3-r1:4 - !kde-base/kwin:4 - !kde-base/systemsettings:4 -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep designer) - $(add_qt_dep qtconcurrent) - x11-proto/xproto - test? ( x11-libs/xcb-util-wm ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-5.6.3-glibc-sysmacros.patch" - "${FILESDIR}/${PN}-5.6.5-legacy-session-mgmt.patch" # backport in 5.6 after release -) - -src_prepare() { - kde5_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch" -} |