From patchwork Fri Nov 3 00:14:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 55861 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 86E7227BBE9; Fri, 3 Nov 2023 00:20:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C699227BBE2 for ; Fri, 3 Nov 2023 00:20:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyhvJ-0000Wn-FB; Thu, 02 Nov 2023 20:20:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qyhvH-0000WB-8Q for guix-patches@gnu.org; Thu, 02 Nov 2023 20:20:27 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyhvH-0001K4-0P for guix-patches@gnu.org; Thu, 02 Nov 2023 20:20:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyhvq-0007Gc-6K for guix-patches@gnu.org; Thu, 02 Nov 2023 20:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66856] [PATCH v2 5/7] gnu: Add plasma-shell-applet-window-buttons. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Nov 2023 00:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66856 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66856@debbugs.gnu.org Cc: Sughosha Received: via spool by 66856-submit@debbugs.gnu.org id=B66856.169897085727910 (code B ref 66856); Fri, 03 Nov 2023 00:21:02 +0000 Received: (at 66856) by debbugs.gnu.org; 3 Nov 2023 00:20:57 +0000 Received: from localhost ([127.0.0.1]:56449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyhvk-0007G6-Rx for submit@debbugs.gnu.org; Thu, 02 Nov 2023 20:20:57 -0400 Received: from layka.disroot.org ([178.21.23.139]:42364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyhvi-0007Fv-Ls for 66856@debbugs.gnu.org; Thu, 02 Nov 2023 20:20:55 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BAA9C44D76; Fri, 3 Nov 2023 01:20:18 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6NMW_mEBvbv5; Fri, 3 Nov 2023 01:20:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1698970814; bh=ZHWx+LpLO6P8a2VFMaMNOuFM6vrTfeH04w2DObKOBGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NbC6n9J4CYygF2r5iufrLKGmnMtUVJHVEYJV7I1IxqSPKu0GVirSKpiXM9AJZhKka blbx45WLjuX1vSt3n+72zH3b3BGAbUphiFNTq9Q5uveXB8SUgSTfErMVXn9Udk2Ec9 8IT0OYl7qViUXv53cCPn3DyJ/SVwCzV10X/HyvdR0pe552Yq11YGkM8PgbxZ6jUUPE X4yy5uofMgGW5xtJosmsi2tLGrOoXQ5R1RxrGhdRmeIE80zcLNTtoOV7XFJux80MfP 3oD/D/WHCZ/SUxO/kBpY/JJhpSVtplPonK1wv7RkvFi/FYxrcbcOuXiVX7XRF9lHRW 2rvTtAMzuZ6lQ== Date: Fri, 3 Nov 2023 01:14:36 +0100 Message-ID: <05223800f126abed88fc9da72eff677b7b1e2e56.1698969760.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-xyz.scm (plasma-shell-applet-window-buttons): New variable. * gnu/packages/patches/plasma-shell-extension-window-buttons-applet-fix-build.patch: New file. * gnu/local.mk: Register it. Change-Id: I6e9d9b6acda80d038060b04502aaa40c1cb548a3 --- gnu/local.mk | 1 + gnu/packages/kde-xyz.scm | 39 ++++++++++++++ ...sion-window-buttons-applet-fix-build.patch | 52 +++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 gnu/packages/patches/plasma-shell-extension-window-buttons-applet-fix-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 03e8c28d45..41e3b71346 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1747,6 +1747,7 @@ dist_patch_DATA = \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/php-fix-streams-copy-length.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ + %D%/packages/patches/plasma-shell-extension-window-buttons-applet-fix-build.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ diff --git a/gnu/packages/kde-xyz.scm b/gnu/packages/kde-xyz.scm index 53a60ce65f..2df9cada5e 100644 --- a/gnu/packages/kde-xyz.scm +++ b/gnu/packages/kde-xyz.scm @@ -23,6 +23,7 @@ (define-module (gnu packages kde-xyz) #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages gnome-xyz) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) @@ -158,3 +159,41 @@ (define-public plasma-shell-applet-window-appmenu "This plasmoid shows the current window appmenu in Plasma panels or Latte Dock.") (license license:gpl2+)))) + +(define-public plasma-shell-applet-window-buttons + (package + (name "plasma-shell-applet-window-buttons") + (version "0.11.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/psifidotos/applet-window-buttons") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wbiw5gz6fp8rf2f8sd3ibgkx9abvi0d3s0xz6m3p6n4cvdky323")) + (patches + (search-patches + "plasma-shell-extension-window-buttons-applet-fix-build.patch")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kcmutils + kconfigwidgets + kcoreaddons + kdeclarative + ki18n + kservice + kwindowsystem + plasma-framework + qtdeclarative-5)) + (propagated-inputs + (list kdecoration)) + (home-page "https://github.com/psifidotos/applet-window-buttons") + (synopsis "Window buttons in Plasma panels") + (description + "This plasmoid shows window buttons in Plasma panels or Latte Dock.") + (license license:gpl2+))) diff --git a/gnu/packages/patches/plasma-shell-extension-window-buttons-applet-fix-build.patch b/gnu/packages/patches/plasma-shell-extension-window-buttons-applet-fix-build.patch new file mode 100644 index 0000000000..afbb62eb30 --- /dev/null +++ b/gnu/packages/patches/plasma-shell-extension-window-buttons-applet-fix-build.patch @@ -0,0 +1,52 @@ +From 924994e10402921bf22fefc099bca2914989081c Mon Sep 17 00:00:00 2001 +From: Dmitry Chermnykh <76gh6rvso@relay.firefox.com> +Date: Mon, 23 Jan 2023 21:21:47 +0500 +Subject: [PATCH] Support building on plasma 5.26.90+ + +--- + CMakeLists.txt | 2 +- + libappletdecoration/previewclient.cpp | 5 +++++ + libappletdecoration/previewclient.h | 1 + + 3 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ecec88..43adaef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ set(EMAIL "mvourlakos@gmail.com") + + set(QT_MIN_VERSION "5.15.0") + set(KF5_MIN_VERSION "5.81.0") +-set(KDECORATION2_MIN_VERSION "5.24.0") ++set(KDECORATION2_MIN_VERSION "5.26.90") + + set(KF5_LOCALE_PREFIX "") + +diff --git a/libappletdecoration/previewclient.cpp b/libappletdecoration/previewclient.cpp +index 2cf184b..3ffe358 100644 +--- a/libappletdecoration/previewclient.cpp ++++ b/libappletdecoration/previewclient.cpp +@@ -263,6 +263,11 @@ WId PreviewClient::windowId() const + return 0; + } + ++QString PreviewClient::windowClass() const ++{ ++ return QString("kwin_preview"); ++} ++ + QPalette PreviewClient::palette() const + { + return m_palette->palette(); +diff --git a/libappletdecoration/previewclient.h b/libappletdecoration/previewclient.h +index c479acc..e5fbe7a 100644 +--- a/libappletdecoration/previewclient.h ++++ b/libappletdecoration/previewclient.h +@@ -74,6 +74,7 @@ class PreviewClient : public QObject, public KDecoration2::ApplicationMenuEnable + QString caption() const override; + WId decorationId() const override; + WId windowId() const override; ++ QString windowClass() const override; + int desktop() const override; + QIcon icon() const override; + bool isActive() const override;