From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YPn0C3AQ1V81QwAA0tVLHw (envelope-from ) for ; Sat, 12 Dec 2020 18:48:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WFfGB3AQ1V8IcAAA1q6Kng (envelope-from ) for ; Sat, 12 Dec 2020 18:48:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C88C69402A7 for ; Sat, 12 Dec 2020 18:48:15 +0000 (UTC) Received: from localhost ([::1]:56562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ko9wE-0000xF-4M for larch@yhetil.org; Sat, 12 Dec 2020 13:48:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko9kp-0005vO-JK for guix-patches@gnu.org; Sat, 12 Dec 2020 13:36:27 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ko9kp-0008Iy-6r for guix-patches@gnu.org; Sat, 12 Dec 2020 13:36:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ko9P7-0008Lr-UR for guix-patches@gnu.org; Sat, 12 Dec 2020 13:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Dec 2020 18:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45195 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45195@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160779679332029 (code B ref -1); Sat, 12 Dec 2020 18:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2020 18:13:13 +0000 Received: from localhost ([127.0.0.1]:46343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ko9OL-0008KW-FU for submit@debbugs.gnu.org; Sat, 12 Dec 2020 13:13:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:46176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ko9OJ-0008KN-Gf for submit@debbugs.gnu.org; Sat, 12 Dec 2020 13:13:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko9OJ-0003xc-An for guix-patches@gnu.org; Sat, 12 Dec 2020 13:13:11 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:45469) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko9OF-0008Tc-Uv for guix-patches@gnu.org; Sat, 12 Dec 2020 13:13:10 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4CtZcS5xKlz1s2CJ for ; Sat, 12 Dec 2020 18:38:00 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CtZcS5p6hz1tF6Q for ; Sat, 12 Dec 2020 18:38:00 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id w1E5XcJFOVAf for ; Sat, 12 Dec 2020 18:37:59 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-55-61.dynamic.mnet-online.de [188.174.55.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Sat, 12 Dec 2020 18:37:59 +0100 (CET) Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 62968601EF for ; Sat, 12 Dec 2020 18:44:23 +0100 (CET) From: Hartmut Goebel Date: Sat, 12 Dec 2020 18:37:56 +0100 Message-Id: <40c4572195ac3388782086866f1c8c7f9efccf83.1607794027.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=212.18.0.10; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.20 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C88C69402A7 X-Spam-Score: 0.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: alyPRFzfZR2m KDE breeze is separate from breeze-icons, as it can bee seen by version, download path and git repository path being all different. Thus a package containing both beeze and the breeze-icons contradicts with this upstream separation. * gnu/package/kde.scm (breeze-assets): Remove variable. (breeze): Move to ... * gnu/package/kde-plasme.scm (breeze): here. [version, source]: Copy from former breeze-assets. [build-system]: Make explicit (was inherited even from breeze-icons). [arguments]: Remove. [native-inputs]: New element. [inputs]: Copy from former breeze-assets; add some optional packages. [home-page]: Fix and change to invent.kde.org. [snopysis, description]: Adjust to de-unified package. [licence]: Remove gpl3+, which came from breeze-icons. --- gnu/packages/kde-frameworks.scm | 57 --------------------------------- gnu/packages/kde-plasma.scm | 47 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 57 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 951a2f8554..2f4d521217 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -327,63 +327,6 @@ It is the default icon theme for the KDE Plasma 5 desktop.") ;; text. (license license:lgpl3+))) -(define-public breeze-assets - (package - (inherit breeze-icons) - (name "breeze-assets") - (version "5.19.5") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/plasma/" version - "/breeze-" version ".tar.xz")) - (sha256 - (base32 - "0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1")))) - (inputs - `(,@(package-inputs breeze-icons) - ("ki18n" ,ki18n) - ("kpackage" ,kpackage) - ("kguiaddons" ,kguiaddons) - ("kdecoration" ,kdecoration) - ("kcoreaddons" ,kcoreaddons) - ("kiconthemes" ,kiconthemes) - ("kwindowsystem" ,kwindowsystem) - ("kconfigwidgets" ,kconfigwidgets) - ("qtx11extras" ,qtx11extras))) - (home-page "https://github.com/KDE/breeze") - (synopsis "Artwork, styles and assets for the Breeze visual style") - (description "This package contains artwork, styles and assets associated -with the Breeze visual style.") - (license license:gpl2+))) - -(define-public breeze - (package - (name "breeze") - (version (package-version breeze-assets)) - (source #f) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build union)) - #:builder - (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs - `(("breeze-icons" ,breeze-icons) - ("breeze-assets" ,breeze-assets))) - (home-page "https://github.com/KDE/breeze-icons") - (synopsis "Full KDE Breeze theme") - (description - "This package contains the full Breeze visual style for KDE: -assets and icons.") - (license (list license:gpl2 license:gpl3+)))) - (define-public kapidox (package (name "kapidox") diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index e18d521ad2..6021e4f9cc 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -35,6 +35,53 @@ #:use-module (gnu packages qt) #:use-module (gnu packages xorg)) +(define-public breeze + (package + (name "breeze") + (version "5.19.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1")))) + (build-system qt-build-system) + ;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake: + ;; warnings during generation of metainfo for org.kde.breezedark.desktop: + ;; Package type "Plasma/LookAndFeel" not found + ;; TODO: Check whether is makes sence splitting into several outputs, like + ;; Debian does: + ;; - breeze-cursor-theme + ;; - "out", "devel" + ;; - kde-style-breeze - Widget style + ;; - kde-style-breeze-qt4 - propably not useful + ;; - kwin-style-breeze + ;; - qml-module-qtquick-controls-styles-breeze - QtQuick style + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("kcmutils" ,kcmutils) ; optional + ("kconfigwidgets" ,kconfigwidgets) + ("kcoreaddons" ,kcoreaddons) + ("kde-frameworkintegration" ,kde-frameworkintegration) ; optional + ("kdecoration" ,kdecoration) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) ; for optional kde-frameworkintegration + ("kpackage" ,kpackage) + ("kwayland" ,kwayland) ; optional + ("kwindowsystem" ,kwindowsystem) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) ; optional + ("qtx11extras" ,qtx11extras))) + (home-page "https://invent.kde.org/plasma/breeze") + (synopsis "Default KDE Plasma theme") + (description "Artwork, styles and assets for the Breeze visual style for +the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") + (license license:gpl2+))) + (define-public kdecoration (package (name "kdecoration") -- 2.21.3