subject:"\[gentoo\-commits\] proj\/kde\:master commit in\: kde\-plasma\/libkworkspace\/, kde\-plasma\/libkworkspace\/files\/"

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

2023-11-30 Thread Andreas Sturmlechner

commit: 6001b74155bc5040fa30615d21f39b8b6d025d21
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 30 22:54:46 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 30 22:54:46 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6001b741

kde-plasma/libkworkspace: Fist attempt at a standalone-build patch

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

 .../files/libkworkspace-5.90.0-standalone.patch| 104 +
 kde-plasma/libkworkspace/libkworkspace-.ebuild |   7 +-
 2 files changed, 109 insertions(+), 2 deletions(-)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch 
b/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch
new file mode 100644
index 00..5ce29c118a
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.90.0-standalone.patch
@@ -0,0 +1,104 @@
+From a3c528c0d5c4305c44076141150ded3e89db6bc2 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 | 67 
+ 2 files changed, 72 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1b66b8709..62f48ef99a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,3 +1,57 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++set(PROJECT_VERSION "5.90.0")
++set(PROJECT_VERSION_MAJOR 6)
++
++cmake_minimum_required(VERSION 3.16)
++
++set(QT_MIN_VERSION "6.5.0")
++set(KF6_MIN_VERSION "5.240.0")
++find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus 
WaylandClient)
++find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(KDECompilerSettings NO_POLICY_SCOPE)
++include(ECMMarkNonGuiExecutable)
++include(CMakePackageConfigHelpers)
++include(WriteBasicConfigVersionFile)
++include(CheckIncludeFiles)
++include(FeatureSummary)
++include(ECMQtDeclareLoggingCategory)
++include(KDEPackageAppTemplates)
++include(ECMMarkAsTest)
++include(GenerateExportHeader)
++
++find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons 
I18n Package Service WindowSystem)
++find_package(Plasma ${PROJECT_VERSION} REQUIRED)
++find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(KScreenLocker 5.13.80 REQUIRED)
++find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++find_package(PlasmaWaylandProtocols 1.6 REQUIRED)
++
++find_package(X11)
++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++URL "http://www.x.org;
++TYPE OPTIONAL
++PURPOSE "Required for X11 support")
++
++if(X11_FOUND)
++find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR IMAGE)
++set(HAVE_X11 1)
++endif()
++
++if(BUILD_TESTING)
++find_package(Qt6Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
++check_include_files(unistd.h HAVE_UNISTD_H)
++
++configure_file(../config-workspace.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++configure_file(../config-X11.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-outputorder.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-outputorder.h)
+ 
+@@ -23,11 +77,19 @@ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
+ 
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml 
screenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt_add_dbus_interface(kworkspace_LIB_SRCS 
../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml 
logoutprompt_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml 
startup_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml 
shutdown_interface)
+ 
+ set(ksmserver_xml 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++endif()
++
+ qt_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} 
ksmserver_interface )
+ 
+

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

2023-11-24 Thread Andreas Sturmlechner

commit: db40acb48537157b96f7426a6c2ff4d9633748ca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 24 10:45:26 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 24 11:18:40 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=db40acb4

kde-plasma/libkworkspace: Drop unused dep from buildsys

Follow-up to commit e1c57a19fd76acdbb4f479c7a674f1d0ffc4ae91

Closes: https://bugs.gentoo.org/918114
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 22.80-standalone.patch => libkworkspace-5.27.9-standalone.patch} | 4 ++--
 kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild   | 5 ++---
 kde-plasma/libkworkspace/libkworkspace-.ebuild   | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch 
b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch
similarity index 96%
rename from 
kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch
rename to kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch
index 971dc941d0..85eddb74b5 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch
@@ -39,7 +39,7 @@ index 015c5181f..0aa635e11 100644
 +include(ECMMarkAsTest)
 +include(GenerateExportHeader)
 +
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons 
I18n Init WindowSystem)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons 
I18n WindowSystem)
 +
 +find_package(KWinDBusInterface CONFIG REQUIRED)
 +find_package(KScreenLocker 5.13.80 REQUIRED)
@@ -69,7 +69,7 @@ index 015c5181f..0aa635e11 100644
  set(kworkspace_LIB_SRCS kdisplaymanager.cpp
  kworkspace.cpp
 @@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
- qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS kf5_org.kde.KLauncher.xml 
klauncher_interface)
  qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml 
screenlocker_interface )
  qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml 
kscreenlocker_interface )
 +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})

diff --git a/kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild 
b/kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild
index 050451a862..0fdde3aac2 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.27.49..ebuild
@@ -11,6 +11,7 @@ QTMIN=5.15.9
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
+S="${S}/${PN}"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -34,15 +35,13 @@ DEPEND="${RDEPEND}
>=kde-plasma/kwin-${PVCUT}:5
 "
 
-S="${S}/${PN}"
-
 src_prepare() {
# delete colliding libkworkspace translations, let ecm_src_prepare do 
its magic
find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete 
|| die
rm -rf po/*/docs || die
cp -a ../po ./ || die
 
-   eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch"
+   eapply "${FILESDIR}/${PN}-5.27.9-standalone.patch"
sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
cat >> CMakeLists.txt <<- _EOF_ || die
ki18n_install(po)

diff --git a/kde-plasma/libkworkspace/libkworkspace-.ebuild 
b/kde-plasma/libkworkspace/libkworkspace-.ebuild
index 050451a862..0fdde3aac2 100644
--- a/kde-plasma/libkworkspace/libkworkspace-.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-.ebuild
@@ -11,6 +11,7 @@ QTMIN=5.15.9
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
+S="${S}/${PN}"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -34,15 +35,13 @@ DEPEND="${RDEPEND}
>=kde-plasma/kwin-${PVCUT}:5
 "
 
-S="${S}/${PN}"
-
 src_prepare() {
# delete colliding libkworkspace translations, let ecm_src_prepare do 
its magic
find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete 
|| die
rm -rf po/*/docs || die
cp -a ../po ./ || die
 
-   eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch"
+   eapply "${FILESDIR}/${PN}-5.27.9-standalone.patch"
sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
cat >> CMakeLists.txt <<- _EOF_ || die
ki18n_install(po)

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

2021-12-10 Thread Andreas Sturmlechner

commit: 92c8a38b51613f972cbbdcf6fe3a6a96612f20c1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  9 14:35:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 10 15:09:54 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=92c8a38b

kde-plasma/libkworkspace: Fix sleep/suspend race condition

(not fixed in 5.23 branch yet)

See also: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164

Thanks-to: Joe Breuer  jmbreuer.net>
Bug: https://bugs.gentoo.org/818124
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...bkworkspace-5.23.3-synchronous-dbus-calls.patch | 48 ++
 .../libkworkspace-5.23.49..ebuild  |  5 +++
 2 files changed, 53 insertions(+)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
 
b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
new file mode 100644
index 00..411bebf704
--- /dev/null
+++ 
b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
@@ -0,0 +1,48 @@
+From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001
+From: Joe Breuer 
+Date: Mon, 1 Nov 2021 07:19:51 +
+Subject: [PATCH] Fix sleep/suspend sometimes not working ... from
+ ksmserver-logout-greeter, by making the DBus calls synchronous.
+
+---
+ libkworkspace/sessionmanagementbackend.cpp | 9 +
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp
+index 83cd39395..a77a8a475 100644
+--- a/sessionmanagementbackend.cpp
 b/sessionmanagementbackend.cpp
+@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown()
+ {
+ // logind will confirm credentials with the caller, if the app quits 
after sending this
+ // this may fail
+-// its not really needed for suspend tasks where the calling app won't be 
closing
+ m_login1->PowerOff(true).waitForFinished();
+ }
+ 
+@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot()
+ 
+ void LogindSessionBackend::suspend()
+ {
+-m_login1->Suspend(true);
++// these need to be synchronous as well - ksmserver-logout-greeter 
specifically calls these
++// and will quit immediately after
++m_login1->Suspend(true).waitForFinished();
+ }
+ 
+ void LogindSessionBackend::hybridSuspend()
+ {
+-m_login1->HybridSleep(true);
++m_login1->HybridSleep(true).waitForFinished();
+ }
+ 
+ void LogindSessionBackend::hibernate()
+ {
+-m_login1->Hibernate(true);
++m_login1->Hibernate(true).waitForFinished();;
+ }
+ 
+ bool LogindSessionBackend::canShutdown() const
+-- 
+GitLab
+

diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild 
b/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild
index 252d6c896f..2122fa3b82 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.23.49..ebuild
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 
 S="${S}/${PN}"
 
+PATCHES=(
+   # Pending: 
https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
+   "${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124
+)
+
 src_prepare() {
# delete colliding libkworkspace translations, let ecm_src_prepare do 
its magic
if [[ ${KDE_BUILD_TYPE} = release ]]; then

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

2021-06-03 Thread Andreas Sturmlechner

commit: 8c3a34b8a167c3ec6713ac3731115a4cbda7926a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  3 10:55:17 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  3 10:55:17 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c3a34b8

kde-plasma/libkworkspace: Rebase standalone.patch on top of HEAD

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

 .../files/libkworkspace-5.22.80-standalone.patch   | 108 +
 kde-plasma/libkworkspace/libkworkspace-.ebuild |   2 +-
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch 
b/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch
new file mode 100644
index 00..971dc941d0
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch
@@ -0,0 +1,108 @@
+From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ libkworkspace/CMakeLists.txt | 67 +++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 015c5181f..0aa635e11 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++set(PROJECT_VERSION "GENTOO_PV")
++set(PROJECT_VERSION_MAJOR 5)
++
++cmake_minimum_required(VERSION 3.16)
++
++set(QT_MIN_VERSION "5.15.0")
++set(KF5_MIN_VERSION "5.82.0")
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(KDECompilerSettings NO_POLICY_SCOPE)
++include(ECMMarkNonGuiExecutable)
++include(CMakePackageConfigHelpers)
++include(WriteBasicConfigVersionFile)
++include(CheckIncludeFiles)
++include(FeatureSummary)
++include(ECMQtDeclareLoggingCategory)
++include(KDEPackageAppTemplates)
++include(ECMMarkAsTest)
++include(GenerateExportHeader)
++
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons 
I18n Init WindowSystem)
++
++find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(KScreenLocker 5.13.80 REQUIRED)
++find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++find_package(X11)
++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++URL "http://www.x.org;
++TYPE OPTIONAL
++PURPOSE "Required for X11 support")
++
++if(X11_FOUND)
++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++set(HAVE_X11 1)
++endif()
++
++if(BUILD_TESTING)
++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
++check_include_files(unistd.h HAVE_UNISTD_H)
++
++configure_file(../config-workspace.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++configure_file(../config-X11.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+ kworkspace.cpp
+@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml 
screenlocker_interface )
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml 
kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt_add_dbus_interface(kworkspace_LIB_SRCS 
../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml 
logoutprompt_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml 
startup_interface)
+ qt_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml 
shutdown_interface)
++set(ksmserver_xml 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++endif()
+ 
+

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

2020-06-06 Thread Andreas Sturmlechner

commit: 526b182cc76c27ce787af835fbc8bfa3da07bc37
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  6 14:16:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  6 14:17:39 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=526b182c

kde-plasma/libkworkspace: Rebase standalone.patch on top of HEAD

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

 .../files/libkworkspace-5.19.80-standalone.patch   | 108 +
 kde-plasma/libkworkspace/libkworkspace-.ebuild |   2 +-
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch 
b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
new file mode 100644
index 00..8c8213d002
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
@@ -0,0 +1,108 @@
+From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ libkworkspace/CMakeLists.txt | 67 +++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ba097a6e..66f70c0b6 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++set(PROJECT_VERSION "GENTOO_PV")
++set(PROJECT_VERSION_MAJOR 5)
++
++cmake_minimum_required(VERSION 3.0)
++
++set(QT_MIN_VERSION "5.14.0")
++set(KF5_MIN_VERSION "5.71.0")
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(KDECompilerSettings NO_POLICY_SCOPE)
++include(ECMMarkNonGuiExecutable)
++include(CMakePackageConfigHelpers)
++include(WriteBasicConfigVersionFile)
++include(CheckIncludeFiles)
++include(FeatureSummary)
++include(ECMQtDeclareLoggingCategory)
++include(KDEPackageAppTemplates)
++include(ECMMarkAsTest)
++include(GenerateExportHeader)
++
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n 
Init Plasma WindowSystem)
++
++find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(KScreenLocker 5.13.80 REQUIRED)
++find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++find_package(X11)
++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++URL "http://www.x.org;
++TYPE OPTIONAL
++PURPOSE "Required for X11 support")
++
++if(X11_FOUND)
++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++set(HAVE_X11 1)
++endif()
++
++if(BUILD_TESTING)
++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
++check_include_files(unistd.h HAVE_UNISTD_H)
++
++configure_file(../config-workspace.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++configure_file(../config-X11.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+ kworkspace.cpp
+@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml 
screenlocker_interface )
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml 
kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt5_add_dbus_interface(kworkspace_LIB_SRCS 
../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml 
logoutprompt_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml 
startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml 
shutdown_interface)
++set(ksmserver_xml

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

2020-02-02 Thread Andreas Sturmlechner

commit: 6be3f31e14f6df74b7c843d1d5535d3971620feb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  2 17:38:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  2 18:04:56 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6be3f31e

kde-plasma/libkworkspace: Rebase standalone-patch on top of HEAD

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

 .../files/libkworkspace-5.18.80-standalone.patch   | 112 +
 kde-plasma/libkworkspace/libkworkspace-.ebuild |   2 +-
 2 files changed, 113 insertions(+), 1 deletion(-)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch 
b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
new file mode 100644
index 00..79c039afd5
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch
@@ -0,0 +1,112 @@
+From 04f6a5fed3df9b1443159befd8e17ac6cd797916 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt | 70 +---
+ 1 file changed, 66 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1869fae2..c7768ce17 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++set(PROJECT_VERSION "GENTOO_PV")
++set(PROJECT_VERSION_MAJOR 5)
++
++cmake_minimum_required(VERSION 3.0)
++
++set(QT_MIN_VERSION "5.12.0")
++set(KF5_MIN_VERSION "5.58.0")
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(KDECompilerSettings NO_POLICY_SCOPE)
++include(ECMMarkNonGuiExecutable)
++include(CMakePackageConfigHelpers)
++include(WriteBasicConfigVersionFile)
++include(CheckIncludeFiles)
++include(FeatureSummary)
++include(ECMQtDeclareLoggingCategory)
++include(KDEPackageAppTemplates)
++include(ECMMarkAsTest)
++include(GenerateExportHeader)
++
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n 
Plasma WindowSystem)
++
++find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(KScreenLocker 5.13.80 REQUIRED)
++find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++find_package(X11)
++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++URL "http://www.x.org;
++TYPE OPTIONAL
++PURPOSE "Required for X11 support")
++
++if(X11_FOUND)
++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++set(HAVE_X11 1)
++endif()
++
++if(BUILD_TESTING)
++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
++check_include_files(unistd.h HAVE_UNISTD_H)
++
++configure_file(../config-workspace.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++configure_file(../config-X11.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+ kworkspace.cpp
+@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml 
screenlocker_interface )
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml 
kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt5_add_dbus_interface(kworkspace_LIB_SRCS 
../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS 
../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml 
logoutprompt_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml 
startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS 
${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml 
shutdown_interface)
++set(ksmserver_xml 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE 
"interface_util.h")
++endif()
+ 
+

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

2018-10-22 Thread Andreas Sturmlechner

commit: fb911c3477d846c25f47e37f91deeb2e86e1ef84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 22 09:04:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 22 18:06:12 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb911c34

kde-plasma/libkworkspace: New package (split from plasma-workspace)

In Plasma 5.13, kde-cli-tools began to depend on libkworkspace for
Wayland support in KCMs. Besides making circular dep workarounds
necessary, this also meant a considerable chunk of Plasma added to
the kde-cli-tools depgraph, which is used by applications even if
not having a Plasma desktop installed.

Revdeps already search for libkworkspace independently, which means
no revdep patching is required to support this split package.

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

 .../files/libkworkspace-5.14.2-standalone.patch| 96 ++
 .../libkworkspace-5.14.49..ebuild  | 54 
 kde-plasma/libkworkspace/libkworkspace-.ebuild | 54 
 kde-plasma/libkworkspace/metadata.xml  |  8 ++
 4 files changed, 212 insertions(+)

diff --git 
a/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch 
b/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch
new file mode 100644
index 00..f2332f7261
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.14.2-standalone.patch
@@ -0,0 +1,96 @@
+From 2e0a1d8f524d3bb645248787eed4532a250540fc 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
+
+---
+ libkworkspace/CMakeLists.txt | 64 +---
+ 1 file changed, 60 insertions(+), 4 deletions(-)
+
+diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
+index f66013f9..4e58bd60 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,3 +1,59 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++set(PROJECT_VERSION "GENTOO_PV")
++set(PROJECT_VERSION_MAJOR 5)
++
++cmake_minimum_required(VERSION 3.0)
++
++set(QT_MIN_VERSION "GENTOO_QT_MINIMAL")
++set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL")
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(KDECompilerSettings NO_POLICY_SCOPE)
++include(ECMMarkNonGuiExecutable)
++include(CMakePackageConfigHelpers)
++include(WriteBasicConfigVersionFile)
++include(CheckIncludeFiles)
++include(FeatureSummary)
++include(ECMQtDeclareLoggingCategory)
++include(KDEPackageAppTemplates)
++include(ECMMarkAsTest)
++include(GenerateExportHeader)
++
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n 
Plasma WindowSystem)
++
++find_package(KWinDBusInterface CONFIG REQUIRED)
++
++find_package(X11)
++set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++URL "http://www.x.org;
++TYPE OPTIONAL
++PURPOSE "Required for X11 support")
++
++if(X11_FOUND)
++find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++set(HAVE_X11 1)
++endif()
++
++if(BUILD_TESTING)
++find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
++check_include_files(unistd.h HAVE_UNISTD_H)
++
++configure_file(../config-workspace.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++configure_file(../config-X11.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
++set(ksmserver_xml 
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE 
"interface_util.h")
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+ kworkspace.cpp
+@@ -9,11 +65,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
+ remove_definitions(-DQT_NO_CAST_TO_ASCII)
+ 
+ 
+-set(ksmserver_xml  
${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} 
ksmserver_interface )
+-
+-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE 
"interface_util.h")
+-
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
+ 
+ 
+@@ -77,3 +129,7 @@ install(EXPORT libkworkspaceLibraryTargets
+ if(BUILD_TESTING)
+ add_subdirectory(autotests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+--

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

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

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

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

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

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

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

7 matches

Site Navigation

Mail list logo

Footer information