From patchwork Wed Sep 15 13:57:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 32849 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 4EAA027BBE3; Wed, 15 Sep 2021 14:59:46 +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 16ECB27BBE1 for ; Wed, 15 Sep 2021 14:59:46 +0100 (BST) Received: from localhost ([::1]:47254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQVRx-0001za-69 for patchwork@mira.cbaines.net; Wed, 15 Sep 2021 09:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQVRH-0001Ba-4A for guix-patches@gnu.org; Wed, 15 Sep 2021 09:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQVRG-0000cL-Sw for guix-patches@gnu.org; Wed, 15 Sep 2021 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQVRG-0005Lr-Ry for guix-patches@gnu.org; Wed, 15 Sep 2021 09:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50575] [PATCH v2 2/2] gnu: kdenlive: Use qt-build-system. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Sep 2021 13:59: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 Cc: Vinicius Monego Received: via spool by 50575-submit@debbugs.gnu.org id=B50575.163171428520498 (code B ref 50575); Wed, 15 Sep 2021 13:59:02 +0000 Received: (at 50575) by debbugs.gnu.org; 15 Sep 2021 13:58:05 +0000 Received: from localhost ([127.0.0.1]:52767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQVQL-0005KY-GV for submit@debbugs.gnu.org; Wed, 15 Sep 2021 09:58:05 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35235) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQVQK-0005Jr-Be for 50575@debbugs.gnu.org; Wed, 15 Sep 2021 09:58:04 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id B23CC240027 for <50575@debbugs.gnu.org>; Wed, 15 Sep 2021 15:57:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1631714278; bh=rLS2Jt5yWkMAQ2QTJUYCK3Mw7P0KuKoLqaSADJLynM4=; h=From:To:Cc:Subject:Date:From; b=oKvy4ZJRYh9V2lnG1bbGTwPCZ7aR68sm2FGA6VccQquRhr6TDF5FQuFFLt7jUrmrv GHkuXYgIQBFpaVsUNcKGxo8yO+ca0TWL8P1MC9T9KAgimQU+N2xBvu4Ho11dPtrmsr jzK5NB7yMPIgwgeWizE/XoYEN5l4RVSvEVxjToma7h2ZTmTfR61tbJiIy5HTdd2TOj mf7dl5s+Itow3rXQgeG9ZiISZrxPUHx4A6bYLztbthuESqSQPB2gu8lSw2hFRtps/D /Ei4fl/YGPOTFKuJ4V8P6QqvO8H2hklurLRrKkLbxd2JAADI8KJbX4J8EP1qAO/6gT JOPki4VVkYTTA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H8hcj6QjQz6tmb; Wed, 15 Sep 2021 15:57:57 +0200 (CEST) From: Vinicius Monego Date: Wed, 15 Sep 2021 13:57:45 +0000 Message-Id: <20210915135745.2835-2-monego@posteo.net> In-Reply-To: <20210915135745.2835-1-monego@posteo.net> References: <20210915135745.2835-1-monego@posteo.net> MIME-Version: 1.0 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 * 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")