From e33a1e546a52aa70ffe0c8389f29ff3288cc4510 Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Wed, 9 Sep 2020 14:02:24 +0545 Subject: gnu: kde: kdenlive: Make breeze theme available at runtime. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde.scm (kdenlive): [inputs]: Add breeze. [arguments]: In wrap-program phase, add XDG_DATA_DIRS to include the 'share' sub-directory of the package breeze. Signed-off-by: Ludovic Courtès --- gnu/packages/kde.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/kde.scm') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a9ac23e049..b22c3f0d8f 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -177,6 +177,7 @@ (define-public kdenlive ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ("kiconthemes" ,kiconthemes) + ("breeze" ,breeze) ("qtgraphicaleffects" ,qtgraphicaleffects) ("kplotting" ,kplotting))) (arguments @@ -192,10 +193,13 @@ (define-public kdenlive (qtdeclarative (assoc-ref inputs "qtdeclarative")) (frei0r (assoc-ref inputs "frei0r-plugins")) (ffmpeg (assoc-ref inputs "ffmpeg")) + (breeze (assoc-ref inputs "breeze")) (qml "/lib/qt5/qml")) (wrap-program (string-append out "/bin/kdenlive") `("PATH" ":" prefix ,(list (string-append ffmpeg "/bin"))) + `("XDG_DATA_DIRS" ":" prefix + ,(list (string-append breeze "/share"))) `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (label) (string-append (assoc-ref inputs label) -- cgit v1.2.3 From 8ba70a6ad306bdef3f03221f7883fb36abe595ab Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Wed, 9 Sep 2020 14:55:22 +0545 Subject: gnu: kdenlive: Change source URL to follow permanent redirection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde.scm (kdenlive)[source]: Change url to follow permanent redirection. Signed-off-by: Ludovic Courtès --- gnu/packages/kde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/kde.scm') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index b22c3f0d8f..75e7f39c4b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -142,7 +142,7 @@ (define-public kdenlive (origin (method git-fetch) (uri (git-reference - (url "https://anongit.kde.org/kdenlive.git") + (url "https://invent.kde.org/multimedia/kdenlive") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 -- cgit v1.2.3 From 18bf33a7c0da95545e6b9a72a5122635bea50cf6 Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Wed, 16 Sep 2020 22:10:18 +0545 Subject: gnu: kdenlive: Update to 20.08.1. * gnu/packages/kde.scm (kdenlive): Update to 20.08.1. Signed-off-by: Mathieu Othacehe --- gnu/packages/kde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/kde.scm') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 75e7f39c4b..522907da9c 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Prafulla Giri ;;; ;;; This file is part of GNU Guix. ;;; @@ -134,7 +135,7 @@ (define-public grantleetheme (list license:lgpl2.1+ license:fdl1.2+)))) (define-public kdenlive - (let ((version "20.04.1")) + (let ((version "20.08.1")) (package (name "kdenlive") (version version) @@ -147,7 +148,7 @@ (define-public kdenlive (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0n0x34xmcn0k87rqnz0mk462b3al4gq56kn4m00rr428hafscdz7")))) + "15mpw1sysy7mky8fcj0x4zbspz0na7q76xdfj0j8hsggg9d3yq8l")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 34b6dd36bb63e75a2e64a2c9b008c098162b7558 Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Wed, 16 Sep 2020 23:29:09 +0545 Subject: gnu: kdenlive: Add missing dependencies. This allows to browse the file-system using kdenlive's own file-chooser. * gnu/packages/kde.scm (kdenlive) [native-inputs]: Add pkg-config. [inputs]: Add purpose and qtwebkit. Signed-off-by: Mathieu Othacehe --- gnu/packages/kde.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/kde.scm') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 522907da9c..d661b7445b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -152,6 +152,7 @@ (define-public kdenlive (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("shared-mime-info" ,shared-mime-info) @@ -179,6 +180,8 @@ (define-public kdenlive ("qtquickcontrols2" ,qtquickcontrols2) ("kiconthemes" ,kiconthemes) ("breeze" ,breeze) + ("purpose" ,purpose) + ("qtwebkit" ,qtwebkit) ("qtgraphicaleffects" ,qtgraphicaleffects) ("kplotting" ,kplotting))) (arguments -- cgit v1.2.3 From cd6ec6706c4da76866b83d830ed686b9d036641c Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Thu, 17 Sep 2020 00:55:58 +0545 Subject: gnu: kdenlive: Simplify 'wrap-executable phase. * gnu/packages/kde.scm (kdenlive)[arguments]: Use getenv to set the values of QT_PLUGIN_PATH and QML2_IMPORT_PATH in the wrapper during the 'wrap-executable phase. Signed-off-by: Mathieu Othacehe --- gnu/packages/kde.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages/kde.scm') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index d661b7445b..add33b77fe 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -191,32 +191,23 @@ (define-public kdenlive (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (qtquickcontrols (assoc-ref inputs "qtquickcontrols")) - (qtquickcontrols2 (assoc-ref inputs "qtquickcontrols2")) (qtbase (assoc-ref inputs "qtbase")) - (qtdeclarative (assoc-ref inputs "qtdeclarative")) (frei0r (assoc-ref inputs "frei0r-plugins")) (ffmpeg (assoc-ref inputs "ffmpeg")) - (breeze (assoc-ref inputs "breeze")) - (qml "/lib/qt5/qml")) + (breeze (assoc-ref inputs "breeze"))) (wrap-program (string-append out "/bin/kdenlive") `("PATH" ":" prefix ,(list (string-append ffmpeg "/bin"))) `("XDG_DATA_DIRS" ":" prefix ,(list (string-append breeze "/share"))) `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins/")) - '("qtbase" "qtsvg"))) + ,(list (getenv "QT_PLUGIN_PATH"))) `("FREI0R_PATH" ":" = (,(string-append frei0r "/lib/frei0r-1/"))) `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = (,(string-append qtbase "/lib/qt5/plugins/platforms"))) `("QML2_IMPORT_PATH" ":" prefix - (,(string-append qtquickcontrols qml) - ,(string-append qtquickcontrols2 qml) - ,(string-append qtdeclarative qml))) + ,(list (getenv "QML2_IMPORT_PATH"))) `("MLT_PREFIX" ":" = (,(assoc-ref inputs "mlt"))))) #t))))) -- cgit v1.2.3