From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6883138350 for ; Thu, 12 Mar 2020 23:33:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05260E0BF9; Thu, 12 Mar 2020 23:33:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91D21E0BF4 for ; Thu, 12 Mar 2020 23:33:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FBF834F00A for ; Thu, 12 Mar 2020 23:33:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B652E168 for ; Thu, 12 Mar 2020 23:33:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1584055999.ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/libkworkspace/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch X-VCS-Directories: kde-plasma/libkworkspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6 X-VCS-Branch: master Date: Thu, 12 Mar 2020 23:33:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 172fd8a1-355e-4f41-8fde-532e2e7fbdb4 X-Archives-Hash: 9aeac177ce2184df24be3cd310fb652e commit: ec6b5a1e8fb547754f055f0d0a5cec35ad2d73c6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 12 23:31:49 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 12 23:33:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec6b5a1e kde-plasma/libkworkspace: Rebase ${PN}-5.18.80-standalone.patch on HEAD Necessary after upstream commit 3c34dfa97 Thanks-to: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/712226 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkworkspace-5.18.80-standalone.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch index 28ee1c5851..8f0523ab8e 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.18.80-standalone.patch @@ -1,6 +1,6 @@ -From 34cbb4d2482c0df07bf9cd376e30ed878ed44b9f Mon Sep 17 00:00:00 2001 +From 85564b5264546866be56b9bc546689fbab20506d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner -Date: Sun, 2 Feb 2020 18:29:57 +0100 +Date: Fri, 13 Mar 2020 00:14:31 +0100 Subject: [PATCH] libkworkspace: Allow standalone build --- @@ -8,7 +8,7 @@ Subject: [PATCH] libkworkspace: Allow standalone build 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1869fae2..8de7a5c28 100644 +index 85cbb5e6c..de17e9287 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ @@ -75,12 +75,12 @@ index a1869fae2..8de7a5c28 100644 +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-session/org.kde.Shutdown.xml shutdown_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-session/org.kde.Shutdown.xml shutdown_interface) + qt5_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) +set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h") +endif() @@ -109,5 +109,5 @@ index a1869fae2..8de7a5c28 100644 + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() -- -2.25.0 +2.25.1