From patchwork Wed Sep 15 01:35:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 32846 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A070827BBE1; Wed, 15 Sep 2021 02:36:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A32B427BBE3 for ; Wed, 15 Sep 2021 02:36:10 +0100 (BST) Received: from localhost ([::1]:55758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQJqL-00016y-Li for patchwork@mira.cbaines.net; Tue, 14 Sep 2021 21:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQJqE-00016b-I6 for guix-patches@gnu.org; Tue, 14 Sep 2021 21:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQJqE-0001BV-Az for guix-patches@gnu.org; Tue, 14 Sep 2021 21:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQJqE-0002wQ-8I for guix-patches@gnu.org; Tue, 14 Sep 2021 21:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50575] [PATCH] gnu: kdenlive: Update to 21.08.1. References: <20210913225855.810622-1-monego@posteo.net> In-Reply-To: <20210913225855.810622-1-monego@posteo.net> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Sep 2021 01:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "50575@debbugs.gnu.org" <50575@debbugs.gnu.org> Cc: Vinicius Monego Received: via spool by 50575-submit@debbugs.gnu.org id=B50575.163166974811285 (code B ref 50575); Wed, 15 Sep 2021 01:36:02 +0000 Received: (at 50575) by debbugs.gnu.org; 15 Sep 2021 01:35:48 +0000 Received: from localhost ([127.0.0.1]:50480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQJq0-0002vx-FI for submit@debbugs.gnu.org; Tue, 14 Sep 2021 21:35:48 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:48938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQJpy-0002vi-07 for 50575@debbugs.gnu.org; Tue, 14 Sep 2021 21:35:47 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4H8N8C40vlzQkHW; Wed, 15 Sep 2021 03:35:39 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1631669737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=bqmkflO78A3G6BGPzi7choPc+HnNMKKbdjEsxOYVaY8=; b=dHSmJX+wuOo0NfkVvtvPYs1hdia+wcINpRSfSWkQG0/1QXO++nvGxCNnhR91Swp4xejvJ+ T4bjI8hCoNj3ZOT+uDlU5xw9nPEGlgVweORLX6v6OvnHNBYa2mrgCfS617uAekO1Y+3MUQ BHWYrIt+Ve11Z5YHgYlXMHITsRQ5TQU2AHbO8grywG0pY5kPS7q73SYOVvLzS2UYbn2ftU OcSQVjtxb5/aaAaby8VDuvul/NWhlsmJhBVBv13f8hPrrj46UFTPlh95NyaEQwDNb2L+6F XavW0rwfiaTFgc3nMuIxs+YBQJXzvyRqcgsAv1N0d37YeXHPDQAsMITjqUmSZw== Date: Wed, 15 Sep 2021 03:35:31 +0200 (CEST) From: Brendan Tildesley Message-ID: <1860151576.68171.1631669731404@office.mailbox.org> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-Rspamd-Queue-Id: DF80926A X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. From 0d5ffb19097157ec6c3f3d2ad2277186c53c88e6 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley 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