From mboxrd@z Thu Jan 1 00:00:00 1970 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-To: guix-patches@gnu.org Resent-Message-ID: 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> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: pkill9@runbox.com Cc: 34105-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 =C2=A9 2015, 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 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=3D" out))))) + (let ((out (assoc-ref outputs "out"))) + (invoke "qmake" (string-append "PREFIX=3D" 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-draw= n 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 bi= tmap +and vector graphics.") (license license:gpl2))) --=-=-=--