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

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

[Johannes Huber]

commit:     f835cf7769f5de219e649008d9c82f829496f273
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jan 23 21:40:38 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 19:25:10 2015 +0000
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-9999-tests-optional.patch  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
index 1c9c6bf..79285e5 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-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/

[Johannes Huber]

commit:     8b5b9925fab8d72dfdfe68f9cc42a3243ba61fa4
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Mar 13 20:59:37 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 12:42:57 2015 +0000
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-9999-tests-optional.patch                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
index 11606f7..9ff1e38 100644
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-9999-tests-optional.patch
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-9999-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/

[Johannes Huber]

commit:     b9b41d3500783564bafa429102cdb95a5caedf4c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 21:23:41 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 21:23:41 2015 +0000
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..0000000
--- 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 <shafff@ukr.net>
-Date: Tue, 27 Jan 2015 01:53:17 +0000
-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/

[Johannes Huber]

commit:     1f6826e1ba626272152410e78034e113bfdd242d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  4 14:52:23 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul  4 14:52:23 2015 +0000
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..0000000
--- 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 <johu@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/

[Michael Palimaka]

commit:     ca6c861f8f54ccb7521ec91da98f73bab1f91e8a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 17:42:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 18:43:56 2016 +0000
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/

[Michael Palimaka]

commit:     54f2348de8aed0a30960a340bbd762196da488a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 13:45:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:45:22 2016 +0000
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/

[Michael Palimaka]

commit:     645e367463ba20d85f5e447b81a0218cdd47ed52
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 10:01:25 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 10:01:32 2017 +0000
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/

[Andreas Sturmlechner]

commit:     347f505707ad7ddd924a92afc93b5e7246619419
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:19:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 18:19:22 2017 +0000
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..0000000000
--- 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 <andreas.sturmlechner@gmail.com>
-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/

[Johannes Huber]

commit:     4490e86912e247348b50afa3d6f9296b4501f0f0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 16:26:56 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May  1 16:26:56 2018 +0000
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/

[Michael Palimaka]

commit:     44bbf089d13ca48e98b677f6e7048f84e479a96b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 10:32:17 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 10:32:43 2019 +0000
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 <kensington <AT> 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
+# <gnupg-2.1.x
 #if [ -n "${GPG_AGENT_INFO}" ]; then
 #	kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/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/

[Andreas Sturmlechner]

commit:     abba77cd84257b5db9aa9a38d4b9a817308bad77
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 15:38:00 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 15:38:00 2019 +0000
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 <asturm <AT> 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..0000000000
--- 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?= <koalinux@gmail.com>
-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..0000000000
--- 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 <mail@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
-+
- # 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..0000000000
--- 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 <asturm@gentoo.org>
-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, renaming X11 session to "Plasma on Xorg" appears to be the most
-elegant solution out of the deadlock. SDDM can be fixed any time later.
-
-CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
-See also: https://github.com/sddm/sddm/pull/997
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D22210
----
- plasma.desktop.cmake | 46 +----------------------------
- 1 file changed, 1 insertion(+), 45 deletions(-)
-
-diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake
-index 4d361606d..099de2908 100644
---- a/plasma.desktop.cmake
-+++ b/plasma.desktop.cmake
-@@ -3,51 +3,7 @@ Type=XSession
- Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
- TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
- DesktopNames=KDE
--Name=Plasma
--Name[ar]=بلازما
--Name[bs]=Plazma
--Name[ca]=Plasma
--Name[ca@valencia]=Plasma
--Name[cs]=Plasma
--Name[da]=Plasma
--Name[de]=Plasma
--Name[el]=Plasma
--Name[en_GB]=Plasma
--Name[es]=Plasma
--Name[et]=Plasma
--Name[eu]=Plasma
--Name[fi]=Plasma
--Name[fr]=Plasma
--Name[gl]=Plasma
--Name[he]=פלזמה
--Name[hu]=Plasma
--Name[id]=Plasma
--Name[is]=Plasma
--Name[it]=Plasma
--Name[ja]=プラズマ
--Name[ko]=Plasma
--Name[lt]=Plasma
--Name[nb]=Plasma
--Name[nds]=Plasma
--Name[nl]=Plasma
--Name[nn]=Plasma
--Name[pa]=ਪਲਾਜ਼ਮਾ
--Name[pl]=Plazma
--Name[pt]=Plasma
--Name[pt_BR]=Plasma
--Name[ru]=Plasma
--Name[sk]=Plasma
--Name[sl]=Plasma
--Name[sr]=Плазма
--Name[sr@ijekavian]=Плазма
--Name[sr@ijekavianlatin]=Plasma
--Name[sr@latin]=Plasma
--Name[sv]=Plasma
--Name[tr]=Plama
--Name[uk]=Плазма
--Name[x-test]=xxPlasmaxx
--Name[zh_CN]=Plasma
--Name[zh_TW]=Plasma
-+Name=Plasma on Xorg
- Comment=Plasma by KDE
- Comment[ar]=بلازما كدي
- Comment[bs]=Plazma od strane KDe
--- 
-2.22.0
-

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
deleted file mode 100644
index dc5214b303..0000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See also: https://phabricator.kde.org/D22691
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@
- include(KDEPackageAppTemplates)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
-+                    Plasma DocTools Runner NotifyConfig Su NewStuff Wallet
-                     IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
-                     DBusAddons Wayland CoreAddons)
- find_package(KDED CONFIG REQUIRED)
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -24,7 +24,6 @@
- add_subdirectory(time)
- add_subdirectory(weather)
- add_subdirectory(statusnotifieritem)
--add_subdirectory(share)
- 
- if(NOT WIN32)
-   add_subdirectory(mouse)

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

[Andreas Sturmlechner]

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

kde-plasma/plasma-workspace: Drop unused patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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..0000000000
--- 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 <andreas.sturmlechner@gmail.com>
-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/

[Andreas Sturmlechner]

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

kde-plasma/plasma-workspace: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> 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..0000000000
--- 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 <asturm@gentoo.org>
-Date: Mon, 21 Feb 2022 12:24:56 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- 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
-