unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons.
@ 2020-12-12 17:37 Hartmut Goebel
  2020-12-12 19:23 ` [bug#45203] [PATCH 2/2] gnu: kdenlive: Add breeze-icons Hartmut Goebel
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Hartmut Goebel @ 2020-12-12 17:37 UTC (permalink / raw)
  To: 45195

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





^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#45203] [PATCH 2/2] gnu: kdenlive: Add breeze-icons.
  2020-12-12 17:37 [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Hartmut Goebel
@ 2020-12-12 19:23 ` Hartmut Goebel
  2020-12-17 10:25 ` [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Efraim Flashner
  2021-01-05 16:36 ` bug#45195: Forgot to close Hartmut Goebel
  2 siblings, 0 replies; 5+ messages in thread
From: Hartmut Goebel @ 2020-12-12 19:23 UTC (permalink / raw)
  To: 45195, 45203

Since breeze-icons are now longer united into breeze, these need to be
explicitly added.

* gnu/package/kde.scm (kdenlive)[inputs]: Add breeze-icons.
  [argmuments]{phases}<wrap-executable>: Add breeze-icons to XDG_DATA_DIRS.
---
 gnu/packages/kde.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 601b2bba8b..43162d63ce 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -180,7 +180,8 @@ This package contains GUI widgets for baloo.")
          ("qtquickcontrols" ,qtquickcontrols)
          ("qtquickcontrols2" ,qtquickcontrols2)
          ("kiconthemes" ,kiconthemes)
-         ("breeze" ,breeze)
+         ("breeze" ,breeze) ; make dark them available easily
+         ("breeze-icons" ,breeze-icons) ; recommended icon set
          ("purpose" ,purpose)
          ("qtwebkit" ,qtwebkit)
          ("qtgraphicaleffects" ,qtgraphicaleffects)
@@ -195,12 +196,14 @@ This package contains GUI widgets for baloo.")
                       (qtbase (assoc-ref inputs "qtbase"))
                       (frei0r (assoc-ref inputs "frei0r-plugins"))
                       (ffmpeg (assoc-ref inputs "ffmpeg"))
-                      (breeze (assoc-ref inputs "breeze")))
+                      (breeze (assoc-ref inputs "breeze"))
+                      (breeze-icons (assoc-ref inputs "breeze-icons")))
                  (wrap-program (string-append out "/bin/kdenlive")
                    `("PATH" ":" prefix
                      ,(list (string-append ffmpeg "/bin")))
                    `("XDG_DATA_DIRS" ":" prefix
-                     ,(list (string-append breeze "/share")))
+                     ,(list (string-append breeze "/share")
+                            (string-append breeze-icons "/share")))
                    `("QT_PLUGIN_PATH" ":" prefix
                      ,(list (getenv "QT_PLUGIN_PATH")))
                    `("FREI0R_PATH" ":" =
-- 
2.21.3





^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons.
  2020-12-12 17:37 [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Hartmut Goebel
  2020-12-12 19:23 ` [bug#45203] [PATCH 2/2] gnu: kdenlive: Add breeze-icons Hartmut Goebel
@ 2020-12-17 10:25 ` Efraim Flashner
  2020-12-18 18:35   ` Hartmut Goebel
  2021-01-05 16:36 ` bug#45195: Forgot to close Hartmut Goebel
  2 siblings, 1 reply; 5+ messages in thread
From: Efraim Flashner @ 2020-12-17 10:25 UTC (permalink / raw)
  To: Hartmut Goebel; +Cc: 45195

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

On Sat, Dec 12, 2020 at 06:37:56PM +0100, Hartmut Goebel wrote:
> 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.
> 

This looks good to me!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons.
  2020-12-17 10:25 ` [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Efraim Flashner
@ 2020-12-18 18:35   ` Hartmut Goebel
  0 siblings, 0 replies; 5+ messages in thread
From: Hartmut Goebel @ 2020-12-18 18:35 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 45195

Am 17.12.20 um 11:25 schrieb Efraim Flashner:
> This looks good to me!

Thanks, pushed as 66016b1ae01423bc0671cc39992263520fd77998

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |





^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#45195: Forgot to close
  2020-12-12 17:37 [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Hartmut Goebel
  2020-12-12 19:23 ` [bug#45203] [PATCH 2/2] gnu: kdenlive: Add breeze-icons Hartmut Goebel
  2020-12-17 10:25 ` [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Efraim Flashner
@ 2021-01-05 16:36 ` Hartmut Goebel
  2 siblings, 0 replies; 5+ messages in thread
From: Hartmut Goebel @ 2021-01-05 16:36 UTC (permalink / raw)
  To: 45195-close

Forgot to close after committing the patchs.




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-01-05 16:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-12 17:37 [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Hartmut Goebel
2020-12-12 19:23 ` [bug#45203] [PATCH 2/2] gnu: kdenlive: Add breeze-icons Hartmut Goebel
2020-12-17 10:25 ` [bug#45195] [PATCH 1/2] gnu: breeze: Split from breeze-icons Efraim Flashner
2020-12-18 18:35   ` Hartmut Goebel
2021-01-05 16:36 ` bug#45195: Forgot to close Hartmut Goebel

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).