From patchwork Mon Sep 19 17:50:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 42749 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 1A72827BBEA; Mon, 19 Sep 2022 19:22:37 +0100 (BST) 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,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,T_PDS_PRO_TLD,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 9B8EE27BBE9 for ; Mon, 19 Sep 2022 19:22:28 +0100 (BST) Received: from localhost ([::1]:43440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaLPX-0008SO-O8 for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 14:22:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaKw6-0004ld-Kc for guix-patches@gnu.org; Mon, 19 Sep 2022 13:52:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaKw6-0005TW-BQ for guix-patches@gnu.org; Mon, 19 Sep 2022 13:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaKw5-0003nE-VO for guix-patches@gnu.org; Mon, 19 Sep 2022 13:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57608] Upstreaming KDE Plasma and rest of packages Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 17:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57608 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 57608@debbugs.gnu.org Cc: Maxim Cournoyer , Maxime Devos , Brendan Tildesley , Leo Famulari , "marekpasnikowski@protonmail.com" , "marius@gnu.org" , Hartmut Goebel X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.166360988114523 (code B ref -1); Mon, 19 Sep 2022 17:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Sep 2022 17:51:21 +0000 Received: from localhost ([127.0.0.1]:55139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaKvR-0003mB-L8 for submit@debbugs.gnu.org; Mon, 19 Sep 2022 13:51:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:40128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaKvQ-0003m4-Ak for submit@debbugs.gnu.org; Mon, 19 Sep 2022 13:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaKvM-0003SC-Ks for guix-patches@gnu.org; Mon, 19 Sep 2022 13:51:20 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:36990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaKv4-0005JN-Sy for guix-patches@gnu.org; Mon, 19 Sep 2022 13:51:15 -0400 Date: Mon, 19 Sep 2022 17:50:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1663609841; x=1663869041; bh=L56PhuqzAdt/2D3Y6xeUq0VNCn8PUl7T3HqLWrH68x8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=i0g9AuhPn8Xef8JjlECQWg6b/HUByyyrKSWc++bLr5ZfO67qC5vz1vhNP2QE+EgIc EML6SHFLVrAOMW9WVrva36SZzP11vS3OB8f9oGzhiM/niEw4MBL5+nt1xvnTixOdqG EQw2P9X9aJNxCcrS5pGG0AROqOi3/Q4dNKUKIdJnGt2N9UhvVxqPzseCKnQQW8zUN0 512N3lvRJm4t+c+jH/e1A9Nk59Wn06W7sYmatZTwFFCJBna9Kcc1UtU+qT/QIjrqYG CNamxULERN8a3cdLb0ddploEczfOuisZxiAP4hoNQxW+wqSvPgnc163cSqW6nOIWDw JJc7xLGfi5few== Message-ID: In-Reply-To: References: Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=51.77.79.158; envelope-from=phodina@protonmail.com; helo=mail-0201.mail-europe.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, I've went over all the packages and prepared a new patch set. ---- Petr ------- Original Message ------- On Tuesday, September 6th, 2022 at 9:14 AM, phodina wrote: > Hi Marius, > > thanks for upstreaming the patches into staging. [1] > > I've rebased the patches on your changes. > > Unfortunately beside that I haven't had the time to go through them. > > I just removed the kpurpose as it was pointed out by Brendan that the package is already there under the name purpose. > > The patches are again tracked in the branch patch/upstream-kde [2]. Expect rebases as my next plan is to go through licenses and later tests + builds. > > Also I added all of you in the CC since you were part of the patchset thread. > > [1] https://issues.guix.gnu.org/50862 > [2] https://github.com/phodina/guix/tree/patch/upstream-kde > > ---- > Petr From a05300a49b3eeab048887e3ef93e7a98600b65ad Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 8 Feb 2022 17:03:20 +1100 Subject: [PATCH 61/81] gnu: Add kwin. * gnu/packages/kde-plasma.scm (kwin): New variable. diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cc7901daff..bf92351481 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -37,7 +37,9 @@ (define-module (gnu packages kde-plasma) #:use-module (gnu packages authentication) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnupg) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -47,6 +49,7 @@ (define-module (gnu packages kde-plasma) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) @@ -893,6 +896,150 @@ (define-public kwayland-integration (home-page "https://invent.kde.org/plasma/kwayland-integration") (license (list license:lgpl2.1 license:lgpl3)))) +(define-public kwin + (package + (name "kwin") + (version "5.24.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version + "/" + name + "-" + version + ".tar.xz")) + (sha256 + (base32 + "1qwcd6iw6yvpchiwmvq5nwsr465jmrmscf286mjrc65im4hj6572")))) + (build-system qt-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/plugins/kdecorations/aurorae/src/aurorae.cpp") + (("(^\\s*QDirIterator it.path, QDirIterator::Subdirectories)(\\);)" + _ a b) + (string-append a + " | QDirIterator::FollowSymlinks" b))) + (substitute* '("src/xwl/xwayland.cpp") + (("(m_xwaylandProcess->setProgram.QStringLiteral..)(Xwayland)(...;)" + _ a Xwayland b) + (string-append a + (which "Xwayland") b))) + (substitute* '("cmake/modules/Findhwdata.cmake") + (("/usr/share") + (string-append #$hwdata "/share"))))) + (add-after 'install 'add-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (let ((kst5 (string-append #$output + "/share/kservicetypes5/"))) + (symlink (string-append kst5 + "kwineffect.desktop") + (string-append kst5 + "kwin-effect.desktop")) + (symlink (string-append kst5 + "kwinscript.desktop") + (string-append kst5 + "kwin-script.desktop"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "XDG_RUNTIME_DIR" + (getcwd)) + (setenv "HOME" + (getcwd)) + (setenv "XDG_DATA_DIRS" + (string-append #$output "/share:" + (getenv "XDG_DATA_DIRS"))) + (setenv "QT_PLUGIN_PATH" + (string-append #$output + "/lib/qt5/plugins:" + (getenv "QT_PLUGIN_PATH"))) + (setenv "DISPLAY" ":1") + (system "Xvfb :1 &") + (sleep 5) + (invoke "ctest" "-E" + "(kwin-testDontCrashGlxgears|kwin-testLockScreen|kwin-testPointerInput|kwin-testDebugConsole|kwin-testXdgShellClient|kwin-testXdgShellClient-waylandonly|kwin-testSceneOpenGLES|kwin-testSceneOpenGLES-waylandonly|kwin-testModiferOnlyShortcut|kwin-testInputMethod|kwin-testInputMethod-waylandonly|kwin-testNightColor|kwin-testNightColor-waylandonly|kwin-testPlasmaWindow|kwin-testX11Client|kwin-testSceneQPainter|kwin-testLibinputDevice)"))))))) + (native-inputs (list extra-cmake-modules + dbus + kdoctools + pkg-config + qttools-5 + wayland-protocols + xorg-server-for-tests)) + (inputs (list breeze + eudev + fontconfig + freetype + kactivities + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdbusaddons + kdeclarative + kdecoration + kglobalaccel + ki18n + kiconthemes + kidletime + kio + kirigami + knewstuff + knotifications + kpackage + krunner + kscreenlocker + ktextwidgets + kwayland + kwayland-server + kwindowsystem + kxmlgui + lcms + libcap + libepoxy + libinput + libxkbcommon + pipewire-0.3 + plasma-framework + plasma-wayland-protocols + qtbase-5 + qtdeclarative-5 + qtmultimedia-5 + qtwayland + qtx11extras + wayland + wayland-protocols + xcb-util ;fails at build time without this + xcb-util-cursor + xcb-util-keysyms + xcb-util-wm + xcmsdb + xinput ;XXX: Says disabled in configure phase + xorg-server-xwayland + zlib)) + (propagated-inputs (list hwdata)) + ;; Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names + ;; * hwdata, + ;; * QtQuick.Controls-QMLModule, QML module 'QtQuick.Controls' is a runtime dependency. + ;; * org.kde.kquickcontrolsaddons-QMLModule, QML module 'org.kde.kquickcontrolsaddons' is a runtime dependency. + ;; * org.kde.plasma.core-QMLModule, QML module 'org.kde.plasma.core' is a runtime dependency. + ;; * org.kde.plasma.components-QMLModule, QML module 'org.kde.plasma.components' is a runtime dependency. + + ;; * QAccessibilityClient, KDE client-side accessibility library, + ;; Required to enable accessibility features + + (home-page "https://userbase.kde.org/KWin") + (synopsis "KDE Plasma Window Manager") + (description + "KWin is an easy to use, but flexible, composited Window Manager for +Xorg windowing systems (Wayland, X11) on Linux. Its primary usage is in +conjunction with the KDE Plasma Desktop.") + (license license:gpl2+))) + (define-public kwrited (package (name "kwrited") -- 2.37.2