--- Begin Message ---
|
Subject: |
[PATCH 1/2] gnu: breeze: Split from breeze-icons. |
|
Date: |
Sat, 12 Dec 2020 20:23:22 +0100 |
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
--- End Message ---