From patchwork Sun Jan 20 18:21:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 771 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 3668C16A39; Sun, 20 Jan 2019 18:22:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BA64616A34 for ; Sun, 20 Jan 2019 18:22:17 +0000 (GMT) Received: from localhost ([127.0.0.1]:42909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glHjd-0006km-CB for patchwork@mira.cbaines.net; Sun, 20 Jan 2019 13:22:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1glHjT-0006jt-Bh for guix-patches@gnu.org; Sun, 20 Jan 2019 13:22:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1glHjO-0004XY-PL for guix-patches@gnu.org; Sun, 20 Jan 2019 13:22:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1glHjO-0004XG-Jf for guix-patches@gnu.org; Sun, 20 Jan 2019 13:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1glHjO-0000i2-AV for guix-patches@gnu.org; Sun, 20 Jan 2019 13:22:02 -0500 Subject: bug#34105: [PATCH] Add pencil2d. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 20 Jan 2019 18:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 34105 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mail-Followup-To: 34105@debbugs.gnu.org, ludo@gnu.org, pkill9@runbox.com Received: via spool by 34105-done@debbugs.gnu.org id=D34105.15480085012685 (code D ref 34105); Sun, 20 Jan 2019 18:22:01 +0000 Received: (at 34105-done) by debbugs.gnu.org; 20 Jan 2019 18:21:41 +0000 Received: from localhost ([127.0.0.1]:39183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glHiz-0000h9-8z for submit@debbugs.gnu.org; Sun, 20 Jan 2019 13:21:41 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:42222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1glHiu-0000gv-7L for 34105-done@debbugs.gnu.org; Sun, 20 Jan 2019 13:21:36 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CD89E39D3; Sun, 20 Jan 2019 19:21:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DlOwZutMghe1; Sun, 20 Jan 2019 19:21:26 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D5B37398B; Sun, 20 Jan 2019 19:21:25 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= References: Date: Sun, 20 Jan 2019 19:21:25 +0100 In-Reply-To: (pkill9's message of "Wed, 16 Jan 2019 15:27:32 +0000 (GMT)") Message-ID: <87k1iznqai.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34105-done@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, skribis: > From d0c680e629b4c85ee462b624c65683a0a52306d9 Mon Sep 17 00:00:00 2001 > From: Pkill -9 > Date: Wed, 16 Jan 2019 15:14:45 +0000 > Subject: [PATCH] gnu: Add pencil2d. > > * gnu/packages/animation.scm (pencil2d): New variable. Applied with the minor changes below. Thank you! Ludo’. diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 5b9ca033b5..965fff6d46 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Pkill -9 ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,6 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages algebra) - #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) @@ -275,27 +275,28 @@ waveform until they line up with the proper sounds.") "1iv7drwxs32mqs3hybjx2lxyqn8cv2b4rw9ny7gzdacsbhi65knr")))) (build-system gnu-build-system) (inputs - `(("bash" ,bash) ;; Bash is used for wrap-program - ("qtbase" ,qtbase) + `(("qtbase" ,qtbase) ("qtxmlpatterns" ,qtxmlpatterns) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg))) (arguments `(#:phases - (modify-phases standard-phases + (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (qmake (string-append (assoc-ref inputs "qtbase") - "/bin/qmake"))) - (invoke qmake (string-append "PREFIX=" out))))) + (let ((out (assoc-ref outputs "out"))) + (invoke "qmake" (string-append "PREFIX=" out))))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (plugin-path (getenv "QT_PLUGIN_PATH"))) (wrap-program (string-append out "/bin/pencil2d") - `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))))))) + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))) + #t)))))) (home-page "https://www.pencil2d.org") - (synopsis "Tool to make 2D hand-drawn animations") - (description "Pencil2D is an easy, intuitive tool to make 2D hand-drawn animations.") + (synopsis "Make 2D hand-drawn animations") + (description + "Pencil2D is an easy-to-use and intuitive animation and drawing tool. It +lets you create traditional hand-drawn animations (cartoons) using both bitmap +and vector graphics.") (license license:gpl2)))