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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A7A2158096 for ; Mon, 11 Jul 2022 16:00:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 576D7E0B0A; Mon, 11 Jul 2022 16:00:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37327E0B0A for ; Mon, 11 Jul 2022 16:00:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D1DF335CB4 for ; Mon, 11 Jul 2022 16:00:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44A3A105 for ; Mon, 11 Jul 2022 16:00:12 +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: <1657554688.09f386c2efeb530e9addc7b57a0e779626d75c32.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/, kde-plasma/plasma-desktop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/files/ kde-plasma/plasma-desktop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 09f386c2efeb530e9addc7b57a0e779626d75c32 X-VCS-Branch: master Date: Mon, 11 Jul 2022 16:00:12 +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: a56916b2-d3a0-4257-bf9d-396b240f7896 X-Archives-Hash: c8351240f541bdea9f598cca3fb41d54 commit: 09f386c2efeb530e9addc7b57a0e779626d75c32 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 11 15:17:42 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 11 15:51:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f386c2 kde-plasma/plasma-desktop: Fix build with >=KF-5.95 Thanks-to: Marco Clocchiatti gmail.com> Closes: https://bugs.gentoo.org/857249 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/plasma-desktop-5.24.5-kf-5.95.patch | 46 ++++++++++++++++++++++ .../plasma-desktop/plasma-desktop-5.24.5.ebuild | 1 + 2 files changed, 47 insertions(+) diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch new file mode 100644 index 000000000000..b7705a172250 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch @@ -0,0 +1,46 @@ +From 399c1288114d083199db7058710fd61945e2a181 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir +Date: Sat, 11 Jun 2022 10:34:41 +0200 +Subject: [PATCH] Fix includes when building the kglobalaccel dbus interface +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +So that KGloalAccel::MatchType can be found: +In file included from /builds/plasma/plasma-desktop/kcms/keys/kcm_keys.cpp:23: +/builds/plasma/plasma-desktop/_build/kcms/keys/kglobalaccel_interface.h:129:105: error: ‘KGlobalAccel’ has not been declared + 129 | inline QDBusPendingReply > globalShortcutsByKey(const QKeySequence &key, KGlobalAccel::MatchType matchType) + +And kglobalaccel.h already includes kglobalshortcutinfo.h + +(cherry picked from commit 1ae254abae26416576e5f0f910a4d5aef665dad5) +(cherry picked from commit a5e1f2c023b98b130bccee1ebd1ee184c8a2f495) +--- + kcms/keys/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kcms/keys/CMakeLists.txt b/kcms/keys/CMakeLists.txt +index 3df5629dd..38869de26 100644 +--- a/kcms/keys/CMakeLists.txt ++++ b/kcms/keys/CMakeLists.txt +@@ -13,7 +13,7 @@ set(kcm_keys_SRCS + + set(kglobalaccel_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.KGlobalAccel.xml) + set_source_files_properties(${kglobalaccel_xml} PROPERTIES +- INCLUDE "kglobalshortcutinfo.h" ++ INCLUDE "kglobalaccel.h" + NO_NAMESPACE TRUE + CLASSNAME "KGlobalAccelInterface" + ) +@@ -21,7 +21,7 @@ qt_add_dbus_interface(kcm_keys_SRCS ${kglobalaccel_xml} kglobalaccel_interface) + + set(kglobalaccel_component_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.kglobalaccel.Component.xml) + set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES +- INCLUDE "kglobalshortcutinfo.h" ++ INCLUDE "kglobalaccel.h" + NO_NAMESPACE TRUE + CLASSNAME "KGlobalAccelComponentInterface" + ) +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild index ae1f627cb572..3ed62a56073c 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild @@ -120,6 +120,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch + "${FILESDIR}/${P}-kf-5.95.patch" # bug 857249 ) src_prepare() {