all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <mail@brendan.scot>
To: "50575@debbugs.gnu.org" <50575@debbugs.gnu.org>
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1.
Date: Wed, 15 Sep 2021 03:35:31 +0200 (CEST)	[thread overview]
Message-ID: <1860151576.68171.1631669731404@office.mailbox.org> (raw)
In-Reply-To: <20210913225855.810622-1-monego@posteo.net>

[-- 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


  reply	other threads:[~2021-09-15  1:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-13 22:58 [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1 Vinicius Monego
2021-09-15  1:35 ` Brendan Tildesley [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1860151576.68171.1631669731404@office.mailbox.org \
    --to=mail@brendan.scot \
    --cc=50575@debbugs.gnu.org \
    --cc=monego@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

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

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.