From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] Add Synfig Studio. Date: Thu, 19 Nov 2015 17:33:45 +0100 Message-ID: <87y4du7xue.fsf@gnu.org> References: <87io51omxh.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzS9h-0005jL-VV for guix-devel@gnu.org; Thu, 19 Nov 2015 11:33:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzS9d-0004dr-F8 for guix-devel@gnu.org; Thu, 19 Nov 2015 11:33:53 -0500 In-Reply-To: <87io51omxh.fsf@elephly.net> (Ricardo Wurmus's message of "Mon, 16 Nov 2015 18:48:26 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ricardo Wurmus Cc: "guix-devel@gnu.org" Ricardo Wurmus skribis: > From 14040badd5312c8e093604bd3c8ddc6287ba82b1 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Mon, 16 Nov 2015 18:28:22 +0100 > Subject: [PATCH 1/5] gnu: Add libxml++. > > * gnu/packages/gnome.scm (libxml++): New variable. [...] > + (synopsis "C++ wrapper for XML parser library @code{libxml2}") > + (description > + "This package provides a C++ wrapper for the XML parser library > +@code{libxml2}.") I=E2=80=99d remove the @code here because that=E2=80=99s really the project= =E2=80=99s name, and because Texinfo markup is not supported in synopses (yet?). :-) Otherwise LGTM. > From f0322d71271403d047f7d275277bf1b6e34603cd Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Mon, 16 Nov 2015 18:28:59 +0100 > Subject: [PATCH 2/5] gnu: Add MLT. > > * gnu/packages/video.scm (mlt): New variable. OK. > From 1e783fab150edebc15f47f55019785398d469113 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Mon, 16 Nov 2015 18:32:38 +0100 > Subject: [PATCH 3/5] gnu: Add ETL. > > * gnu/packages/animation.scm: New file. > * gnu-system.am (GNU_SYSTEM_MODULES): Add it. [...] > + (description > + "ETL is a multi-platform class and template library designed to add= new s/multi-platform//g Otherwise OK. > From 44da7f71a5420260a82499bca355a784f7306236 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Mon, 16 Nov 2015 18:34:30 +0100 > Subject: [PATCH 4/5] gnu: Add Synfig. > > * gnu/packages/animation.scm (synfig): New variable. > * gnu/packages/patches/synfig-build-fix.patch: New file. > * gnu-system.am (dist_patch_DATA): Add it. [...] > +++ b/gnu/packages/patches/synfig-build-fix.patch > @@ -0,0 +1,59 @@ > +Taken from here: > +https://projects.archlinux.org/svntogit/community.git/plain/trunk/build-= fix.patch?h=3Dpackages/synfig Maybe just add =E2=80=9CAllow Synfig to build in C++11 mode.=E2=80=9D (?) Otherwise LGTM. > From 2a89ed3fa602b66f30feec8b70ffcb52183d7f39 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Mon, 16 Nov 2015 18:36:40 +0100 > Subject: [PATCH 5/5] gnu: Add Synfig Studio. > > * gnu/packages/animation.scm (synfigstudio): New variable. [...] > + (add-after 'unpack 'adapt-to-libxml++-changes > + (lambda _ > + (substitute* "src/synfigapp/pluginmanager.cpp" > + (("xmlpp::Node\\* n =3D") "const xmlpp::Node* n =3D") > + (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList")) > + #t)) > + (add-after 'unpack 'adapt-to-libsigc++-changes > + (lambda _ > + ;; Some files are ISO-8859-1 encoded. > + (with-fluids ((%default-port-encoding #f)) > + (substitute* (find-files "src/" "\\.(cpp|h)$") > + (("#include ") > + "#include ") > + (("#include ") > + "#include ") > + (("#include ") > + "#include "))) Maybe these should go to a =E2=80=98snippet=E2=80=99 since we=E2=80=99re re= ally changing the source here. WDYT? > + (add-before 'configure 'set-flags > + (lambda _ > + ;; Compile with C++11, required by libsigc++. > + (setenv "CXXFLAGS" "-D__STDC_CONSTANT_MACROS -std=3Dgnu++11") Am I right that this cannot go in #:configure-flags because of whitespaces? Otherwise that would be the preferred way, because the effect of the environment variable could be broader. Otherwise LGTM, thanks! Ludo=E2=80=99.