all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / Atom feed
* [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1.
@ 2021-09-13 22:58 Vinicius Monego
  2021-09-15  1:35 ` Brendan Tildesley
  2021-09-15 13:57 ` [bug#50575] [PATCH v2 1/2] " Vinicius Monego
  0 siblings, 2 replies; 6+ messages in thread
From: Vinicius Monego @ 2021-09-13 22:58 UTC (permalink / raw)
  To: 50575; +Cc: Vinicius Monego

* gnu/packages/kde.scm (kdenlive): Update to 21.08.1.
[inputs]: Order alphabetically. Use MLT 7. Add qtnetworkauth.
[arguments]<#:phases>: Don't return #t.
---
 gnu/packages/kde.scm | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aff3ed51ed..2a4a8091af 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -219,7 +219,7 @@ browser for easy news reading.")
     (license license:gpl2+)))
 
 (define-public kdenlive
-  (let ((version "20.08.3"))
+  (let ((version "21.08.1"))
     (package
       (name "kdenlive")
       (version version)
@@ -231,43 +231,44 @@ browser for easy news reading.")
                (commit (string-append "v" version))))
          (file-name (string-append name "-" version "-checkout"))
          (sha256
-          (base32 "0x0qfwf6wfnybjyjvmllpf87sm27d1n2akslhp2k8ins838qy55i"))))
+          (base32 "1fvy2aa86pn4crk8lgxjh1kdn2lxzi66krnrr9m91mp89mmc760k"))))
       (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)
-         ("frei0r-plugins" ,frei0r-plugins)
+       `(("breeze" ,breeze) ; make dark them available easily
+         ("breeze-icons" ,breeze-icons) ; recommended icon set
          ("ffmpeg" ,ffmpeg)
-         ("rttr" ,rttr)
-         ("mlt" ,mlt-6)
-         ("qtbase" ,qtbase-5)
-         ("qtscript" ,qtscript)
-         ("qtsvg" ,qtsvg)
-         ("qtmultimedia" ,qtmultimedia)
-         ("kparts" ,kparts)
-         ("knotifications" ,knotifications)
+         ("frei0r-plugins" ,frei0r-plugins)
          ("karchive" ,karchive)
-         ("kdbusaddons" ,kdbusaddons)
          ("kcrash" ,kcrash)
+         ("kdbusaddons" ,kdbusaddons)
+         ("kdeclarative" ,kdeclarative)
+         ("kdoctools" ,kdoctools)
+         ("kfilemetadata" ,kfilemetadata)
          ("kguiaddons" ,kguiaddons)
+         ("kiconthemes" ,kiconthemes)
          ("knewstuff" ,knewstuff)
+         ("knotifications" ,knotifications)
          ("knotifyconfig" ,knotifyconfig)
-         ("kfilemetadata" ,kfilemetadata)
-         ("kdoctools" ,kdoctools)
-         ("kdeclarative" ,kdeclarative)
+         ("kparts" ,kparts)
+         ("kplotting" ,kplotting)
+         ("mlt" ,mlt)
+         ("purpose" ,purpose)
+         ("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative)
+         ("qtgraphicaleffects" ,qtgraphicaleffects)
+         ("qtmultimedia" ,qtmultimedia)
+         ("qtnetworkauth" ,qtnetworkauth)
          ("qtquickcontrols" ,qtquickcontrols)
          ("qtquickcontrols2" ,qtquickcontrols2)
-         ("kiconthemes" ,kiconthemes)
-         ("breeze" ,breeze) ; make dark them available easily
-         ("breeze-icons" ,breeze-icons) ; recommended icon set
-         ("purpose" ,purpose)
+         ("qtscript" ,qtscript)
+         ("qtsvg" ,qtsvg)
          ("qtwebkit" ,qtwebkit)
-         ("qtgraphicaleffects" ,qtgraphicaleffects)
-         ("kplotting" ,kplotting)))
+         ("rttr" ,rttr)
+         ("shared-mime-info" ,shared-mime-info)))
       (arguments
        `(#:tests? #f                    ;TODO needs X
          #:phases
@@ -295,8 +296,7 @@ browser for easy news reading.")
                    `("QML2_IMPORT_PATH" ":" prefix
                      ,(list (getenv "QML2_IMPORT_PATH")))
                    `("MLT_PREFIX" ":" =
-                     (,(assoc-ref inputs "mlt")))))
-               #t)))))
+                     (,(assoc-ref inputs "mlt"))))))))))
       (home-page "https://kdenlive.org")
       (synopsis "Non-linear video editor")
       (description "Kdenlive is an acronym for KDE Non-Linear Video Editor.
-- 
2.30.2





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

* [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1.
  2021-09-13 22:58 [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1 Vinicius Monego
@ 2021-09-15  1:35 ` Brendan Tildesley
  2021-09-15 14:06   ` Vinicius Monego
  2021-09-15 13:57 ` [bug#50575] [PATCH v2 1/2] " Vinicius Monego
  1 sibling, 1 reply; 6+ messages in thread
From: Brendan Tildesley @ 2021-09-15  1:35 UTC (permalink / raw)
  To: 50575; +Cc: Vinicius Monego

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

I think rttr can be removed as a dependency.

Also, It is also possible to switch qt-build-system. In this case, the manual XDG_DATA_DIRS, QT_PLUGIN_PATH, and QML2_IMPORT_PATH wrappers can be removed. The resulting wrapper is slightly different but I think equivalent.
I attached a patch I made last week. If you think it's good you can use that or make it in to your own patch.

Also, there is another kdenlive bug report here https://issues.guix.gnu.org/38450 . I think this bug actually isn't
present any more. To the reviewer of this kdenlive update, if you have the time, maybe also check if that bug occurs, and if not close it. Thanks.

[-- Attachment #2: 0001-gnu-kdenlive-Use-qt-build-system.patch --]
[-- Type: text/x-patch, Size: 2622 bytes --]

From 0d5ffb19097157ec6c3f3d2ad2277186c53c88e6 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Tue, 7 Sep 2021 00:29:13 +1000
Subject: [PATCH] gnu: kdenlive: Use qt-build-system.

gnu/packages/kde.scm (kdenlive): Use qt-build-system.
---
 gnu/packages/kde.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aff3ed51ed..0cabf82ce8 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -232,7 +232,7 @@ browser for easy news reading.")
          (file-name (string-append name "-" version "-checkout"))
          (sha256
           (base32 "0x0qfwf6wfnybjyjvmllpf87sm27d1n2akslhp2k8ins838qy55i"))))
-      (build-system cmake-build-system)
+      (build-system qt-build-system)
       (native-inputs
        `(("extra-cmake-modules" ,extra-cmake-modules)
          ("pkg-config" ,pkg-config)
@@ -272,28 +272,19 @@ browser for easy news reading.")
        `(#:tests? #f                    ;TODO needs X
          #:phases
          (modify-phases %standard-phases
-           (add-after 'install 'wrap-executable
+           (add-after 'wrap 'wrap-executable
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
                       (qtbase (assoc-ref inputs "qtbase"))
                       (frei0r (assoc-ref inputs "frei0r-plugins"))
-                      (ffmpeg (assoc-ref inputs "ffmpeg"))
-                      (breeze (assoc-ref inputs "breeze"))
-                      (breeze-icons (assoc-ref inputs "breeze-icons")))
+                      (ffmpeg (assoc-ref inputs "ffmpeg")))
                  (wrap-program (string-append out "/bin/kdenlive")
                    `("PATH" ":" prefix
                      ,(list (string-append ffmpeg "/bin")))
-                   `("XDG_DATA_DIRS" ":" prefix
-                     ,(list (string-append breeze "/share")
-                            (string-append breeze-icons "/share")))
-                   `("QT_PLUGIN_PATH" ":" prefix
-                     ,(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
-                     ,(list (getenv "QML2_IMPORT_PATH")))
                    `("MLT_PREFIX" ":" =
                      (,(assoc-ref inputs "mlt")))))
                #t)))))
-- 
2.33.0


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

* [bug#50575] [PATCH v2 1/2] gnu: kdenlive: Update to 21.08.1.
  2021-09-13 22:58 [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1 Vinicius Monego
  2021-09-15  1:35 ` Brendan Tildesley
@ 2021-09-15 13:57 ` Vinicius Monego
  2021-09-15 13:57   ` [bug#50575] [PATCH v2 2/2] gnu: kdenlive: Use qt-build-system Vinicius Monego
  2021-09-20 18:44   ` bug#50575: [PATCH] gnu: kdenlive: Update to 21.08.1 Mathieu Othacehe
  1 sibling, 2 replies; 6+ messages in thread
From: Vinicius Monego @ 2021-09-15 13:57 UTC (permalink / raw)
  To: 50575; +Cc: Vinicius Monego

* gnu/packages/kde.scm (kdenlive): Update to 21.08.1.
[inputs]: Order alphabetically. Use MLT 7. Add qtnetworkauth. Remove rttr.
[arguments]<#:phases>: Don't return #t.
---
 gnu/packages/kde.scm | 47 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index aff3ed51ed..d8b6c4c12f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -219,7 +219,7 @@ browser for easy news reading.")
     (license license:gpl2+)))
 
 (define-public kdenlive
-  (let ((version "20.08.3"))
+  (let ((version "21.08.1"))
     (package
       (name "kdenlive")
       (version version)
@@ -231,43 +231,43 @@ browser for easy news reading.")
                (commit (string-append "v" version))))
          (file-name (string-append name "-" version "-checkout"))
          (sha256
-          (base32 "0x0qfwf6wfnybjyjvmllpf87sm27d1n2akslhp2k8ins838qy55i"))))
+          (base32 "1fvy2aa86pn4crk8lgxjh1kdn2lxzi66krnrr9m91mp89mmc760k"))))
       (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)
-         ("frei0r-plugins" ,frei0r-plugins)
+       `(("breeze" ,breeze) ; make dark them available easily
+         ("breeze-icons" ,breeze-icons) ; recommended icon set
          ("ffmpeg" ,ffmpeg)
-         ("rttr" ,rttr)
-         ("mlt" ,mlt-6)
-         ("qtbase" ,qtbase-5)
-         ("qtscript" ,qtscript)
-         ("qtsvg" ,qtsvg)
-         ("qtmultimedia" ,qtmultimedia)
-         ("kparts" ,kparts)
-         ("knotifications" ,knotifications)
+         ("frei0r-plugins" ,frei0r-plugins)
          ("karchive" ,karchive)
-         ("kdbusaddons" ,kdbusaddons)
          ("kcrash" ,kcrash)
+         ("kdbusaddons" ,kdbusaddons)
+         ("kdeclarative" ,kdeclarative)
+         ("kdoctools" ,kdoctools)
+         ("kfilemetadata" ,kfilemetadata)
          ("kguiaddons" ,kguiaddons)
+         ("kiconthemes" ,kiconthemes)
          ("knewstuff" ,knewstuff)
+         ("knotifications" ,knotifications)
          ("knotifyconfig" ,knotifyconfig)
-         ("kfilemetadata" ,kfilemetadata)
-         ("kdoctools" ,kdoctools)
-         ("kdeclarative" ,kdeclarative)
+         ("kparts" ,kparts)
+         ("kplotting" ,kplotting)
+         ("mlt" ,mlt)
+         ("purpose" ,purpose)
+         ("qtbase" ,qtbase-5)
          ("qtdeclarative" ,qtdeclarative)
+         ("qtgraphicaleffects" ,qtgraphicaleffects)
+         ("qtmultimedia" ,qtmultimedia)
+         ("qtnetworkauth" ,qtnetworkauth)
          ("qtquickcontrols" ,qtquickcontrols)
          ("qtquickcontrols2" ,qtquickcontrols2)
-         ("kiconthemes" ,kiconthemes)
-         ("breeze" ,breeze) ; make dark them available easily
-         ("breeze-icons" ,breeze-icons) ; recommended icon set
-         ("purpose" ,purpose)
+         ("qtscript" ,qtscript)
+         ("qtsvg" ,qtsvg)
          ("qtwebkit" ,qtwebkit)
-         ("qtgraphicaleffects" ,qtgraphicaleffects)
-         ("kplotting" ,kplotting)))
+         ("shared-mime-info" ,shared-mime-info)))
       (arguments
        `(#:tests? #f                    ;TODO needs X
          #:phases
@@ -295,8 +295,7 @@ browser for easy news reading.")
                    `("QML2_IMPORT_PATH" ":" prefix
                      ,(list (getenv "QML2_IMPORT_PATH")))
                    `("MLT_PREFIX" ":" =
-                     (,(assoc-ref inputs "mlt")))))
-               #t)))))
+                     (,(assoc-ref inputs "mlt"))))))))))
       (home-page "https://kdenlive.org")
       (synopsis "Non-linear video editor")
       (description "Kdenlive is an acronym for KDE Non-Linear Video Editor.
-- 
2.30.2





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

* [bug#50575] [PATCH v2 2/2] gnu: kdenlive: Use qt-build-system.
  2021-09-15 13:57 ` [bug#50575] [PATCH v2 1/2] " Vinicius Monego
@ 2021-09-15 13:57   ` Vinicius Monego
  2021-09-20 18:44   ` bug#50575: [PATCH] gnu: kdenlive: Update to 21.08.1 Mathieu Othacehe
  1 sibling, 0 replies; 6+ messages in thread
From: Vinicius Monego @ 2021-09-15 13:57 UTC (permalink / raw)
  To: 50575; +Cc: Vinicius Monego

* gnu/packages/kde.scm (kdenlive)[build-system]: Use qt-build-system.
[arguments]<#:phases>: Do not wrap variables that are wrapped by
qt-build-system in 'wrap-executable.
---
 gnu/packages/kde.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index d8b6c4c12f..c5a3f43361 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -232,7 +232,7 @@ browser for easy news reading.")
          (file-name (string-append name "-" version "-checkout"))
          (sha256
           (base32 "1fvy2aa86pn4crk8lgxjh1kdn2lxzi66krnrr9m91mp89mmc760k"))))
-      (build-system cmake-build-system)
+      (build-system qt-build-system)
       (native-inputs
        `(("extra-cmake-modules" ,extra-cmake-modules)
          ("pkg-config" ,pkg-config)
@@ -277,23 +277,14 @@ browser for easy news reading.")
                (let* ((out (assoc-ref outputs "out"))
                       (qtbase (assoc-ref inputs "qtbase"))
                       (frei0r (assoc-ref inputs "frei0r-plugins"))
-                      (ffmpeg (assoc-ref inputs "ffmpeg"))
-                      (breeze (assoc-ref inputs "breeze"))
-                      (breeze-icons (assoc-ref inputs "breeze-icons")))
+                      (ffmpeg (assoc-ref inputs "ffmpeg")))
                  (wrap-program (string-append out "/bin/kdenlive")
                    `("PATH" ":" prefix
                      ,(list (string-append ffmpeg "/bin")))
-                   `("XDG_DATA_DIRS" ":" prefix
-                     ,(list (string-append breeze "/share")
-                            (string-append breeze-icons "/share")))
-                   `("QT_PLUGIN_PATH" ":" prefix
-                     ,(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
-                     ,(list (getenv "QML2_IMPORT_PATH")))
                    `("MLT_PREFIX" ":" =
                      (,(assoc-ref inputs "mlt"))))))))))
       (home-page "https://kdenlive.org")
-- 
2.30.2





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

* [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1.
  2021-09-15  1:35 ` Brendan Tildesley
@ 2021-09-15 14:06   ` Vinicius Monego
  0 siblings, 0 replies; 6+ messages in thread
From: Vinicius Monego @ 2021-09-15 14:06 UTC (permalink / raw)
  To: Brendan Tildesley, 50575

Em qua, 2021-09-15 às 03:35 +0200, Brendan Tildesley escreveu:
> I think rttr can be removed as a dependency.

Removed rttr because it's conditional to the CRASH_AUTO_TEST option in
CMakeLists.txt, which is set to OFF by default.

> Also, It is also possible to switch qt-build-system. In this case,
> the manual XDG_DATA_DIRS, QT_PLUGIN_PATH, and QML2_IMPORT_PATH
> wrappers can be removed. The resulting wrapper is slightly different
> but I think equivalent.
> I attached a patch I made last week. If you think it's good you can
> use that or make it in to your own patch.

Added as a second patch in the series, though I didn't move the phase
after 'wrap. Not sure if it makes a difference?

> Also, there is another kdenlive bug report here  
> https://issues.guix.gnu.org/38450 . I think this bug actually isn't
> present any more. To the reviewer of this kdenlive update, if you
> have the time, maybe also check if that bug occurs, and if not close
> it. Thanks.

The issue doesn't happen in this particular build. I didn't test the
current version because there are no substitutes for it at the moment,
but it's most likely working there too.





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

* bug#50575: [PATCH] gnu: kdenlive: Update to 21.08.1.
  2021-09-15 13:57 ` [bug#50575] [PATCH v2 1/2] " Vinicius Monego
  2021-09-15 13:57   ` [bug#50575] [PATCH v2 2/2] gnu: kdenlive: Use qt-build-system Vinicius Monego
@ 2021-09-20 18:44   ` Mathieu Othacehe
  1 sibling, 0 replies; 6+ messages in thread
From: Mathieu Othacehe @ 2021-09-20 18:44 UTC (permalink / raw)
  To: Vinicius Monego; +Cc: 50575-done


Hello,

Pushed on master, thanks!

Mathieu




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

end of thread, other threads:[~2021-09-20 18:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-13 22:58 [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1 Vinicius Monego
2021-09-15  1:35 ` Brendan Tildesley
2021-09-15 14:06   ` Vinicius Monego
2021-09-15 13:57 ` [bug#50575] [PATCH v2 1/2] " Vinicius Monego
2021-09-15 13:57   ` [bug#50575] [PATCH v2 2/2] gnu: kdenlive: Use qt-build-system Vinicius Monego
2021-09-20 18:44   ` bug#50575: [PATCH] gnu: kdenlive: Update to 21.08.1 Mathieu Othacehe

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.