From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id FQ5JGTXrLl8JCAAA0tVLHw (envelope-from ) for ; Sat, 08 Aug 2020 18:13:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8Ha7FDXrLl94TQAAB5/wlQ (envelope-from ) for ; Sat, 08 Aug 2020 18:13:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C1685940704 for ; Sat, 8 Aug 2020 18:13:07 +0000 (UTC) Received: from localhost ([::1]:45382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4TL7-0005AK-H6 for larch@yhetil.org; Sat, 08 Aug 2020 14:13:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4TL4-0005AC-Dm for guix-patches@gnu.org; Sat, 08 Aug 2020 14:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48027) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4TL4-0005ZP-4X for guix-patches@gnu.org; Sat, 08 Aug 2020 14:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k4TL3-0000dW-SF for guix-patches@gnu.org; Sat, 08 Aug 2020 14:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42769] [PATCH] gnu: kdenlive: Update to 20.04.1. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Aug 2020 18:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42769 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42769@debbugs.gnu.org Cc: Michael Rohleder X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15969103682426 (code B ref -1); Sat, 08 Aug 2020 18:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Aug 2020 18:12:48 +0000 Received: from localhost ([127.0.0.1]:59573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k4TKm-0000d0-0D for submit@debbugs.gnu.org; Sat, 08 Aug 2020 14:12:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k4TKi-0000cr-Et for submit@debbugs.gnu.org; Sat, 08 Aug 2020 14:12:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4TKi-00057k-A0 for guix-patches@gnu.org; Sat, 08 Aug 2020 14:12:40 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:45086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4TKf-0005YY-U2 for guix-patches@gnu.org; Sat, 08 Aug 2020 14:12:40 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1k4TKc-00031c-7c; Sat, 08 Aug 2020 20:12:34 +0200 Received: from [192.168.1.3] (helo=micha.rohleder.de) by www.rohleder.de with esmtp (Exim 4.94) (envelope-from ) id 1k4TKa-0006C1-Di; Sat, 08 Aug 2020 20:12:33 +0200 From: Michael Rohleder Date: Sat, 8 Aug 2020 20:12:33 +0200 Message-Id: <20200808181233.13950-1-mike@rohleder.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1596910357;7bd64fb6; X-HE-SMSGID: 1k4TKc-00031c-7c Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/08 13:53:21 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: XyDMIKPN5Pu0 * gnu/packages/kde.scm (kdenlive): Update to 20.04.1. [inputs]: added rttr, qtmultimedia, qtquickcontrols2. [propagated-inputs]: moved mlt to inputs. [arguments]: added MLT_PREFIX to wrap-program. --- This should fix bugs #42217, #38460, #34107. (needs rttr, patch 42767). gnu/packages/kde.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 0ff8fef2b6..9bc753001e 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2019 Hartmut Goebel ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages boost) #:use-module (gnu packages code) + #:use-module (gnu packages cpp) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) @@ -132,7 +134,7 @@ This package contains GUI widgets for baloo.") (list license:lgpl2.1+ license:fdl1.2+)))) (define-public kdenlive - (let ((version "18.08.1")) + (let ((version "20.04.1")) (package (name "kdenlive") (version version) @@ -140,24 +142,25 @@ This package contains GUI widgets for baloo.") (origin (method git-fetch) (uri (git-reference - (url "git://anongit.kde.org/kdenlive.git") + (url "https://anongit.kde.org/kdenlive.git") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0ifnaclsz7w08mc485i3j1kkcpd1m8q5qamckrfwc375ac13xf4g")))) + "0n0x34xmcn0k87rqnz0mk462b3al4gq56kn4m00rr428hafscdz7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools))) - (propagated-inputs - `(("mlt" ,mlt))) (inputs `(("shared-mime-info" ,shared-mime-info) ("frei0r-plugins" ,frei0r-plugins) + ("rttr" ,rttr) + ("mlt" ,mlt) ("qtbase" ,qtbase) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg) + ("qtmultimedia" ,qtmultimedia) ("kparts" ,kparts) ("knotifications" ,knotifications) ("karchive" ,karchive) @@ -171,16 +174,19 @@ This package contains GUI widgets for baloo.") ("kdeclarative" ,kdeclarative) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2) ("kiconthemes" ,kiconthemes) ("qtgraphicaleffects" ,qtgraphicaleffects) ("kplotting" ,kplotting))) (arguments - `(#:phases + `(#:tests? #f ;TODO needs X + #:phases (modify-phases %standard-phases (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")) @@ -197,7 +203,10 @@ This package contains GUI widgets for baloo.") (,(string-append qtbase "/lib/qt5/plugins/platforms"))) `("QML2_IMPORT_PATH" ":" prefix (,(string-append qtquickcontrols qml) - ,(string-append qtdeclarative qml))))) + ,(string-append qtquickcontrols2 qml) + ,(string-append qtdeclarative qml))) + `("MLT_PREFIX" ":" = + (,(assoc-ref inputs "mlt"))))) #t))))) (home-page "https://kdenlive.org") (synopsis "Non-linear video editor") -- 2.28.0