From patchwork Fri Oct 22 19:17:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 34013 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 24F9327BBE3; Fri, 22 Oct 2021 20:18:21 +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 CE12E27BBE1 for ; Fri, 22 Oct 2021 20:18:20 +0100 (BST) Received: from localhost ([::1]:44804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1me03X-0002LF-T9 for patchwork@mira.cbaines.net; Fri, 22 Oct 2021 15:18:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1me03H-0001uu-DS for guix-patches@gnu.org; Fri, 22 Oct 2021 15:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1me03H-0004wZ-0O for guix-patches@gnu.org; Fri, 22 Oct 2021 15:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1me03G-0004ht-SN for guix-patches@gnu.org; Fri, 22 Oct 2021 15:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51338] [PATCH 3/4] gnu: OpenShot: Update to 2.6.1. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Oct 2021 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51338 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51338@debbugs.gnu.org Received: via spool by 51338-submit@debbugs.gnu.org id=B51338.163493025718036 (code B ref 51338); Fri, 22 Oct 2021 19:18:02 +0000 Received: (at 51338) by debbugs.gnu.org; 22 Oct 2021 19:17:37 +0000 Received: from localhost ([127.0.0.1]:33807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1me02q-0004gq-Jn for submit@debbugs.gnu.org; Fri, 22 Oct 2021 15:17:36 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1me02f-0004fr-UX for 51338@debbugs.gnu.org; Fri, 22 Oct 2021 15:17:34 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id DA4705C0181; Fri, 22 Oct 2021 15:17:20 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 22 Oct 2021 15:17:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=ks19YfqMwv ygwcxKtJUJzzFKWHtZp9pSfp6xi4Xsy5I=; b=tQNvsx5oMFnx3Ytxo1v1rBQhI0 GkRUdcLQyGVyFSO9x/ZjJP1la76kFJS1tONqpUkOgNItcUYd6bjNaG/MgNYb/y+v MvMPk1klgQR0EaWuMBroPezdaMCph5v5DBqaNugT6qaRda9MPFwop4dXSUeX7206 4as9pIE3rNZKzIhKY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=ks19YfqMwvygwcxKtJUJzzFKWHtZp9pSfp6xi4Xsy5I=; b=HF3x0/ma OCxpxowdu4bC1tik7PlaKmjEn0ICkibJADnGtRnivuN9fbnD0e0gpVoyLHbISrEK hybRHy2OhyWfhczHyuKP/yodANs5a1zU5bcFmNbOnU41kLyDnQKsrI5DJXNq4URy R/bA4+RwPZNwhJiYNve2iWf7vSxp6VJceui76Q7DGvp00cjUD6HkMjckPM99DhJJ L6Lf+jA4H3nRmz7mP2o325QFv/tbAFIPUEETGJLQARebTSfDk2Ivv+SeS/59r6mi VOhCOxCHJIT9ozLnmCXpltfZEWmdnnEIYKB9TVYCaZ/q7QbfcqjmjIeIg52YWz9Y DGSDCoZ5BieEug== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrvddvkedgudefvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeevhfetgfdtfeekieetleetvdegke fhffekhffhffdtheduvedvtdfhffdvvdelgeenucffohhmrghinhepghhithhhuhgsrdgt ohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <51338@debbugs.gnu.org>; Fri, 22 Oct 2021 15:17:20 -0400 (EDT) From: Leo Famulari Date: Fri, 22 Oct 2021 15:17:15 -0400 Message-Id: <6d918c8ff9890afcc564ebd02a64ce3eacae6947.1634930236.git.leo@famulari.name> X-Mailer: git-send-email 2.33.1 In-Reply-To: <83d86856865883d2f7c03e5224253af91ee22a9c.1634930236.git.leo@famulari.name> References: <83d86856865883d2f7c03e5224253af91ee22a9c.1634930236.git.leo@famulari.name> 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/video.scm (openshot): Update to 2.6.1. [arguments]: Add a 'fix-symbolic-link' phase to work around a broken symlink. --- gnu/packages/video.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 168c16492a..6587ac41f3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4654,7 +4654,7 @@ (define-public libopenshot (define-public openshot (package (name "openshot") - (version "2.5.1") + (version "2.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -4663,7 +4663,7 @@ (define-public openshot (file-name (git-file-name name version)) (sha256 (base32 - "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq")) + "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv")) (modules '((guix build utils))) (snippet '(begin @@ -4699,6 +4699,12 @@ (define-public openshot (("fonts") "share/fonts/truetype") (("[A-Za-z_-]+.ttf") "DejaVuSans.ttf"))) #t)) + ;; https://github.com/OpenShot/openshot-qt/issues/4502 + (add-before 'ensure-no-mtimes-pre-1980 'fix-symbolic-link + (lambda _ + (delete-file "images/Humanity/actions/custom/razor_line_with_razor.png") + (symlink "../../../../src/timeline/media/images/razor_line_with_razor.png" + "images/Humanity/actions/custom/razor_line_with_razor.png"))) (add-before 'install 'set-tmp-home (lambda _ ;; src/classes/info.py "needs" to create several