[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2024-05-21 Thread Andreas Sturmlechner 
commit: b7c0aeaadd584135e6c6eac956ef4bcb19535225
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 19:02:59 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 19:04:51 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b7c0aeaa

kde-plasma/plasma-workspace: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...sma-workspace-5.24.80-split-libkworkspace.patch | 37 --
 1 file changed, 37 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
deleted file mode 100644
index e605473e35..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Mon, 21 Feb 2022 12:24:56 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ec5f0893..b022a20b3 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION 
"Qalculate Library"
-   )
- 
- find_package(KWinDBusInterface CONFIG REQUIRED)
-+find_package(LibKWorkspace 5.21.5)
- 
- find_package(KF5Screen CONFIG REQUIRED)
- find_package(KScreenLocker 5.13.80 REQUIRED)
-@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland 
session by default for Plasma
- if(KF5DocTools_FOUND)
-   add_subdirectory(doc)
- endif()
--add_subdirectory(libkworkspace)
-+if(NOT LibKWorkspace_FOUND)
-+message(STATUS "System LibKWorkspace not found, using bundled.")
-+add_subdirectory(libkworkspace)
-+endif()
- add_subdirectory(libdbusmenuqt)
- add_subdirectory(appmenu)
- 
--- 
-2.35.1
-

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2022-09-07 Thread Andreas Sturmlechner 
commit: 82dbfd4d0bb9cdc10d0ab29096628e4f1a9ea26a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep  6 19:29:28 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep  7 18:12:41 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=82dbfd4d

kde-plasma/plasma-workspace: Drop unused patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...asma-workspace-5.21.5-split-libkworkspace.patch | 33 --
 1 file changed, 33 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
deleted file mode 100644
index c96c0ba623..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Mon, 22 Oct 2018 10:35:10 +0200
-Subject: [PATCH] libkworkspace: Allow standalone build
-

- CMakeLists.txt   |  6 +++-
- 1 file changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 67f82cfb7..88a8c09b4 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File 
Searching"
- 
- find_package(KF5TextEditor)
- find_package(KWinDBusInterface CONFIG REQUIRED)
-+find_package(LibKWorkspace 5.21.5)
- 
- find_package(KF5Screen CONFIG REQUIRED)
- find_package(KScreenLocker 5.13.80 REQUIRED)
-@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS)
- option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for 
Plasma" FALSE)
- 
- add_subdirectory(doc)
--add_subdirectory(libkworkspace)
-+if(NOT LibKWorkspace_FOUND)
-+message(STATUS "System LibKWorkspace not found, using bundled.")
-+add_subdirectory(libkworkspace)
-+endif()
- add_subdirectory(libdbusmenuqt)
- add_subdirectory(appmenu)
-

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2022-02-21 Thread Andreas Sturmlechner 
commit: b916ce3bacc42ce97341912e678d919f45ffe9d4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 21 11:33:39 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 21 11:47:06 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b916ce3b

kde-plasma/plasma-workspace: Rebase split-libkworkspace.patch

Closes: https://bugs.gentoo.org/833532
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...sma-workspace-5.24.80-split-libkworkspace.patch | 37 ++
 .../plasma-workspace/plasma-workspace-.ebuild  |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
new file mode 100644
index 00..e605473e35
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
@@ -0,0 +1,37 @@
+From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 21 Feb 2022 12:24:56 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ec5f0893..b022a20b3 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION 
"Qalculate Library"
+   )
+ 
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.21.5)
+ 
+ find_package(KF5Screen CONFIG REQUIRED)
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland 
session by default for Plasma
+ if(KF5DocTools_FOUND)
+   add_subdirectory(doc)
+ endif()
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++message(STATUS "System LibKWorkspace not found, using bundled.")
++add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+ 
+-- 
+2.35.1
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 4d7868663b..3cf0eebb70 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -150,7 +150,7 @@ BDEPEND="virtual/pkgconfig"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 PATCHES=(
-   "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+   "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: 
KDE-bug 432975, bug 767478
 )

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2021-11-09 Thread Andreas Sturmlechner 
commit: fdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 22 20:53:47 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov  9 13:01:48 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fdf904d0

kde-plasma/plasma-workspace: Fix krunner cwd

krunner starts applications with cwd "/" with init system other than systemd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=432975

Thanks-to: Andrea Arcangeli  redhat.com>
Bug: https://bugs.gentoo.org/767478
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...asma-workspace-5.22.5-krunner-cwd-at-home.patch | 30 ++
 .../plasma-workspace-5.23.49..ebuild   |  5 +++-
 .../plasma-workspace/plasma-workspace-.ebuild  |  5 +++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
new file mode 100644
index 00..27db136c29
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
@@ -0,0 +1,30 @@
+Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one
+change that caused the cwd of all apps spawned by krunner to
+erroneously be set to the root dir.
+
+That regressions is back so it's more robust to fix in within krunner.
+
+Signed-off-by: Andrea Arcangeli 
+---
+ krunner/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krunner/main.cpp b/krunner/main.cpp
+index 4593687ca..fa4a62ac4 100644
+--- a/krunner/main.cpp
 b/krunner/main.cpp
+@@ -12,6 +12,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -112,5 +113,6 @@ int main(int argc, char **argv)
+ }
+ });
+ 
++QDir::setCurrent(QDir::homePath());
+ return app.exec();
+ }

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.23.49..ebuild
index 0ea9e2eeda..b4f4d8416f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.49..ebuild
@@ -148,7 +148,10 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+PATCHES=(
+   "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+   "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: 
KDE-bug 432975, bug 767478
+)
 
 src_prepare() {
ecm_src_prepare

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index f8672bc733..027fc1d4fe 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -148,7 +148,10 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+PATCHES=(
+   "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+   "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: 
KDE-bug 432975, bug 767478
+)
 
 src_prepare() {
ecm_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2021-05-04 Thread Andreas Sturmlechner 
commit: a82cfe37988730033815c61bc4895642d6cc0dfb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May  5 02:50:57 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May  5 03:00:07 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a82cfe37

kde-plasma/plasma-workspace: Remove dangerous default shortcuts

Upstream commit e8e17c5ef8734fa56a78405e32277568e4e1095e

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=435954
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...asma-workspace-5.21.5-dangerous-shortcuts.patch | 45 ++
 .../plasma-workspace-5.21.5.ebuild |  1 +
 2 files changed, 46 insertions(+)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
new file mode 100644
index 00..f04bb866d5
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch
@@ -0,0 +1,45 @@
+From e8e17c5ef8734fa56a78405e32277568e4e1095e Mon Sep 17 00:00:00 2001
+From: Nate Graham 
+Date: Thu, 22 Apr 2021 08:38:18 -0600
+Subject: [PATCH] [ksmserver] Remove default shortcuts for "Without
+ Confirmation" actions
+
+These actions bypass the user setting for whether or not to show the
+logout screen and always log out/reboot/etc. immediately.  Because they
+have default keyboard shortcuts, they can be triggered by accident and
+cause unexpected logouts/reboots/etc.
+
+BUG: 435954
+FIXED-IN: 5.22
+---
+ ksmserver/server.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
+index ac9da9f09..6f3179fb9 100644
+--- a/ksmserver/server.cpp
 b/ksmserver/server.cpp
+@@ -880,17 +880,17 @@ void KSMServer::setupShortcuts()
+ 
+ a = actionCollection->addAction(QStringLiteral("Log Out Without 
Confirmation"));
+ a->setText(i18n("Log Out Without Confirmation"));
+-KGlobalAccel::self()->setGlobalShortcut(a, QList() << 
Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_Delete);
++KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
+ connect(a, ::triggered, this, 
::logoutWithoutConfirmation);
+ 
+ a = actionCollection->addAction(QStringLiteral("Halt Without 
Confirmation"));
+ a->setText(i18n("Halt Without Confirmation"));
+-KGlobalAccel::self()->setGlobalShortcut(a, QList() << 
Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown);
++KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
+ connect(a, ::triggered, this, 
::haltWithoutConfirmation);
+ 
+ a = actionCollection->addAction(QStringLiteral("Reboot Without 
Confirmation"));
+ a->setText(i18n("Reboot Without Confirmation"));
+-KGlobalAccel::self()->setGlobalShortcut(a, QList() << 
Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp);
++KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence());
+ connect(a, ::triggered, this, 
::rebootWithoutConfirmation);
+ }
+ }
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
index 31b3b92188..b8e5237f6d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -147,6 +147,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
"${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202
"${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285
+   "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954
 )
 
 src_prepare() {

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2021-05-04 Thread Andreas Sturmlechner 
commit: 421fd89da5df5796db415c3eb4a294b18fca1277
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May  4 20:00:23 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May  4 20:17:49 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=421fd89d

kde-plasma/plasma-workspace: Backport 5.22 adaptive opacity feature

This raises the minimum required KDE Frameworks version to 5.82.0
which is carrying the necessary backport in kde-frameworks/plasma.

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434202
KDe-bug: https://bugs.kde.org/show_bug.cgi?id=434285
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...workspace-5.21.5-transparency-panelConfig.patch |  27 ++
 .../plasma-workspace-5.21.5-transparency.patch | 376 +
 .../plasma-workspace-5.21.5.ebuild |   6 +-
 3 files changed, 408 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
new file mode 100644
index 00..fb7993e6db
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch
@@ -0,0 +1,27 @@
+From 1cf02aad96bfe650a1f4d1465ae15234205fb061 Mon Sep 17 00:00:00 2001
+From: Bharadwaj Raju 
+Date: Mon, 26 Apr 2021 18:47:51 +
+Subject: [PATCH] Load panelOpacity from config parent, not from config
+
+BUG: 434285
+FIXED-IN: 5.22
+---
+ shell/panelview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 5ed743024..4533e856f 100644
+--- a/shell/panelview.cpp
 b/shell/panelview.cpp
+@@ -633,7 +633,7 @@ void PanelView::restore()
+ // the place for this config key is changed in Plasma 5.9
+ // Do NOT use readConfigValueWithFallBack
+ 
setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry("panelVisibility",
 panelConfig.readEntry("panelVisibility", (int)NormalPanel)));
+-setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", 
PanelView::OpacityMode::Adaptive));
++
setOpacityMode((OpacityMode)config().parent().readEntry("panelOpacity", 
configDefaults().parent().readEntry("panelOpacity", 
PanelView::OpacityMode::Adaptive)));
+ m_initCompleted = true;
+ resizePanel();
+ positionPanel();
+-- 
+GitLab
+

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch
new file mode 100644
index 00..1a925a137c
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch
@@ -0,0 +1,376 @@
+From 7db8d5ee551f30576588d31470fe287b6ad2adcd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= 
+Date: Mon, 1 Mar 2021 22:14:43 +
+Subject: [PATCH] Add support for adaptive opacity panels
+
+Co-authored-by: Jan Blackquill 
+---
+ libtaskmanager/taskfilterproxymodel.cpp | 26 ++
+ libtaskmanager/taskfilterproxymodel.h   | 19 ++
+ libtaskmanager/tasksmodel.cpp   | 11 
+ libtaskmanager/tasksmodel.h | 19 ++
+ shell/panelconfigview.cpp   | 11 
+ shell/panelconfigview.h |  5 
+ shell/panelview.cpp | 35 +
+ shell/panelview.h   | 28 
+ 8 files changed, 154 insertions(+)
+
+diff --git a/libtaskmanager/taskfilterproxymodel.cpp 
b/libtaskmanager/taskfilterproxymodel.cpp
+index 37a3076fd..6bb27537a 100644
+--- a/libtaskmanager/taskfilterproxymodel.cpp
 b/libtaskmanager/taskfilterproxymodel.cpp
+@@ -40,6 +40,7 @@ public:
+ bool filterByScreen = false;
+ bool filterByActivity = false;
+ bool filterNotMinimized = false;
++bool filterNotMaximized = false;
+ bool filterSkipTaskbar = true;
+ bool filterSkipPager = false;
+ 
+@@ -185,6 +186,22 @@ void TaskFilterProxyModel::setFilterNotMinimized(bool 
filter)
+ }
+ }
+ 
++bool TaskFilterProxyModel::filterNotMaximized() const
++{
++return d->filterNotMaximized;
++}
++
++void TaskFilterProxyModel::setFilterNotMaximized(bool filter)
++{
++if (d->filterNotMaximized != filter) {
++d->filterNotMaximized = filter;
++
++invalidateFilter();
++
++emit filterNotMaximizedChanged();
++}
++}
++
+ bool TaskFilterProxyModel::filterSkipTaskbar() const
+ {
+ return d->filterSkipTaskbar;
+@@ -301,6 +318,15 @@ bool TaskFilterProxyModel::acceptsRow(int sourceRow) const
+ }
+ }
+ 
++// Filter not maximized.
++if (d->filterNotMaximized) {
++bool isMaximized = 
sourceIdx.data(AbstractTasksModel::IsMaximized).toBool();
++
++if (!isMaximized) {
++return false;
++}
++}
++
+ return

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2019-10-15 Thread Andreas Sturmlechner 
commit: ddf13e45190a39e8f4603729eaa75fd52f2c6d06
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 15 17:08:44 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct 15 17:08:44 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ddf13e45

kde-plasma/plasma-workspace: Backport Plasma Wayland session renaming

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...sma-workspace-5.17.0-waylandsessionrename.patch | 48 ++
 .../plasma-workspace-5.17.0.ebuild |  1 +
 .../plasma-workspace-5.17.49..ebuild   |  1 +
 3 files changed, 50 insertions(+)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
new file mode 100644
index 00..2493b8a159
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.0-waylandsessionrename.patch
@@ -0,0 +1,48 @@
+From f8e716524435c0fc2bfec2aa36183e5c99e12d42 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 15 Oct 2019 18:33:45 +0200
+Subject: [PATCH] Fix Name conflict between plasma.desktop and
+ plasmawayland.desktop
+
+Summary:
+SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it
+finds in wayland-sessions dir, and Plasma is relying on that behaviour to
+distinguish between its X11 and Wayland sessions. This leads to duplicate
+"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
+and users are lost without downstream patching.
+
+SDDM in 0.19 only appends " (Wayland)" in case the session name does
+not already end with this, to avoid duplicating it.
+
+CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
+See also: https://github.com/sddm/sddm/pull/997
+
+Reviewers: #plasma, davidedmundson, fvogt, ngraham
+
+Reviewed By: #plasma, davidedmundson, ngraham
+
+Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D22210
+---
+ login-sessions/plasmawayland.desktop.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/login-sessions/plasmawayland.desktop.cmake 
b/login-sessions/plasmawayland.desktop.cmake
+index 1207621e0..c114959a2 100644
+--- a/login-sessions/plasmawayland.desktop.cmake
 b/login-sessions/plasmawayland.desktop.cmake
+@@ -2,7 +2,7 @@
+ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
+ DesktopNames=KDE
+-Name=Plasma
++Name=Plasma (Wayland)
+ Name[ar]=بلازما
+ Name[bs]=Plazma
+ Name[ca]=Plasma
+-- 
+2.23.0
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild
index f0efd16189..bef894f43f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.0.ebuild
@@ -118,6 +118,7 @@ PDEPEND="
 PATCHES=(
# TODO: Restore Gentoo part for FHS installs, bug 688366
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+   "${FILESDIR}/${P}-waylandsessionrename.patch"
 )
 
 RESTRICT+=" test"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49..ebuild
index d6b7b9c862..be2b0fd5b6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.49..ebuild
@@ -118,6 +118,7 @@ PDEPEND="
 PATCHES=(
# TODO: Restore Gentoo part for FHS installs, bug 688366
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+   "${FILESDIR}/${PN}-5.17.0-waylandsessionrename.patch"
 )
 
 RESTRICT+=" test"

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2019-09-17 Thread Andreas Sturmlechner 
commit: abba77cd84257b5db9aa9a38d4b9a817308bad77
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 17 15:38:00 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 17 15:38:00 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=abba77cd

kde-plasma/plasma-workspace: Drop unused patches

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...rkspace-5.10-startplasmacompositor-script.patch | 40 --
 .../plasma-workspace-5.14.80-startkde-script.patch | 39 --
 .../plasma-workspace-5.16.3-x11sessionrename.patch | 91 --
 ...asma-workspace-5.16.4-no-share-dataengine.patch | 25 --
 4 files changed, 195 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
deleted file mode 100644
index de56ffe236..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= 
-Date: Tue, 1 Aug 2017 23:09:24 +0300
-Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown}
-

- startkde/startplasmacompositor.cmake | 10 ++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startplasmacompositor.cmake 
b/startkde/startplasmacompositor.cmake
-index 5bcf26a..e965f19 100644
 a/startkde/startplasmacompositor.cmake
-+++ b/startkde/startplasmacompositor.cmake
-@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do
-   done
- done
-
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- echo 'startplasmacompositor: Starting up...'  1>&2
-
- # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set 
at all.
-@@ -232,6 +237,11 @@ fi
-
- echo 'startplasmacompositor: Shutting down...'  1>&2
-
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
---
-2.13.0
-

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
deleted file mode 100644
index 44e86a0169..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
-From: Elias Probst 
-Date: Sat, 4 Jul 2015 11:33:01 +0200
-Subject: [PATCH] [startkde] Gentoo FHS script support
-

- startkde/startkde.cmake | 10 ++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 2585600..9350158 100644
 a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
- # from some users that they're confused and don't know what to do. This is
- # especially necessary on slow machines, where starting KDE takes one or two
-@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--- 
-2.3.6

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
deleted file mode 100644
index a851f5f54b..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From bcabb38b1f07a52847752fb54eb61696a1312a61 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 2 Jul 2019 10:13:54 +0200
-Subject: [PATCH] Fix Name conflict between plasma.desktop and
- plasmawayland.desktop
-
-Summary:
-SDDM as of 0.18.1 appends " (Wayland)" to the Name of any session file it
-finds in wayland-sessions dir, and Plasma is relying on that behaviour to
-distinguish between its X11 and Wayland sessions. This leads to duplicate
-"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
-and users are lost without downstream patching.
-
-Instead of waiting for which of (SDDM, Plasma) is doing something about
-it first,

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2019-06-10 Thread Michael Palimaka 
commit: 44bbf089d13ca48e98b677f6e7048f84e479a96b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jun 10 10:32:17 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jun 10 10:32:43 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=44bbf089

kde-plasma/plasma-workspace: be clearer when referring to gnupg versions

Package-Manager: Portage-2.3.66, Repoman-2.3.14
Signed-off-by: Michael Palimaka  gentoo.org>

 kde-plasma/plasma-workspace/files/10-agent-shutdown.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh 
b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
index 4bafd2e61c..614b38f528 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
@@ -4,12 +4,12 @@
 # Uncomment the following lines to kill the agents
 # that were started at session startup.
 
-# gnupg 2.0.x
+# /dev/null 2>&1
 #fi
 
-# gnupg 2.1.x
+# >=gnupg-2.1.x
 #gpgconf --kill gpg-agent >/dev/null 2>&1
 
 #if [ -n "${SSH_AGENT_PID}" ]; then

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2019-05-14 Thread Andreas Sturmlechner 
commit: d72efe5d389b784090338592b8f4b553565d727c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 13 18:25:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 13 18:25:54 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d72efe5d

kde-plasma/plasma-workspace: Drop obsolete patch

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/685766
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/plasma-workspace-5.12.80-tests-optional.patch | 17 -
 .../plasma-workspace/plasma-workspace-.ebuild   |  1 -
 2 files changed, 18 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
deleted file mode 100644
index e26b27e8c3..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/dataengines/notifications/CMakeLists.txt 
b/dataengines/notifications/CMakeLists.txt
-index 8a90cb59..597b3f7e 100644
 a/dataengines/notifications/CMakeLists.txt
-+++ b/dataengines/notifications/CMakeLists.txt
-@@ -46,7 +46,8 @@ ecm_qt_declare_logging_category(notifications_test_SRCS 
HEADER debug.h
-IDENTIFIER NOTIFICATIONS
-CATEGORY_NAME 
kde.dataengine.notifications`
-DEFAULT_SEVERITY Info)
--
--add_executable(notification_test  ${notifications_test_SRCS})
--target_link_libraries(notification_test Qt5::Test Qt5::Core)
--ecm_mark_as_test(notification_test)
-+if(BUILD_TESTING)
-+  add_executable(notification_test  ${notifications_test_SRCS})
-+  target_link_libraries(notification_test Qt5::Test Qt5::Core)
-+  ecm_mark_as_test(notification_test)
-+endif()

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 93343e9d50..b7ca9fcc47 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -117,7 +117,6 @@ PDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-5.14.80-startkde-script.patch"
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-   "${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 )

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2018-10-22 Thread Andreas Sturmlechner 
commit: 0d96ded4d0064c4562b3a118c97e0fdca07fdf3c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 22 09:15:58 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 22 18:06:12 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d96ded4

kde-plasma/plasma-workspace: DEPEND on standalone libkworkspace

Disabling build of libkworkspace subdirectory.

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 ...asma-workspace-5.14.2-split-libkworkspace.patch | 35 ++
 .../plasma-workspace-5.14.49..ebuild   |  8 +
 .../plasma-workspace/plasma-workspace-.ebuild  | 10 ++-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
new file mode 100644
index 00..f12d9f4daf
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch
@@ -0,0 +1,35 @@
+From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 22 Oct 2018 10:35:10 +0200
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt   |  6 +++-
+ 1 file changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e587a386..d1a63527 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File 
Searching"
+ 
+ find_package(KF5TextEditor)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.14.1)
+ 
+ find_package(KScreenLocker 5.13.80 REQUIRED)
+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
+@@ -135,7 +136,10 @@ endif()
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ 
+ add_subdirectory(doc)
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++message(STATUS "System LibKWorkspace not found, using bundled.")
++add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+ 
+-- 
+2.19.1

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49..ebuild
index ed436f5d27..4c1e1c34c3 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49..ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
+   $(add_plasma_dep libkworkspace)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -126,6 +127,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
+   "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 )
 
 RESTRICT+=" test"
@@ -135,6 +137,12 @@ src_prepare() {
 
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake 
|| die
+
+   cmake_comment_add_subdirectory libkworkspace
+   # delete colliding libkworkspace translations
+   if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   find po -type f -name "*po" -and -name "libkworkspace*" -delete 
|| die
+   fi
 }
 
 src_configure() {

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index a7560f18b4..4c1e1c34c3 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,7 @@ COMMON_DEPEND="
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
+   $(add_plasma_dep libkworkspace)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
@@ -126,6 +127,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
+   "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 )
 
 RESTRICT+=" test"
@@ -135,6 +137,12 @@ src_prepare() {
 
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake 
|| die
+
+   cmake_comment_add_subdirectory libkworkspace
+   # delete colliding libkworkspace translations
+   if [[

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2018-05-01 Thread Johannes Huber 
commit: 4490e86912e247348b50afa3d6f9296b4501f0f0
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May  1 16:26:56 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May  1 16:26:56 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4490e869

kde-plasma/plasma-workspace: Minor doc change

Point to pinentry-qt instead of pinentry-qt4.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 kde-plasma/plasma-workspace/files/10-agent-startup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh 
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index fc5ba70539..104822c240 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -12,7 +12,7 @@
 #
 # If using gpg-agent for ssh instead of ssh-agent, a GUI pinentry program
 # must be selected either with eselect pinentry or adding an entry to
-# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt4".
+# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt".
 #
 # If using gnupg-2.1 or later with gpg-agent for ssh instead of ssh-agent,
 # $HOME/.gnupg/gpg-agent.conf must be edited to include "enable-ssh-support".

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2017-07-27 Thread Andreas Sturmlechner 
commit: 347f505707ad7ddd924a92afc93b5e7246619419
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul 27 18:19:22 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul 27 18:19:22 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=347f5057

kde-plasma/plasma-workspace: Remove obsolete patch

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../plasma-workspace-5.7.90-baloo-optional.patch   | 41 --
 1 file changed, 41 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
deleted file mode 100644
index 34f7142dfd..00
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 7ea5034dda3d7a497be8c8d1adea08897c165916
-Author: Andreas Sturmlechner 
-Date:   Thu Sep 15 00:22:38 2016 +0200
-
-Make KF5Baloo optional
-
-
https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e57cb73..49584d9 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED)
- find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
- find_package(KF5 REQUIRED COMPONENTS SysGuard)
- find_package(KF5 REQUIRED COMPONENTS Package)
--# Baloo has a different version scheme than KF5 for now
--find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
-+
-+find_package(KF5Baloo)
-+set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
-+   TYPE OPTIONAL
-+   PURPOSE "Needed for the File Search runner."
-+  )
-+
- find_package(KF5TextEditor)
- find_package(KWinDBusInterface CONFIG REQUIRED)
- 
-diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
-index 48cc379..d7656c8 100644
 a/runners/CMakeLists.txt
-+++ b/runners/CMakeLists.txt
-@@ -1,5 +1,7 @@
- add_subdirectory(activities)
--add_subdirectory(baloo)
-+if(KF5Baloo_FOUND)
-+ add_subdirectory(baloo)
-+endif()
- add_subdirectory(bookmarks)
- add_subdirectory(calculator)
- add_subdirectory(locations)

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2017-02-18 Thread Michael Palimaka 
commit: 645e367463ba20d85f5e447b81a0218cdd47ed52
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Feb 18 10:01:25 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Feb 18 10:01:32 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=645e3674

kde-plasma/plasma-workspace: improve startup script documentation

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh 
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index e2c5018836..fc5ba70539 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -14,6 +14,10 @@
 # must be selected either with eselect pinentry or adding an entry to
 # $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt4".
 #
+# If using gnupg-2.1 or later with gpg-agent for ssh instead of ssh-agent,
+# $HOME/.gnupg/gpg-agent.conf must be edited to include "enable-ssh-support".
+# See bug #547544 for details of why.
+#
 # pinentry-curses or pinentry-tty will not work because the agent started here
 # is in a different tty than where it is used, so the agent does not know where
 # to request the passphrase and fails.

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2016-11-12 Thread Michael Palimaka 
commit: 3783c67d83ac1267dc35cf6163dc20e7aa13664c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Nov 12 08:34:09 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 12 08:34:16 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3783c67d

kde-plasma/plasma-workspace: backport patch from master

Package-Manager: portage-2.3.2

 .../plasma-workspace-5.8.3-systray-cpuload.patch   | 177 +
 .../plasma-workspace-5.8.49..ebuild|   2 +
 2 files changed, 179 insertions(+)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
new file mode 100644
index 000..fada327
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-systray-cpuload.patch
@@ -0,0 +1,177 @@
+From: Lindsay Roberts 
+Date: Mon, 10 Oct 2016 16:55:49 +
+Subject: Systray: Move all icon resolution to dataengine
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.git=commitdiff=749f60b89f4a166833fb64a5b593a801f63f9615
+---
+Systray: Move all icon resolution to dataengine
+
+Summary:
+Changes triggered by investigation into a long-running high CPU usage bug with 
system tray animations. The systray itself had icon name to icon resolution 
code, which was being triggered (twice) for every icon, every time any icon in 
the systray was updated. This code was spinning up a KIconLoader on each of 
these instances, and throwing it directly away. Each one triggered a large 
quantity of memory allocations and disk scans.
+
+This patch moves the extra bit of "appName" logic from the native part of the 
system tray to the statusnotifieritem datasource, which already had a stored 
'customIconLoader' to handle icon theme paths, and removes the special lookup 
from the sytemtray applet completely. It also prefers icons provided by the 
dataengine to doing another lookup (contentious?). This removes all the extra 
CPU usage outside of the QML scene graph and graphics drivers locally.
+
+This is very much a looking for feedback item - there are things about the 
icon loading paths I almost certainly haven't appreciated yet, and perhaps 
preferring loading by icon name in the applet has a another purpose.
+
+BUG: 356479
+
+Test Plan: Have tested locally with kgpg and steam, the two apps I have that 
trigger the old code path. In neither case, however, did the appName logic 
produce a different result to the code with just the icon search path in 
statusnotifieritem.
+
+Reviewers: #plasma, davidedmundson, mart
+
+Reviewed By: #plasma, davidedmundson, mart
+
+Subscribers: davidedmundson, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D2986
+---
+
+
+--- a/applets/systemtray/package/contents/ui/ConfigEntries.qml
 b/applets/systemtray/package/contents/ui/ConfigEntries.qml
+@@ -75,7 +75,7 @@
+ "index": i,
+ "taskId": item.Id,
+ "name": item.Title,
+-"iconName": 
plasmoid.nativeInterface.resolveIcon(item.IconName, item.IconThemePath),
++"iconName": item.IconName,
+ "icon": item.Icon
+ });
+ }
+
+--- a/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml
 b/applets/systemtray/package/contents/ui/items/StatusNotifierItem.qml
+@@ -28,7 +28,7 @@
+ text: Title
+ mainText: ToolTipTitle != "" ? ToolTipTitle : Title
+ subText: ToolTipSubTitle
+-icon: ToolTipIcon != "" ? ToolTipIcon : 
plasmoid.nativeInterface.resolveIcon(IconName != "" ? IconName : Icon, 
IconThemePath)
++icon: ToolTipIcon != "" ? ToolTipIcon : Icon ? Icon : IconName
+ textFormat: Text.AutoText
+ category: Category
+ 
+@@ -48,7 +48,7 @@
+ 
+ PlasmaCore.IconItem {
+ id: iconItem
+-source: plasmoid.nativeInterface.resolveIcon(IconName != "" ? 
IconName : Icon, IconThemePath)
++source: Icon ? Icon : IconName
+ width: Math.min(parent.width, parent.height)
+ height: width
+ active: taskIcon.containsMouse
+
+--- a/applets/systemtray/systemtray.cpp
 b/applets/systemtray/systemtray.cpp
+@@ -37,36 +37,10 @@
+ #include 
+ #include 
+ 
+-#include 
+-#include 
+ #include 
+ #include 
+ 
+ #include 
+-
+-/*
+- * An app may also load icons from their own directories, so we need a new 
iconloader that takes this into account
+- * This is wrapped into a subclass of iconengine so the iconloader lifespan 
matches the icon object
+- */
+-class AppIconEngine : public KIconEngine
+-{
+-public:
+-AppIconEngine(const QString , const QString , const QString 
);
+-~AppIconEngine();
+-private:
+-KIconLoader* m_loader;
+-};
+-
+-AppIconEngine::AppIconEngine(const QString , const QString , 
const QString ) :
+-KIconEngine(variant, m_loader = new KIconLoader(appName, QStringList()))
+-{
+-

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2016-10-08 Thread Michael Palimaka 
commit: 7c8a67d234b1226a90c295d1ef5c7b0cc31c1684
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Sep 14 22:34:21 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct  8 15:51:49 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c8a67d2

kde-plasma/plasma-workspace: Make kde-frameworks/baloo optional

'baloo is the most dysfunctional part of whole kde frameworks'

Package-Manager: portage-2.3.0

 .../plasma-workspace-5.7.90-baloo-optional.patch   | 41 ++
 .../plasma-workspace-5.8.49..ebuild| 10 --
 .../plasma-workspace/plasma-workspace-.ebuild  | 10 --
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
new file mode 100644
index 000..34f7142
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch
@@ -0,0 +1,41 @@
+commit 7ea5034dda3d7a497be8c8d1adea08897c165916
+Author: Andreas Sturmlechner 
+Date:   Thu Sep 15 00:22:38 2016 +0200
+
+Make KF5Baloo optional
+
+
https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e57cb73..49584d9 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED)
+ find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
+ find_package(KF5 REQUIRED COMPONENTS SysGuard)
+ find_package(KF5 REQUIRED COMPONENTS Package)
+-# Baloo has a different version scheme than KF5 for now
+-find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
++
++find_package(KF5Baloo)
++set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
++   TYPE OPTIONAL
++   PURPOSE "Needed for the File Search runner."
++  )
++
+ find_package(KF5TextEditor)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
+ 
+diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
+index 48cc379..d7656c8 100644
+--- a/runners/CMakeLists.txt
 b/runners/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ add_subdirectory(activities)
+-add_subdirectory(baloo)
++if(KF5Baloo_FOUND)
++ add_subdirectory(baloo)
++endif()
+ add_subdirectory(bookmarks)
+ add_subdirectory(calculator)
+ add_subdirectory(locations)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49..ebuild
index 7f856fa..b7ad9ce 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49..ebuild
@@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="+calendar geolocation gps prison qalculate"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
 
 # drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
 COMMON_DEPEND="
-   $(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -86,6 +85,7 @@ COMMON_DEPEND="
gps? ( sci-geosciences/gpsd )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
+   semantic-desktop? ( $(add_frameworks_dep baloo) )
 "
 RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
@@ -120,7 +120,10 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-5.4-startkde-script.patch"
+   "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch"
+)
 
 RESTRICT+=" test"
 
@@ -138,6 +141,7 @@ src_configure() {
$(cmake-utils_use_find_package gps libgps)
$(cmake-utils_use_find_package prison KF5Prison)
$(cmake-utils_use_find_package qalculate Qalculate)
+   $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
 
kde5_src_configure

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 7f856fa..b7ad9ce 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -11,11 +11,10 @@ inherit kde5 multilib qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="+calendar geolocation gps prison qalculate"
+IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
 
 # drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
 COMMON_DEPEND="
-   $(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
@@ -86,6 +85,7 @@ COMMON_DEPEND="
gps? (

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2016-06-19 Thread Michael Palimaka 
commit: 54f2348de8aed0a30960a340bbd762196da488a2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 19 13:45:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 19 13:45:22 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f2348d

kde-plasma/plasma-workspace: remove stray git garbage

Package-Manager: portage-2.3.0_rc1

 kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 
 1 file changed, 4 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh 
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index 9f24233..e2c5018 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -26,11 +26,7 @@ if [ "${GPG_AGENT}" = true ]; then
if [ -x /usr/bin/gpgconf ]; then
gpgconf --launch gpg-agent >/dev/null 2>&1
if [ $? = 2 ]; then
-<<< Updated upstream
eval "$(/usr/bin/gpg-agent --enable-ssh-support 
--daemon)"
-===
-   eval "$(/usr/bin/gpg-agent --daemon)"
->>> Stashed changes
fi
fi
 fi

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2016-06-18 Thread Michael Palimaka 
commit: ca6c861f8f54ccb7521ec91da98f73bab1f91e8a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun 18 17:42:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun 18 18:43:56 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca6c861f

kde-plasma/plasma-workspace: improve agent support in startup/shutdown scripts

This adds support for newer versions of GnuPG as well as using gpg-agent as the
ssh agent.

Big thanks to Kristian Fiskerstrand for detailing GnuPG's workings and review.

Gentoo-bug: 547544

Package-Manager: portage-2.3.0_rc1

 .../plasma-workspace/files/10-agent-shutdown.sh| 10 +++--
 .../plasma-workspace/files/10-agent-startup.sh | 45 +-
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh 
b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
index fff8056..4bafd2e 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
@@ -1,13 +1,17 @@
 #!/bin/sh
 #
-# This file is executed at plasma shutdown.
+# This file is executed at Plasma shutdown.
 # Uncomment the following lines to kill the agents
 # that were started at session startup.
 
+# gnupg 2.0.x
 #if [ -n "${GPG_AGENT_INFO}" ]; then
-#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
 #fi
 
+# gnupg 2.1.x
+#gpgconf --kill gpg-agent >/dev/null 2>&1
+
 #if [ -n "${SSH_AGENT_PID}" ]; then
-#  eval "$(ssh-agent -s -k)"
+#  eval "$(ssh-agent -s -k)"
 #fi

diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh 
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index 03e017a..e2c5018 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -1,25 +1,50 @@
 # Agents startup file
 #
-# This file is sourced at plasma startup, so that
+# This file is sourced at Plasma startup, so that
 # the environment variables set here are available
 # throughout the session.
-
+#
 # Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at plasma startup.
+# and/or ssh-agent at Plasma startup.
 # If you do so, do not forget to uncomment the respective
 # lines in PLASMADIR/shutdown/agent-shutdown.sh to
 # properly kill the agents when the session ends.
+#
+# If using gpg-agent for ssh instead of ssh-agent, a GUI pinentry program
+# must be selected either with eselect pinentry or adding an entry to
+# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt4".
+#
+# pinentry-curses or pinentry-tty will not work because the agent started here
+# is in a different tty than where it is used, so the agent does not know where
+# to request the passphrase and fails.
 
-#if [ -x /usr/bin/gpg-agent ]; then
-#  eval "$(/usr/bin/gpg-agent --daemon)"
-#fi 
+#GPG_AGENT=true
+#SSH_AGENT=true
+#SSH_AGENT=gpg # use gpg-agent for ssh instead of ssh-agent
 
-#if [ -x /usr/bin/ssh-agent ]; then
-#  eval "$(/usr/bin/ssh-agent -s)"
-#fi
+if [ "${GPG_AGENT}" = true ]; then
+   if [ -x /usr/bin/gpgconf ]; then
+   gpgconf --launch gpg-agent >/dev/null 2>&1
+   if [ $? = 2 ]; then
+   eval "$(/usr/bin/gpg-agent --enable-ssh-support 
--daemon)"
+   fi
+   fi
+fi
+
+if [ "${SSH_AGENT}" = true ]; then
+   if [ -x /usr/bin/ssh-agent ]; then
+   eval "$(/usr/bin/ssh-agent -s)"
+   fi
+elif [ "${SSH_AGENT}" = gpg ] && [ "${GPG_AGENT}" = true ]; then
+   if [ -e /run/user/$(id -ru)/gnupg/S.gpg-agent.ssh ]; then
+   export SSH_AUTH_SOCK=/run/user/$(id -ru)/gnupg/S.gpg-agent.ssh
+   elif [ -e "${HOME}/.gnupg/S.gpg-agent.ssh" ]; then
+   export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
+   fi
+fi
 
 # Uncomment the following lines to start rxvt-unicode which has the ability to
-# run multiple terminals in one single process, thus starting up faster and 
+# run multiple terminals in one single process, thus starting up faster and
 # saving resources.
 # The --opendisplay ensures that the daemon quits when the X server terminates,
 # therefore we don't need matching lines in agent-shutdown.sh.

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2016-03-20 Thread Michael Palimaka 
commit: bd76d0815d200f350c016aa7ff52e58052dcaa18
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Mar 18 23:27:23 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Mar 20 14:47:26 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd76d081

kde-plasma/plasma-workspace: Add rpath-, drop tests patch; missing DEPEND

- Fixes bug 565810: https://bugs.gentoo.org/show_bug.cgi?id=565810
- Don't wait for the next time patch breaks and use forceoptional
- iso-codes used for country names in digital-clock applet
  upstream commit fea67bd2ae7549e88952ac6dbcf90392d0ee1458

Package-Manager: portage-2.2.27

 .../files/plasma-workspace-5.6.0-rpath.patch   | 28 ++
 .../files/plasma-workspace-tests-optional.patch| 11 -
 .../plasma-workspace-5.5.95.ebuild | 10 +++-
 .../plasma-workspace-5.6.49..ebuild|  8 +++
 .../plasma-workspace/plasma-workspace-.ebuild  | 11 -
 5 files changed, 39 insertions(+), 29 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch
new file mode 100644
index 000..464f278
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch
@@ -0,0 +1,28 @@
+commit 829fb30934c455de5fc8d92512561d237c58fb35
+Author: Andreas Sturmlechner 
+Date:   Mon Nov 23 21:34:24 2015 +0100
+
+[phonon] Do not set RPATH
+
+REVIEW: 126210
+
+diff --git a/phonon/platform_kde/CMakeLists.txt 
b/phonon/platform_kde/CMakeLists.txt
+index 281425f..20ec8f9 100644
+--- a/phonon/platform_kde/CMakeLists.txt
 b/phonon/platform_kde/CMakeLists.txt
+@@ -9,15 +9,6 @@ target_link_libraries(kde ${PHONON_LIBRARY} KF5::I18n 
KF5::KIOWidgets KF5::Notif
+ 
+ kcoreaddons_desktop_to_json(kde phononbackend.desktop)
+ 
+-if(NOT WIN32)
+-   set_target_properties(kde PROPERTIES
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- SKIP_BUILD_RPATH TRUE
+- BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${KDE_INSTALL_LIBDIR}
+-   )
+-endif()
+-
+ install(TARGETS kde DESTINATION ${KDE_INSTALL_PLUGINDIR}/phonon_platform)
+ install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
+ install(FILES phononbackend.desktop DESTINATION 
${KDE_INSTALL_KSERVICETYPES5DIR})

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch
deleted file mode 100644
index 9ff1e38..000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/CMakeLists.txt   2015-01-21 00:23:54.096323752 +0100
-+++ b/CMakeLists.txt   2015-01-21 00:24:36.304654204 +0100
-@@ -7,7 +7,7 @@
- set(QT_MIN_VERSION "5.4.0")
- set(KF5_MIN_VERSION "5.8.0")
- set(INSTALL_SDDM_THEME TRUE)
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick 
QuickWidgets Concurrent Test Script Network)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick 
QuickWidgets Concurrent Script Network)
- find_package(ECM 1.8.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild
index c7e8983..5e8930c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild
@@ -4,9 +4,8 @@
 
 EAPI=6
 
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5 multilib qmake-utils
 
@@ -117,10 +116,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
 "
 
-PATCHES=(
-   "${FILESDIR}/${PN}-5.4-startkde-script.patch"
-   "${FILESDIR}/${PN}-tests-optional.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
 
 RESTRICT="test"
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49..ebuild
index 85a065b..648d32f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49..ebuild
@@ -4,9 +4,8 @@
 
 EAPI=6
 
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5 multilib qmake-utils
 
@@ -96,6 +95,7 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtgraphicaleffects)
$(add_qt_dep qtpaths)
$(add_qt_dep qtquickcontrols 'widgets')
+   app-text/iso-codes
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -119,7 +119,7 @@

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-12-27 Thread Marc Schiffbauer 
commit: d37c9b73cb83e8a1bef578f1fa408402798cb89b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Dec 28 00:31:47 2015 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Dec 28 00:31:47 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d37c9b73

kde-plasma/plasma-workspace: add prefix to agent script

 .../files/{agent-shutdown.sh => 10-agent-shutdown.sh} | 0
 .../files/{agent-startup.sh => 10-agent-startup.sh}   | 0
 ...ma-workspace-5.5.2.ebuild => plasma-workspace-5.5.2-r1.ebuild} | 8 
 kde-plasma/plasma-workspace/plasma-workspace-5.5.49..ebuild   | 8 
 kde-plasma/plasma-workspace/plasma-workspace-.ebuild  | 8 
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/agent-shutdown.sh 
b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
similarity index 100%
rename from kde-plasma/plasma-workspace/files/agent-shutdown.sh
rename to kde-plasma/plasma-workspace/files/10-agent-shutdown.sh

diff --git a/kde-plasma/plasma-workspace/files/agent-startup.sh 
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
similarity index 100%
rename from kde-plasma/plasma-workspace/files/agent-startup.sh
rename to kde-plasma/plasma-workspace/files/10-agent-startup.sh

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.2.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.5.2-r1.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.5.2.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.5.2-r1.ebuild
index 172a9df..7d904f1 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.2-r1.ebuild
@@ -154,10 +154,10 @@ src_install() {
 
# startup and shutdown scripts
insinto /etc/plasma/startup
-   doins "${FILESDIR}/agent-startup.sh"
+   doins "${FILESDIR}/10-agent-startup.sh"
 
insinto /etc/plasma/shutdown
-   doins "${FILESDIR}/agent-shutdown.sh"
+   doins "${FILESDIR}/10-agent-shutdown.sh"
 }
 
 pkg_postinst () {
@@ -165,7 +165,7 @@ pkg_postinst () {
 
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-   elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
-   elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+   elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+   elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
 }

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49..ebuild
index f8f4e9b..002a83c 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.49..ebuild
@@ -154,10 +154,10 @@ src_install() {
 
# startup and shutdown scripts
insinto /etc/plasma/startup
-   doins "${FILESDIR}/agent-startup.sh"
+   doins "${FILESDIR}/10-agent-startup.sh"
 
insinto /etc/plasma/shutdown
-   doins "${FILESDIR}/agent-shutdown.sh"
+   doins "${FILESDIR}/10-agent-shutdown.sh"
 }
 
 pkg_postinst () {
@@ -165,7 +165,7 @@ pkg_postinst () {
 
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-   elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
-   elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+   elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+   elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
 }

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 17de2d7..4e68d3a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -148,10 +148,10 @@ src_install() {
 
# startup and shutdown scripts
insinto /etc/plasma/startup
-   doins "${FILESDIR}/agent-startup.sh"
+   doins "${FILESDIR}/10-agent-startup.sh"
 
insinto /etc/plasma/shutdown
-   doins "${FILESDIR}/agent-shutdown.sh"
+   doins "${FILESDIR}/10-agent-shutdown.sh"
 }
 
 pkg_postinst () {
@@ -159,7 +159,7 @@ pkg_postinst () {
 
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-   elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
-   elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+   elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+   elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
 }

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-11-14 Thread Michael Palimaka 
commit: 7bf4c3b3b8cedd4960c163eccac57eb55883ab96
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Nov 12 23:54:29 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 14 15:22:53 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7bf4c3b3

kde-plasma/plasma-workspace: USE=pam, fix setuid, block kdebase-pam:4

SUID optional per kcheckpass/README, only required for shadow based login
setuid code in upstream cmake does not work, do it manually instead if USE=-pam
Block kdebase-pam which sneakily sabotaged plasma-workspace in /etc/pam.d,
leading to broken screenlocker bugs like #564618

Package-Manager: portage-2.2.24

 .../plasma-workspace-5.4.3-no-SUID-no-GUID.patch| 16 
 4.3.ebuild => plasma-workspace-5.4.3-r1.ebuild} | 21 +++--
 .../plasma-workspace-5.4.49..ebuild | 21 +++--
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
new file mode 100644
index 000..a099b23
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-no-SUID-no-GUID.patch
@@ -0,0 +1,16 @@
+diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
+index 
a63fa1403e897e70989dc2e1ba7eed4bc69cbb51..12d1bfb3c690eca1acf344045a92eb942669da83
 100644
+--- a/ksmserver/screenlocker/kcheckpass/CMakeLists.txt
 b/ksmserver/screenlocker/kcheckpass/CMakeLists.txt
+@@ -22,10 +22,6 @@ endif ()
+ 
+ set_property(TARGET kcheckpass APPEND_STRING PROPERTY COMPILE_FLAGS " 
-U_REENTRANT")
+ target_link_libraries(kcheckpass ${UNIXAUTH_LIBRARIES} ${SOCKET_LIBRARIES})
+-install(TARGETS kcheckpass DESTINATION ${KDE_INSTALL_LIBEXECDIR})
+-install(CODE "
+-set(KCP_PATH \"\$ENV{DESTDIR}${KDE_INSTALL_LIBEXECDIR}/kcheckpass\")
+-execute_process(COMMAND sh -c \"chown root '\${KCP_PATH}' && chmod +s 
'\${KCP_PATH}'\")
+-")
++install(TARGETS kcheckpass DESTINATION ${LIBEXEC_INSTALL_DIR})
+ 
+ #EXTRA_DIST = README

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
similarity index 92%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
index 52f30c5..a0c34fd 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3-r1.ebuild
@@ -12,13 +12,9 @@ inherit kde5 multilib pam qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=" ~amd64 ~x86"
-IUSE="dbus +drkonqi +geolocation gps prison qalculate +systemmonitor"
+IUSE="dbus +drkonqi +geolocation gps pam prison qalculate +systemmonitor"
 
 COMMON_DEPEND="
-   $(add_plasma_dep kwayland)
-   $(add_plasma_dep kwin)
-   $(add_plasma_dep libkscreen)
-   $(add_plasma_dep libksysguard)
$(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
@@ -58,6 +54,10 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlrpcclient)
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
+   $(add_plasma_dep kwayland)
+   $(add_plasma_dep kwin)
+   $(add_plasma_dep libkscreen)
+   $(add_plasma_dep libksysguard)
dev-libs/wayland
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
@@ -70,7 +70,6 @@ COMMON_DEPEND="
dev-qt/qtx11extras:5
dev-qt/qtxml:5
media-libs/phonon[qt5]
-   sys-libs/pam
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
@@ -88,6 +87,7 @@ COMMON_DEPEND="
)
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
+   pam? ( virtual/pam )
prison? ( media-libs/prison:5 )
qalculate? ( sci-libs/libqalculate )
systemmonitor? (
@@ -111,7 +111,9 @@ RDEPEND="${COMMON_DEPEND}
systemmonitor? ( $(add_plasma_dep ksysguard) )
!kde-base/freespacenotifier:4
!kde-base/libtaskmanager:4
+   !

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-11-10 Thread Michael Palimaka 
commit: c2dd7a70701431555e8b1204bc5a332d0e0bb6de
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Mon Nov  9 07:27:43 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Nov  9 22:22:34 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2dd7a70

kde-plasma/plasma-workspace: Fix dead button in drkonqi

Not nice: Getting a crash, then going through drkonqi and encountering a 
usability bug.

Package-Manager: portage-2.2.20.1

 .../files/plasma-workspace-5.4.3-fix-drkonqi.patch | 32 ++
 .../plasma-workspace/plasma-workspace-5.4.3.ebuild |  1 +
 .../plasma-workspace-5.4.49..ebuild|  1 +
 3 files changed, 34 insertions(+)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
new file mode 100644
index 000..9aa89ca
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
@@ -0,0 +1,32 @@
+From: David Edmundson 
+Date: Wed, 21 Oct 2015 16:42:01 +
+Subject: Don't connect to signals which don't exist
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.git=commitdiff=2441d350ef571329b67848f79668f3956534806e
+---
+Don't connect to signals which don't exist
+
+Fix KDialog porting
+---
+
+
+--- a/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
 b/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
+@@ -574,7 +574,7 @@
+   QIcon::fromTheme("view-refresh"),
+   i18nc("@info:tooltip", "Use this button to 
retry "
+   "loading the bug 
report.")));
+-connect(ui.m_retryButton, SIGNAL(clicked()), this, SLOT(reloadReport()));
++connect(ui.m_retryButton, ::clicked, this, 
::reloadReport);
+ 
+ m_suggestButton = new QPushButton(this);
+ ui.buttonBox->addButton(m_suggestButton, QDialogButtonBox::ActionRole);
+@@ -583,7 +583,7 @@
+ QIcon::fromTheme("list-add"), i18nc("@info:tooltip", "Use 
this button to suggest that "
+  "the crash you experienced is 
related to this bug "
+  "report")));
+-connect(this, SIGNAL(user1Clicked()) , this, 
SLOT(relatedReportClicked()));
++connect(m_suggestButton, ::clicked, this, 
::relatedReportClicked);
+ 
+ connect(ui.m_showOwnBacktraceCheckBox, SIGNAL(toggled(bool)), this, 
SLOT(toggleShowOwnBacktrace(bool)));
+ 
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
index f274660..52f30c5 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
@@ -126,6 +126,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+   "${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
 )
 
 RESTRICT="test"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49..ebuild
index f1aa325..7b58192 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49..ebuild
@@ -126,6 +126,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+   "${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch" #Upstream bug 354110
 )
 
 RESTRICT="test"

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-08-16 Thread Johannes Huber 
commit: 2e42a4bcc03207b3226d5bf229d297b353b8a511
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Aug 16 20:08:52 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Aug 16 20:14:32 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e42a4bc

kde-plasma/plasma-workspace: Backport consolekit2 support

Package-Manager: portage-2.2.20.1

 .../files/plasma-workspace-5.4-consolekit2.patch   | 189 +
 .../plasma-workspace-5.4.49..ebuild|   5 +-
 2 files changed, 193 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
new file mode 100644
index 000..6131c90
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-consolekit2.patch
@@ -0,0 +1,189 @@
+From: Eric Koegel eric.koe...@gmail.com
+Date: Wed, 12 Aug 2015 08:33:39 +
+Subject: ConsoleKit2 support for screenlocker
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.gita=commitdiffh=72578284a1fda5f012cafcaccad6069fadbf9a25
+---
+ConsoleKit2 support for screenlocker
+
+ConsoleKit2 has the same API as systemd-logind for Lock, Unlock,
+PrepareForSleep, and Inhibit. This patch adds the functionality
+for ConsoleKit2 while attempting to minimize code duplication.
+
+REVIEW: 124469
+---
+
+
+--- a/ksmserver/screenlocker/logind.cpp
 b/ksmserver/screenlocker/logind.cpp
+@@ -25,13 +25,17 @@
+ #include QDebug
+ #include QDBusConnection
+ #include QDBusConnectionInterface
+-#include QDBusPendingCallWatcher
+ #include QDBusServiceWatcher
+ 
+ const static QString s_login1Service = 
QStringLiteral(org.freedesktop.login1);
+ const static QString s_login1Path = QStringLiteral(/org/freedesktop/login1);
+ const static QString s_login1ManagerInterface = 
QStringLiteral(org.freedesktop.login1.Manager);
+ const static QString s_login1SessionInterface = 
QStringLiteral(org.freedesktop.login1.Session);
++
++const static QString s_consolekitService = 
QStringLiteral(org.freedesktop.ConsoleKit);
++const static QString s_consolekitPath = 
QStringLiteral(/org/freedesktop/ConsoleKit/Manager);
++const static QString s_consolekitManagerInterface = 
QStringLiteral(org.freedesktop.ConsoleKit.Manager);
++const static QString s_consolekitSessionInterface = 
QStringLiteral(org.freedesktop.ConsoleKit.Session);
+ 
+ LogindIntegration::LogindIntegration(const QDBusConnection connection, 
QObject *parent)
+ : QObject(parent)
+@@ -42,6 +46,10 @@
+  this))
+ , m_connected(false)
+ , m_inhibitFileDescriptor()
++, m_service(nullptr)
++, m_path(nullptr)
++, m_managerInterface(nullptr)
++, m_sessionInterface(nullptr)
+ {
+ connect(m_logindServiceWatcher, QDBusServiceWatcher::serviceRegistered, 
this, LogindIntegration::logindServiceRegistered);
+ connect(m_logindServiceWatcher, 
QDBusServiceWatcher::serviceUnregistered, this,
+@@ -67,6 +75,11 @@
+ }
+ if (reply.value().contains(s_login1Service)) {
+ logindServiceRegistered();
++// Don't register ck if we have logind
++return;
++}
++if (reply.value().contains(s_consolekitService)) {
++consolekitServiceRegistered();
+ }
+ }
+ );
+@@ -89,6 +102,40 @@
+ message.setArguments(QVariantList()  (quint32) 
QCoreApplication::applicationPid());
+ QDBusPendingReplyQDBusObjectPath session = m_bus.asyncCall(message);
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(session, 
this);
++
++m_service = s_login1Service;
++m_path = s_login1Path;
++m_managerInterface = s_login1ManagerInterface;
++m_sessionInterface = s_login1SessionInterface;
++
++commonServiceRegistered(watcher);
++}
++
++void LogindIntegration::consolekitServiceRegistered()
++{
++// Don't try to register with ck if we have logind
++if (m_connected) {
++return;
++}
++
++// get the current session
++QDBusMessage message = QDBusMessage::createMethodCall(s_consolekitService,
++  s_consolekitPath,
++  
s_consolekitManagerInterface,
++  
QStringLiteral(GetCurrentSession));
++QDBusPendingReplyQDBusObjectPath session = m_bus.asyncCall(message);
++QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(session, 
this);
++
++m_service = s_consolekitService;
++m_path = s_consolekitPath;
++m_managerInterface = s_consolekitManagerInterface;
++m_sessionInterface = s_consolekitSessionInterface;
++
++commonServiceRegistered(watcher);
++}
++
++void LogindIntegration::commonServiceRegistered(QDBusPendingCallWatcher 
*watcher)
++{
+

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-07-04 Thread Johannes Huber 
commit: 2e88b36c1e59478154b4ee8899c38917c3bb8e5f
Author: Elias Probst mail AT eliasprobst DOT eu
AuthorDate: Sat Jul  4 09:35:23 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Jul  4 13:09:11 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2e88b36c

[kde-plasma/plasma-workspace] Update startkde Gentoo FHS patch for 5.4

Package-Manager: portage-2.2.20

 .../plasma-workspace-5.4-startkde-script.patch | 40 ++
 .../plasma-workspace/plasma-workspace-.ebuild  |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch
new file mode 100644
index 000..1630080
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4-startkde-script.patch
@@ -0,0 +1,40 @@
+From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
+From: Elias Probst m...@eliasprobst.eu
+Date: Sat, 4 Jul 2015 11:33:01 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 2585600..9350158 100644
+--- a/startkde/startkde.cmake
 b/startkde/startkde.cmake
+@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in @GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/*.sh; do
++  test -r ${file}  . ${file}
++done
++
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
+@@ -417,6 +422,11 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in @GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/*.sh; do
++  test -r ${file}  . ${file}
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+2.3.6
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 6c2b55a..5a4bbde 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -121,7 +121,7 @@ DEPEND=${COMMON_DEPEND}
x11-proto/xproto
 
 
-PATCHES=( ${FILESDIR}/${PN}-startkde-script.patch )
+PATCHES=( ${FILESDIR}/${PN}-5.4-startkde-script.patch )
 
 RESTRICT=test

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2015-07-04 Thread Johannes Huber 
commit: 1f6826e1ba626272152410e78034e113bfdd242d
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Jul  4 14:52:23 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Jul  4 14:52:23 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1f6826e1

[kde-plasma/plasma-workspace] Remove unused patch

Package-Manager: portage-2.2.20

 .../files/plasma-workspace-startkde-script.patch   | 40 --
 1 file changed, 40 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch
deleted file mode 100644
index 8fb3756..000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-startkde-script.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001
-From: Johannes Huber j...@gentoo.org
-Date: Wed, 28 May 2014 16:00:41 +0200
-Subject: [PATCH] [startkde] Gentoo FHS script support
-

- startkde/startkde.cmake | 10 ++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index f073b93..1c41364 100644
 a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -206,6 +206,11 @@ for prefix in `echo $libpath | sed -n -e 
's,/lib[^/]*/,/env/,p'`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in @GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/*.sh; do
-+  test -r ${file}  . ${file}
-+done
-+
- # Set the path for Qt plugins provided by KDE
- QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
- # TODO: Do we really need this?
-@@ -411,6 +416,11 @@ for prefix in `echo $libpath | sed -n -e 
's,/lib[^/]*/,/shutdown/,p'`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in @GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/*.sh; do
-+  test -r ${file}  . ${file}
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--- 
-1.9.3
-

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-06-01 Thread Michael Palimaka 
commit: 14b79a7d4e149c0ed23a4480fa4e4ededafbe126
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Mon Jun  1 18:18:09 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Mon Jun  1 18:18:09 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=14b79a7d

[kde-plasma/plasma-workspace] Import PAM files from kde-base/kdebase-pam.

These files are currently only used by kcheckpass for unlocking the screen.

Package-Manager: portage-2.2.20

 kde-plasma/plasma-workspace/files/kde-np.pam  | 10 ++
 kde-plasma/plasma-workspace/files/kde.pam | 11 +++
 .../plasma-workspace/plasma-workspace-5.3.49..ebuild  |  6 --
 kde-plasma/plasma-workspace/plasma-workspace-.ebuild  |  6 --
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/kde-np.pam 
b/kde-plasma/plasma-workspace/files/kde-np.pam
new file mode 100644
index 000..f5499e6
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/kde-np.pam
@@ -0,0 +1,10 @@
+#%PAM-1.0
+
+auth   required pam_nologin.so
+auth  required pam_permit.so
+
+accountinclude  system-local-login
+
+password   include  system-local-login
+
+sessioninclude  system-local-login

diff --git a/kde-plasma/plasma-workspace/files/kde.pam 
b/kde-plasma/plasma-workspace/files/kde.pam
new file mode 100644
index 000..24d19de
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/kde.pam
@@ -0,0 +1,11 @@
+#%PAM-1.0
+
+auth   required pam_nologin.so
+
+auth   include  system-local-login
+
+accountinclude  system-local-login
+
+password   include  system-local-login
+
+sessioninclude  system-local-login

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49..ebuild
index c05b182..a7d7177 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.49..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.49..ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=true
 KDE_PUNT_BOGUS_DEPS=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
-inherit kde5 multilib
+inherit kde5 multilib pam
 
 DESCRIPTION=KDE Plasma workspace
 KEYWORDS=
@@ -102,7 +102,6 @@ RDEPEND=${COMMON_DEPEND}
dev-qt/qdbus:5
dev-qt/qtpaths:5
dev-qt/qtquickcontrols:5[widgets]
-   kde-base/kdebase-pam
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -158,6 +157,9 @@ src_configure() {
 src_install() {
kde5_src_install
 
+   newpamd ${FILESDIR}/kde.pam kde
+   newpamd ${FILESDIR}/kde-np.pam kde-np
+
# startup and shutdown scripts
insinto /etc/plasma/startup
doins ${FILESDIR}/agent-startup.sh

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 329e224..6c2b55a 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=true
 KDE_PUNT_BOGUS_DEPS=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
-inherit kde5 multilib
+inherit kde5 multilib pam
 
 DESCRIPTION=KDE Plasma workspace
 KEYWORDS=
@@ -101,7 +101,6 @@ RDEPEND=${COMMON_DEPEND}
dev-qt/qdbus:5
dev-qt/qtpaths:5
dev-qt/qtquickcontrols:5[widgets]
-   kde-base/kdebase-pam
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
@@ -157,6 +156,9 @@ src_configure() {
 src_install() {
kde5_src_install
 
+   newpamd ${FILESDIR}/kde.pam kde
+   newpamd ${FILESDIR}/kde-np.pam kde-np
+
# startup and shutdown scripts
insinto /etc/plasma/startup
doins ${FILESDIR}/agent-startup.sh

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-04-29 Thread Michael Palimaka 
commit: 05925f03204aa85f9e8a6c26f34b61150b6c5375
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Wed Apr 29 15:02:19 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Apr 29 15:02:19 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=05925f03

[kde-plasma/plasma-workspace] Backport patch from upstream to fix upstream bug 
#346870.

Package-Manager: portage-2.2.18

 .../files/plasma-workspace-5.3.0-segfault.patch| 30 ++
 ...3.0.ebuild = plasma-workspace-5.3.0-r1.ebuild} |  5 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch
new file mode 100644
index 000..2a669cd
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch
@@ -0,0 +1,30 @@
+From a234c0923767649cc6545866a563ffc4dba58de2 Mon Sep 17 00:00:00 2001
+From: Marco Martin notm...@gmail.com
+Date: Wed, 29 Apr 2015 09:28:11 +0200
+Subject: [PATCH] check for model existence
+
+BUG:346870
+---
+ wallpapers/image/image.cpp | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp
+index a3b9c10..f5920bf 100644
+--- a/wallpapers/image/image.cpp
 b/wallpapers/image/image.cpp
+@@ -799,6 +799,12 @@ void Image::removeWallpaper(QString name)
+ 
+ void Image::commitDeletion()
+ {
++//This is invokable from qml, so at any moment
++//we can't be sure the model exists
++if (!m_model) {
++return;
++}
++
+ for (const QString wallpaperCandidate : 
m_model-wallpapersAwaitingDeletion()) {
+ removeWallpaper(wallpaperCandidate);
+ }
+-- 
+2.0.5
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild
similarity index 97%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild
index 1445a90..7fb571f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild
@@ -123,7 +123,10 @@ DEPEND=${COMMON_DEPEND}
x11-proto/xproto
 
 
-PATCHES=( ${FILESDIR}/${PN}-startkde-script.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-startkde-script.patch
+   ${FILESDIR}/${P}-segfault.patch
+)
 
 RESTRICT=test

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2015-04-03 Thread Johannes Huber 
commit: b9b41d3500783564bafa429102cdb95a5caedf4c
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Fri Apr  3 21:23:41 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Fri Apr  3 21:23:41 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9b41d35

[kde-plasma/plasma-workspace] Drop unused patch

Package-Manager: portage-2.2.18

 .../files/plasma-workspace-5.2.0-freeze.patch  | 35 --
 1 file changed, 35 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch
deleted file mode 100644
index 992ea2c..000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ba81da53e540ce9ca08ce794a92329ed15f726bc Mon Sep 17 00:00:00 2001
-From: Nick Shaforostoff sha...@ukr.net
-Date: Tue, 27 Jan 2015 01:53:17 +
-Subject: [PATCH] =?UTF-8?q?fix=20total=20system=20freeze=20on=20some=20sys?=
- =?UTF-8?q?tems=20like=20my=2010=20inch=20netbook=20thanks=20Thomas=20L?=
- =?UTF-8?q?=C3=BCbking=20for=20providing=20the=20patch=20BUG:=20340294?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-

- lookandfeel/contents/windowswitcher/WindowSwitcher.qml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml 
b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
-index acb212f..e4a4636 100644
 a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
-+++ b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
-@@ -52,7 +52,7 @@ KWin.Switcher {
- 
- property bool canStretchX: false
- property bool canStretchY: false
--width: tabBox.screenGeometry.width * 0.15
-+width: tabBox.screenGeometry.width * 0.15 + 
(__verticalScrollBar.visible ? __verticalScrollBar.width : 0)
- height: tabBox.screenGeometry.height
- clip: true
- focus: true
-@@ -155,3 +155,4 @@ KWin.Switcher {
- }
- }
- }
-+
--- 
-2.2.2
-

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2015-03-14 Thread Johannes Huber 
commit: 8b5b9925fab8d72dfdfe68f9cc42a3243ba61fa4
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Fri Mar 13 20:59:37 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Mar 14 12:42:57 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b5b9925

[kde-plasma/plasma-workspace] Fix tests-optional patch

Package-Manager: portage-2.2.18

 .../files/plasma-workspace--tests-optional.patch| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
index 11606f7..9ff1e38 100644
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
@@ -1,11 +1,11 @@
 --- a/CMakeLists.txt   2015-01-21 00:23:54.096323752 +0100
 +++ b/CMakeLists.txt   2015-01-21 00:24:36.304654204 +0100
 @@ -7,7 +7,7 @@
- set(QT_MIN_VERSION 5.3.0)
- set(KF5_MIN_VERSION 5.7.0)
+ set(QT_MIN_VERSION 5.4.0)
+ set(KF5_MIN_VERSION 5.8.0)
  set(INSTALL_SDDM_THEME TRUE)
 -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick 
QuickWidgets Concurrent Test Script Network)
 +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick 
QuickWidgets Concurrent Script Network)
- find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+ find_package(ECM 1.8.0 REQUIRED NO_MODULE)
  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-01-28 Thread Johannes Huber 
commit: 18a9e9790c13bea5f6c4e27cbbb0c73288be9c3f
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Tue Jan 27 20:06:45 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Tue Jan 27 20:06:45 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=18a9e979

[kde-plasma/plasma-workspace] Revision bump

Backports freeze patch.

Package-Manager: portage-2.2.15

---
 .../files/plasma-workspace-5.2.0-freeze.patch  | 35 ++
 ...2.0.ebuild = plasma-workspace-5.2.0-r1.ebuild} |  5 +++-
 .../plasma-workspace-5.2..ebuild   |  5 +++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch
new file mode 100644
index 000..992ea2c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.2.0-freeze.patch
@@ -0,0 +1,35 @@
+From ba81da53e540ce9ca08ce794a92329ed15f726bc Mon Sep 17 00:00:00 2001
+From: Nick Shaforostoff sha...@ukr.net
+Date: Tue, 27 Jan 2015 01:53:17 +
+Subject: [PATCH] =?UTF-8?q?fix=20total=20system=20freeze=20on=20some=20sys?=
+ =?UTF-8?q?tems=20like=20my=2010=20inch=20netbook=20thanks=20Thomas=20L?=
+ =?UTF-8?q?=C3=BCbking=20for=20providing=20the=20patch=20BUG:=20340294?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ lookandfeel/contents/windowswitcher/WindowSwitcher.qml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml 
b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
+index acb212f..e4a4636 100644
+--- a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
 b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml
+@@ -52,7 +52,7 @@ KWin.Switcher {
+ 
+ property bool canStretchX: false
+ property bool canStretchY: false
+-width: tabBox.screenGeometry.width * 0.15
++width: tabBox.screenGeometry.width * 0.15 + 
(__verticalScrollBar.visible ? __verticalScrollBar.width : 0)
+ height: tabBox.screenGeometry.height
+ clip: true
+ focus: true
+@@ -155,3 +155,4 @@ KWin.Switcher {
+ }
+ }
+ }
++
+-- 
+2.2.2
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.0.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r1.ebuild
similarity index 97%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.2.0.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r1.ebuild
index e7a27b1..caff838 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.0.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r1.ebuild
@@ -103,7 +103,10 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
-PATCHES=( ${FILESDIR}/${PN}-startkde-script.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-startkde-script.patch
+   ${FILESDIR}/${P}-freeze.patch
+)
 
 RESTRICT=test
 

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2..ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.2..ebuild
index 6d1bbe6..46738bc 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2..ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2..ebuild
@@ -103,7 +103,10 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
-PATCHES=( ${FILESDIR}/${PN}-startkde-script.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-startkde-script.patch
+   ${FILESDIR}/${PN}-5.2.0-freeze.patch
+)
 
 RESTRICT=test

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/

2015-01-25 Thread Johannes Huber 
commit: f835cf7769f5de219e649008d9c82f829496f273
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Fri Jan 23 21:40:38 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Jan 25 19:25:10 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f835cf77

[kde-plasma/plasma-workspace] Update patch

---
 .../plasma-workspace/files/plasma-workspace--tests-optional.patch  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
index 1c9c6bf..79285e5 100644
--- 
a/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
@@ -11,13 +11,14 @@
  
 --- a/drkonqi/internalkxmlrpcclient/CMakeLists.txt 2015-01-20 
23:55:55.857657633 +0100
 +++ b/drkonqi/internalkxmlrpcclient/CMakeLists.txt 2015-01-21 
00:05:27.684341452 +0100
-@@ -33,7 +33,10 @@
+@@ -33,7 +33,11 @@
  
  ### Targets ###
  add_subdirectory(src)
 -add_subdirectory(autotests)
 +
 +if(BUILD_TESTING)
++  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
 +  add_subdirectory(autotests)
 +endif()

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

2015-01-21 Thread Johannes Huber 
commit: 5bca4f847ba82eed4ff02cb5c8ffa794e2ebd325
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Tue Jan 20 23:15:57 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jan 21 20:47:43 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5bca4f84

[kde-plasma/plasma-workspace] Make tests optional
drkonqi/internalkxmlrpcclient/autotests subdir was added unconditionally.

---
 .../plasma-workspace--tests-optional.patch | 25 ++
 .../plasma-workspace/plasma-workspace-.ebuild  |  4 
 2 files changed, 29 insertions(+)

diff --git 
a/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch 
b/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
new file mode 100644
index 000..1c9c6bf
--- /dev/null
+++ 
b/kde-plasma/plasma-workspace/files/plasma-workspace--tests-optional.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt   2015-01-21 00:23:54.096323752 +0100
 b/CMakeLists.txt   2015-01-21 00:24:36.304654204 +0100
+@@ -7,7 +7,7 @@
+ set(QT_MIN_VERSION 5.3.0)
+ set(KF5_MIN_VERSION 5.7.0)
+ set(INSTALL_SDDM_THEME TRUE)
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick 
QuickWidgets Concurrent Test Script Network)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick 
QuickWidgets Concurrent Script Network)
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ 
+--- a/drkonqi/internalkxmlrpcclient/CMakeLists.txt 2015-01-20 
23:55:55.857657633 +0100
 b/drkonqi/internalkxmlrpcclient/CMakeLists.txt 2015-01-21 
00:05:27.684341452 +0100
+@@ -33,7 +33,10 @@
+ 
+ ### Targets ###
+ add_subdirectory(src)
+-add_subdirectory(autotests)
++
++if(BUILD_TESTING)
++  add_subdirectory(autotests)
++endif()
+ 
+ ### CMake Config Files ###
+ set(CMAKECONFIG_INSTALL_DIR 
${CMAKECONFIG_INSTALL_PREFIX}/KF5XmlRpcClientPrivate)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
index 6d1bbe6..47fdee6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_TEST=true
 VIRTUALX_REQUIRED=test
 inherit kde5 multilib
 
@@ -108,6 +109,9 @@ PATCHES=( ${FILESDIR}/${PN}-startkde-script.patch )
 RESTRICT=test
 
 src_prepare() {
+   # whole patch should be upstreamed, doesn't work in PATCHES
+   epatch ${FILESDIR}/${PN}--tests-optional.patch
+
kde5_src_prepare
 
sed -e s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths| -i 
startkde/startkde.cmake || die