From unknown Fri Jun 20 07:10:03 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#41118 <41118@debbugs.gnu.org> To: bug#41118 <41118@debbugs.gnu.org> Subject: Status: [PATCH] gnu: inkscape: Update to 1.0. Reply-To: bug#41118 <41118@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:10:03 +0000 retitle 41118 [PATCH] gnu: inkscape: Update to 1.0. reassign 41118 guix-patches submitter 41118 Maxim Cournoyer severity 41118 normal tag 41118 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed May 06 23:23:46 2020 Received: (at submit) by debbugs.gnu.org; 7 May 2020 03:23:46 +0000 Received: from localhost ([127.0.0.1]:41694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWX8L-0007Pi-Lx for submit@debbugs.gnu.org; Wed, 06 May 2020 23:23:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:39238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWX8D-0007PN-17 for submit@debbugs.gnu.org; Wed, 06 May 2020 23:23:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWX8C-0004QP-QL for guix-patches@gnu.org; Wed, 06 May 2020 23:23:28 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:45403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWX88-0002qb-8A for guix-patches@gnu.org; Wed, 06 May 2020 23:23:28 -0400 Received: by mail-qk1-x72e.google.com with SMTP id c64so4570343qkf.12 for ; Wed, 06 May 2020 20:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=yF4jdVb539q5JDKFJZ1R4WUWGLYZxBMezD3uWcyCIL4=; b=PxBPG9SDWaM+Ms1gqb17+BqLubXYMGqUN1kFhXsTQV0beJ2+OT7bg4jsy9hQh5hnpj 5Wt6YY9LQMeyLNjC+SYzMbNVz/jNG1Jt3GJ33IfgL6SD3w9qVo2okNt978NM65v680q2 VSNGvPCWWsmS7jSw0FDN4C74SJS3imltRxwBnBc9WVpUWikfrhGed7FSekyUCTgEbP7p XVERGk6J9VNGotwayNpDGwDH9Jd3GY12g7zeOlAR5uPDZcjgC16ARDCdOH4pj39uHtwl L8jZ7XSHbXyKV3L38xvGdeqcQQwj2VrSG17UuBP8RBc2KI5XrLX22bn6tG641+bwvMnO IEhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=yF4jdVb539q5JDKFJZ1R4WUWGLYZxBMezD3uWcyCIL4=; b=MTq/5oYp1lRmsxwuJwulNVRxIzkGwgxXIB9CLcExEQVCpX9CtLaORaNaJVnqXRBRyX PvzavAQ0GuMmXWSVgUMLqZIdDkpvrPPUMjvj0E7F+qwIiuoxkgEVU5tnVxTf4osDY4L3 kBUcmw9pA0DKP+M2/8yUSm54f2SQB6w3xRXLGDKjKDxatgcsAIarnuimkNCPE6rKUA5u pDRQqNhHdPVfKWIfOp6G3nN+OqcbQXOMTHSrL7cfYdlnz5Mi/MjtJL6B4GcE6kiz1V7Z bbyCv9/EPf0HNGFp0wNd1tWmY5XsgO0FrveFEEge9cKZPl5Ir72EOvxbxhlyFIjUAFjA XiuQ== X-Gm-Message-State: AGi0PuYDVbE5W3MZtNdz6c79f9XEHK38ehT0z8FP3QbqXVR+A8ULjVSz eB0WfY+fQD0Akg159gJsky9cB+IN X-Google-Smtp-Source: APiQypIlkBLrwRf1+YDWqMYuqFHGm+QQB/hA8V/guhuLUxeqbaGneexL6+m6pUfyP0+SKQGMkpAfPw== X-Received: by 2002:a37:7b01:: with SMTP id w1mr12938099qkc.167.1588821802903; Wed, 06 May 2020 20:23:22 -0700 (PDT) Received: from hurd (dsl-236-123-224.b2b2c.ca. [207.236.123.224]) by smtp.gmail.com with ESMTPSA id 62sm120401qkh.113.2020.05.06.20.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 20:23:21 -0700 (PDT) From: Maxim Cournoyer To: guix-patches Subject: [PATCH] gnu: inkscape: Update to 1.0. Date: Wed, 06 May 2020 23:23:10 -0400 Message-ID: <87y2q41l9d.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2607:f8b0:4864:20::72e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit Cc: Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello! The following updates Inkscape to its 1.0 version. The test suite is enabled and an effort is made to unbundle as much of 3rd party libraries as possible (but more can be done, if you'd like to help: see the comments in the patch). The last patch of the series (Add libdepixelize) is added as a WIP, and is included as a curiosity only (not intended to be merged in its current state). Enjoy! Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-libsoup-Add-the-missing-PHP-dependency.patch Content-Transfer-Encoding: quoted-printable From=2000421dc8f22a84260ade4cccec9d0a27b532f9ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:56:33 -0500 Subject: [PATCH 01/14] gnu: libsoup: Add the missing PHP dependency. * gnu/packages/gnome.scm (libsoup)[native-inputs]: Add php. =2D-- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b07c2dbb05..d768a0a348 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) @@ -3702,8 +3703,7 @@ libxml to ease remote use of the RESTful API.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("vala" ,vala) =2D ;; These are needed for the tests. =2D ;; FIXME: Add PHP once available. + ("php" ,php) ("curl" ,curl) ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-Add-libsoup-minimal.patch Content-Transfer-Encoding: quoted-printable From=20989b4169c38751e3056e0dad3e571e9939aa5bf8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:57:33 -0500 Subject: [PATCH 02/14] gnu: Add libsoup-minimal. * gnu/packages/gnome.scm (libsoup-minimal): New variable. =2D-- gnu/packages/gnome.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d768a0a348..f252fac978 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -179,6 +179,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) + #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -3725,6 +3726,22 @@ libxml to ease remote use of the RESTful API.") and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+))) =20 + +;;; A minimal version of libsoup used to prevent a cycle with Inkscape. +(define-public libsoup-minimal + (package + (inherit libsoup) + (name "libsoup-minimal") + (outputs (delete "doc" (package-outputs libsoup))) + (arguments + (substitute-keyword-arguments (package-arguments libsoup) + ((#:configure-flags configure-flags) + `(delete "-Dgtk_doc=3Dtrue" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'move-doc))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup)= )))) + (define-public libsecret (package (name "libsecret") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0003-gnu-Add-at-spi2-atk-minimal.patch Content-Transfer-Encoding: quoted-printable From=200c935e1d6c6ecafc625f08537fd43a4fc32c5036 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 23:18:17 -0500 Subject: [PATCH 03/14] gnu: Add at-spi2-atk-minimal. * gnu/packages/gtk.scm (at-spi2-atk-minimal): New variable. =2D-- gnu/packages/gtk.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f375ca9b82..822177afb1 100644 =2D-- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -24,6 +24,7 @@ ;;; Copyright =C2=A9 2019 Giacomo Leidi ;;; Copyright =C2=A9 2020 Brendan Tildesley ;;; Copyright =C2=A9 2020 Guillaume Le Vaillant +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -650,6 +651,24 @@ is part of the GNOME accessibility project.") (license license:lgpl2.0+) (home-page "https://projects.gnome.org/accessibility/"))) =20 +;;; A minimal variant used to prevent a cycle with Inkscape. +(define at-spi2-core-minimal + (package + (inherit at-spi2-core) + (name "at-spi2-core-minimal") + (outputs (delete "doc" (package-outputs at-spi2-core))) + (arguments + (substitute-keyword-arguments (package-arguments at-spi2-core) + ((#:configure-flags configure-flags) + `(delete "-Ddocs=3Dtrue" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'set-documentation-path) + (delete 'prepare-doc-directory) + (delete 'move-documentation))))) + (native-inputs + (alist-delete "gtk-doc" (package-native-inputs at-spi2-core))))) + (define-public at-spi2-atk (package (name "at-spi2-atk") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-at-spi2-atk-Use-at-spi2-core-minimal-to-break-a-.patch Content-Transfer-Encoding: quoted-printable From=20444a257bffe92af6cdc6c371f21a7a9cf2a11d98 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 23:19:09 -0500 Subject: [PATCH 04/14] gnu: at-spi2-atk: Use at-spi2-core-minimal to break a cycle. This breaks a cycle between Inkscape 1.0 and gtk+. * gnu/packages/gtk.scm (at-spi2-atk)[propagated-inputs]: Replace at-spi2-co= re by its minimal variant. =2D-- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 822177afb1..930cbf11d3 100644 =2D-- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -691,7 +691,7 @@ is part of the GNOME accessibility project.") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "meson" "test")))))) (propagated-inputs =2D `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc + `(("at-spi2-core" ,at-spi2-core-minimal))) ; required by atk-bridge-2.= 0.pc (inputs `(("atk" ,atk))) (native-inputs =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0005-gnu-Add-gdl.patch Content-Transfer-Encoding: quoted-printable From=20ea5b9fd34629b97e1ddbc8420bb04cd811eb6a17 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:24 -0500 Subject: [PATCH 05/14] gnu: Add gdl. * gnu/packages/gnome.scm (gdl): New variable. =2D-- gnu/packages/gnome.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f252fac978..6ce08f2f2d 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1489,6 +1489,53 @@ accessing key stores. It also provides the viewer f= or crypto files on the GNOME Desktop.") (license license:lgpl2.1+))) =20 +(define-public gdl + (package + (name "gdl") + (version "3.34.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gdl.git") + (commit (string-append "GDL_" (string-map (match-lambda + (#\. #\_) + (c c)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; The autogen.sh script in gnome-common will run ./configure + ;; by default, which is problematic because source shebangs + ;; have not yet been patched. + (setenv "NOCONFIGURE" "t") + (invoke "sh" "autogen.sh")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("gnome-common" ,gnome-common) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("which" ,which))) + (inputs + `(("libxml2" ,libxml2))) + (propagated-inputs + ;; The gdl-3.0.pc file 'Requires' GTK+. + `(("gtk+" ,gtk+))) + (home-page "https://gitlab.gnome.org/GNOME/gdl/") + (synopsis "GNOME docking library") + (description "This library provides docking features for gtk+.") + (license license:lgpl2.1+))) + (define-public libgnome-keyring (package (name "libgnome-keyring") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0006-gnu-Add-gdl-minimal.patch Content-Transfer-Encoding: quoted-printable From=2051b7cf2b908daf472d415a5417afd6e3e94f7e9e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:59 -0500 Subject: [PATCH 06/14] gnu: Add gdl-minimal. * gnu/packages/gnome.scm (gdl-minimal): New variable. =2D-- gnu/packages/gnome.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6ce08f2f2d..1c5148cbaf 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1536,6 +1536,27 @@ GNOME Desktop.") (description "This library provides docking features for gtk+.") (license license:lgpl2.1+))) =20 +;;; A minimal variant used to break a cycle with Inkscape. +(define-public gdl-minimal + (package + (inherit gdl) + (name "gdl-minimal") + (arguments + (substitute-keyword-arguments (package-arguments gdl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t)))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) + (define-public libgnome-keyring (package (name "libgnome-keyring") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0007-gnu-Add-lib2geom.patch Content-Transfer-Encoding: quoted-printable From=20b0bcda4147930348ff8c0321c062f8fca4d32b00 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jan 2020 23:20:31 -0500 Subject: [PATCH 07/14] gnu: Add lib2geom. * gnu/packages/graphics.scm (lib2geom): New variable. * gnu/packages/patches/lib2geom-enable-assertions.patch, lib2geom-link-tests-against-glib.patch, lib2geom-use-system-googletest.patch: New files. * gnu/local.mk (dist_patch_DATA): Register new patches. =2D-- gnu/local.mk | 5 +- gnu/packages/graphics.scm | 79 ++++++++++++++++ .../patches/lib2geom-enable-assertions.patch | 36 +++++++ .../lib2geom-link-tests-against-glib.patch | 34 +++++++ .../lib2geom-use-system-googletest.patch | 94 +++++++++++++++++++ 5 files changed, 247 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/lib2geom-enable-assertions.patch create mode 100644 gnu/packages/patches/lib2geom-link-tests-against-glib.p= atch create mode 100644 gnu/packages/patches/lib2geom-use-system-googletest.pat= ch diff --git a/gnu/local.mk b/gnu/local.mk index be02f93ec7..ba9f9728b2 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -19,7 +19,7 @@ # Copyright =C2=A9 2018 Amirouche Boubekki # Copyright =C2=A9 2018, 2019, 2020 Oleg Pykhalov # Copyright =C2=A9 2018 Stefan Stefanovi=C4=87 =2D# Copyright =C2=A9 2018 Maxim Cournoyer +# Copyright =C2=A9 2018, 2020 Maxim Cournoyer # Copyright =C2=A9 2019 Guillaume Le Vaillant # Copyright =C2=A9 2019 John Soo # Copyright =C2=A9 2019 Jonathan Brielmaier @@ -1150,6 +1150,9 @@ dist_patch_DATA =3D \ %D%/packages/patches/ldc-disable-phobos-tests.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ + %D%/packages/patches/lib2geom-enable-assertions.patch \ + %D%/packages/patches/lib2geom-link-tests-against-glib.patch \ + %D%/packages/patches/lib2geom-use-system-googletest.patch \ %D%/packages/patches/liba52-enable-pic.patch \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 16ab9d20a4..6f022e9d79 100644 =2D-- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,6 +21,7 @@ ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka ;;; Copyright =C2=A9 2020 Nicolas Goaziou ;;; Copyright =C2=A9 2020 Raghav Gururajan +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -328,6 +330,83 @@ quaternions and other useful 2D and 3D math functions.= Iex is an exception-handling library.") (license license:bsd-3))) =20 +(define-public lib2geom + ;; Use the latest master commit, as the 1.0 release suffer build problem= s. + (let ((revision "1") + (commit "42e119d94934a9514c61571cfb6b4af503ece082")) + (package + (name "lib2geom") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/inkscape/lib2geom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "195rs0kdbs8w62irha1nwy83bccz04wglmk578qrj1mky7fc4rjv")) + (patches + ;; Patch submitted to upstream (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17= ). + (search-patches "lib2geom-enable-assertions.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix py2geom module initialization (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests= /18). + (substitute* "src/py2geom/__init__.py" + (("_py2geom") "py2geom._py2geom")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%cmake-build-system-modules) + #:configure-flags '("-D2GEOM_BUILD_SHARED=3DON" + "-D2GEOM_BOOST_PYTHON=3DON" + ;; Compiling the Cython bindings fail (see: + ;; https://gitlab.com/inkscape/lib2geom/issue= s/21). + "-D2GEOM_CYTHON_BINDINGS=3DOFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-install-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((python-version (@ (guix build python-build-system) + python-version)) + (python-maj-min-version (python-version + (assoc-ref inputs "python")= )) + (site-package (string-append + (assoc-ref outputs "out") + "/lib/python" python-maj-min-version + "/site-packages"))) + (substitute* '("src/cython/CMakeLists.txt" + "src/py2geom/CMakeLists.txt") + (("PYTHON_LIB_INSTALL \"[^\"]*\"") + (format #f "PYTHON_LIB_INSTALL ~s" site-package)))) + #t))))) + (native-inputs `(("python" ,python-wrapper) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (inputs `(("cairo" ,cairo) + ("pycairo" ,python-pycairo) + ("double-conversion" ,double-conversion) + ("glib" ,glib) + ("gsl" ,gsl))) + (propagated-inputs + `(("boost" ,boost))) ;referred to in 2geom/pathvector.h. + (home-page "https://gitlab.com/inkscape/lib2geom/") + (synopsis "C++ 2D graphics library") + (description "2geom is a C++ library of mathematics for paths, curve= s, +and other geometric calculations. Designed for vector graphics, it tackles +B=C3=A9zier curves, conic sections, paths, intersections, transformations,= and +basic geometries.") + ;; The actual license differs from the advertised license, as linking + ;; with the GNU Scientif GSL is GPLv3+ means the whole must be licen= sed + ;; under a GPLv3+ compatible license, which the advertised LGPLv2.1+= or + ;; MPLv1.1 aren't (see: https://gitlab.com/inkscape/lib2geom/issues/3 + ;; and https://gitlab.com/inkscape/inkscape/issues/784). + (license license:gpl3+)))) + (define-public ogre (package (name "ogre") diff --git a/gnu/packages/patches/lib2geom-enable-assertions.patch b/gnu/pa= ckages/patches/lib2geom-enable-assertions.patch new file mode 100644 index 0000000000..8feb44acbf =2D-- /dev/null +++ b/gnu/packages/patches/lib2geom-enable-assertions.patch @@ -0,0 +1,36 @@ +From 4aa78f52232682b353eb15c219171e466987bac7 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Thu, 16 Jan 2020 00:19:29 -0500 +Subject: [PATCH] build: Enable assertions for the RelWithDebugInfo build t= ype. + +This fixes issue #5 (see: +https://gitlab.com/inkscape/lib2geom/issues/5). + +* CMakeLists.txt: Remove the "-DNDEBUG" CXX flag from the default +configuration for the RelWithDebugInfo build type. +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..a663a1b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,14 @@ enable_testing() +=20 + include(CheckCXXSourceCompiles) +=20 ++# Enable assertions for the RelWithDebugInfo build type. This is ++# useful as some tests make use of it (see: ++# https://gitlab.com/inkscape/lib2geom/issues/5). ++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") ++ string(REPLACE "-DNDEBUG" "" ++ CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ++endif() ++ + # Find dependencies + find_package(Boost 1.40 REQUIRED) + find_package(DoubleConversion REQUIRED) +--=20 +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-link-tests-against-glib.patch b/= gnu/packages/patches/lib2geom-link-tests-against-glib.patch new file mode 100644 index 0000000000..2b4f7ca6bf =2D-- /dev/null +++ b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch @@ -0,0 +1,34 @@ +From f95925afef451755fc1449e57fbfdc2e7277f4b4 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Sat, 11 Jan 2020 00:44:55 -0500 +Subject: [PATCH 1/3] tests: Link against GLib. + +This resolves an error about not finding when linking the +tests that make use of GLib. + +* src/tests/CMakeLists.txt[2GEOM_GTESTS_SRC]: Add the glib library to +the link target libraries. +--- + src/tests/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index 5ddf7f9c..626cfd87 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -32,8 +32,10 @@ sbasis-test +=20 + foreach(source ${2GEOM_GTESTS_SRC}) + add_executable(${source} ${source}.cpp) +- target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_= INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} = ${GTK3_LIBRARIES}) ++ target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ++ ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) ++ target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ++ ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach() +=20 +--=20 +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-use-system-googletest.patch b/gn= u/packages/patches/lib2geom-use-system-googletest.patch new file mode 100644 index 0000000000..16cce1799f =2D-- /dev/null +++ b/gnu/packages/patches/lib2geom-use-system-googletest.patch @@ -0,0 +1,94 @@ +From 6693b9c8ff1ae1ec02c9002c0a8f5f416f0c88f0 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Sun, 12 Jan 2020 23:23:33 -0500 +Subject: [PATCH 3/3] build: Prefer googletest from the system. + +Fixes issue #4. + +The build system now look for a system installed googletest or falls +back to the bundled copy of googletest otherwise. + +* CMakeLists.txt: Add call to find_package(GTest). +(include_directories): Remove "src/googletest/googletest/include" from +arg. +* src/CMakeLists.txt[NOT GTEST_FOUND]: Define the gtest and gtest_main +libraries when GTEST_FOUND is false. Globally include the googletest +headers here. Define aliases for the gtest and gtest_main libraries +that match those defined by the FindGTest module. +* src/tests/CMakeLists.txt: Replace references to gtest_main and gtest +by GTest::Main and GTest::GTest, respectively. +--- + CMakeLists.txt | 3 ++- + src/CMakeLists.txt | 15 +++++++++++---- + src/tests/CMakeLists.txt | 6 +++--- + 3 files changed, 16 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..96fbd58c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,13 +25,14 @@ find_package(DoubleConversion REQUIRED) + find_package(PkgConfig REQUIRED) + find_package(Cython) + find_package(Threads) ++find_package(GTest) + pkg_check_modules(GTK3 gtk+-3.0) + pkg_check_modules(GLIB glib-2.0) + pkg_check_modules(CAIRO cairo) + pkg_check_modules(GSL gsl) +=20 + # Add global include and link directories +-include_directories(src src/googletest/googletest/include ${CMAKE_CURRENT= _BINARY_DIR}) ++include_directories(src ${CMAKE_CURRENT_BINARY_DIR}) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/2geom) +=20 + check_cxx_source_compiles("#include \nint main() { double a=3D0.5= ,b=3D0.5,c=3D0.5; sincos(a, &b, &c); return 0; }" HAVE_SINCOS) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eefb3ac5..941dc4c7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,14 @@ +-add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) +-target_include_directories(gtest PRIVATE googletest/googletest) +-target_link_libraries(gtest Threads::Threads) +-add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) ++if(NOT GTEST_FOUND) ++ message("No system googletest library: using bundled copy.") ++ add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) ++ add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) ++ target_include_directories(gtest PRIVATE googletest/googletest) ++ target_link_libraries(gtest Threads::Threads) ++ include_directories(SYSTEM googletest/googletest/include) ++ # Aliases to share the same nomenclature with FindGTest. ++ add_library(GTest::GTest ALIAS gtest) ++ add_library(GTest::Main ALIAS gtest_main) ++endif() +=20 + add_subdirectory(2geom) + add_subdirectory(tests) +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index 626cfd87..3538f8cf 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -34,15 +34,15 @@ foreach(source ${2GEOM_GTESTS_SRC}) + add_executable(${source} ${source}.cpp) + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} +- ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) ++ target_link_libraries(${source} 2geom GTest::Main GTest::GTest ++ ${GSL_LIBRARIES} ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach() +=20 + foreach(source ${2GEOM_TESTS_SRC}) + add_executable(${source} ${source}.cpp) + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GT= K3_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest ${GSL_LIBRARIES} ${GTK3_L= IBRARIES}) ++ target_link_libraries(${source} 2geom GTest::GTest ${GSL_LIBRARIES} $= {GTK3_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach(source) +=20 +--=20 +2.24.1 + =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0008-gnu-plotutils-Build-libplotter.patch Content-Transfer-Encoding: quoted-printable From=20926c4b5def384fcdd03a7939a6765068fb0100e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jan 2020 23:13:46 -0500 Subject: [PATCH 08/14] gnu: plotutils: Build libplotter. * gnu/packages/plotutils.scm (plotutils)[origin]: Port the patch to a snipp= et, which catches all the problematic occurrences. [configure-flags]: Pass "--enable-libplotter". [description]: Mention the newly added C++ libplotter library. =2D-- gnu/local.mk | 1 - .../patches/plotutils-libpng-jmpbuf.patch | 23 ------------------ gnu/packages/plotutils.scm | 24 ++++++++++++------- 3 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/plotutils-libpng-jmpbuf.patch diff --git a/gnu/local.mk b/gnu/local.mk index ba9f9728b2..86efba5d2d 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1369,7 +1369,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ =2D %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/podofo-cmake-3.12.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ diff --git a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch b/gnu/packa= ges/patches/plotutils-libpng-jmpbuf.patch deleted file mode 100644 index 07ef60996c..0000000000 =2D-- a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch +++ /dev/null @@ -1,23 +0,0 @@ =2DUse the `png_jmpbuf' accessor, as recommended since libpng 1.4.0: =2Dhttp://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt . =2D =2D--- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200 =2D+++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200 =2D@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter * =2D } =2D=20 =2D /* cleanup after libpng errors (error handler does a longjmp) */ =2D- if (setjmp (png_ptr->jmpbuf)) =2D+ if (setjmp (png_jmpbuf (png_ptr))) =2D { =2D png_destroy_write_struct (&png_ptr, (png_info **)NULL); =2D return -1; =2D@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr =2D #endif =2D } =2D=20 =2D- longjmp (png_ptr->jmpbuf, 1); =2D+ longjmp (png_jmpbuf (png_ptr), 1); =2D } =2D=20 =2D static void=20 diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index a1e32eb398..15a310b5fe 100644 =2D-- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2015 Eric Bavier ;;; Copyright =C2=A9 2016, 2017, 2019, 2020 Nicolas Goaziou ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,6 @@ (sha256 (base32 "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg")) =2D (patches (search-patches "plotutils-libpng-jmpbuf.patch")) (modules '((guix build utils))) (snippet ;; Force the use of libXaw7 instead of libXaw. When not doi= ng @@ -67,22 +67,28 @@ (substitute* "configure" (("-lXaw") "-lXaw7")) + ;; Use the `png_jmpbuf' accessor, as recommended since li= bpng + ;; 1.4.0 (see: + ;; http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.= x-summary.txt). + (substitute* "libplot/z_write.c" + (("png_ptr->jmpbuf") + "png_jmpbuf (png_ptr)")) #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--enable-libplotter"))) (inputs `(("libpng" ,libpng) ("libx11" ,libx11) ("libxt" ,libxt) ("libxaw" ,libxaw))) =2D =2D (home-page =2D "https://www.gnu.org/software/plotutils/") + (home-page "https://www.gnu.org/software/plotutils/") (synopsis "Plotting utilities and library") (description =2D "GNU Plotutils is a package for plotting and working with 2D graphi= cs.=20 =2DIt includes a library, \"libplot\", for C and C++ for exporting 2D vector =2Dgraphics in many file formats. It also has support for 2D vector graphi= cs =2Danimations. The package also contains command-line programs for plotting =2Dscientific data.") + "GNU Plotutils is a package for plotting and working with 2D graphics. +It includes the C library @code{libplot} and the C++ @code{libplotter} lib= rary +for exporting 2D vector graphics in many file formats. It also has support +for 2D vector graphics animations. The package also contains command-line +programs for plotting scientific data.") (license license:gpl2+))) =20 (define-public guile-charting =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0009-gnu-Add-pstoedit.patch Content-Transfer-Encoding: quoted-printable From=206a8afe75604b2150ef1656f4d6e8fc884f8b437f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jan 2020 23:40:38 -0500 Subject: [PATCH 09/14] gnu: Add pstoedit. * gnu/packages/graphics.scm (pstoedit): New variable. =2D-- gnu/packages/graphics.scm | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6f022e9d79..777ad837b4 100644 =2D-- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages plotutils) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -407,6 +408,45 @@ basic geometries.") ;; and https://gitlab.com/inkscape/inkscape/issues/784). (license license:gpl3+)))) =20 +(define-public pstoedit + (package + (name "pstoedit") + (version "3.75") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" + version "/pstoedit-" version ".tar.gz")) + (sha256 + (base32 + "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("ghostscript" ,ghostscript) + ("imagemagick" ,imagemagick) + ("libplot" ,plotutils) + ("libjpeg" ,libjpeg-turbo) + ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to = link + (home-page "http://www.pstoedit.net/") + (synopsis "Converter for PostScript and PDF graphics") + (description "The @code{pstoedit} utility allows translating graphics +in the PostScript or PDF (Portable Document Format) formats to various +other vector formats such as: +@itemize +@item Tgif (.obj) +@item gnuplot +@item xfig (.fig) +@item Flattened PostScript +@item DXF, a CAD (Computed-Aided Design) exchange format +@item PIC (for troff/groff) +@item MetaPost (for usage with TeX/LaTeX) +@item LaTeX2e picture +@item GNU Metafile (for use with plotutils/libplot) +@item Any format supported by ImageMagick +@end itemize") + (license license:gpl2+))) + (define-public ogre (package (name "ogre") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0010-gnu-Add-autotrace.patch Content-Transfer-Encoding: quoted-printable From=20bcc629985280d9421d72d7e57b96c1f7202b5dec Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 25 Jan 2020 00:33:14 -0500 Subject: [PATCH 10/14] gnu: Add autotrace. * gnu/packages/graphics.scm (autotrace): New variable. =2D-- gnu/packages/graphics.scm | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 777ad837b4..208e2a521c 100644 =2D-- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -52,6 +53,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -146,6 +148,61 @@ objects!") (home-page "http://www.fox-toolkit.org") (license license:lgpl2.1+))) =20 +(define-public autotrace + (let ((commit "travis-20190624.59") + (version-base "0.40.0")) + (package + (name "autotrace") + (version (string-append version-base "-" + (if (string-prefix? "travis-" commit) + (string-drop commit 7) + commit))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/autotrace/autotrace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mk4yavy42dj0pszr1ggnggpvmzs4ds46caa9wr55cqsypn7bq6s"))= )) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; See: https://github.com/autotrace/autotrace/issues/= 27. + (add-after 'unpack 'include-spline.h-header + (lambda _ + (substitute* "Makefile.am" + ((".*src/types.h.*" all) + (string-append all "\t\tsrc/spline.h \\\n"))) + #t)) + ;; See: https://github.com/autotrace/autotrace/issues/= 26. + (replace 'check + (lambda _ + (invoke "sh" "tests/runtests.sh")))))) + (native-inputs + `(("which" ,which) + ("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("gettext" ,gettext-minimal))) + (inputs + `(("glib" ,glib) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("imagemagick" ,imagemagick) + ("pstoedit" ,pstoedit))) + (home-page "https://github.com/autotrace/autotrace") + (synopsis "Bitmap to vector graphics converter") + (description "AutoTrace is a utility for converting bitmap into vect= or +graphics. It can trace outlines and midlines, effect color reduction or +despeckling and has support for many input and output formats. It can be = used +with the @command{autotrace} utility or as a C library, @code{libautotrace= }.") + (license (list license:gpl2+ ;for the utility itself + license:lgpl2.1+))))) ;for use as a library + (define-public blender (package (name "blender") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0011-gnu-Add-drm-tools.patch Content-Transfer-Encoding: quoted-printable From=20f8773c2a7fa27b070d48ba04a726fa6f6f1fb2da Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Jan 2020 00:15:29 -0500 Subject: [PATCH 11/14] gnu: Add drm-tools. * gnu/packages/textutils.scm (drm-tools): New variable. =2D-- gnu/packages/textutils.scm | 106 +++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 62988ec574..8e74963b49 100644 =2D-- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -19,6 +19,7 @@ ;;; Copyright =C2=A9 2019 Yoshinori Arai ;;; Copyright =C2=A9 2019 M=C4=83d=C4=83lin Ionel Patra=C8=99cu ;;; Copyright =C2=A9 2019 Wiktor =C5=BBelazny +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -717,6 +719,110 @@ categories.") (license (list license:lgpl2.1 ; Main distribution. license:asl1.1)))) ; src/readdir.{c,h} =20 +(define-public drm-tools + (package + (name "drm-tools") + (version "1.1.32") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/drmtools/drm_tools= -" + version ".tar.gz")) + (sha256 + (base32 + "0nky82mm9rgsvw1xxw1nh0jz7r3k4l4b0wdqvynka0h1vn82wj91")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;the test suite fails + #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-install-prefixes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* "CMakeLists.txt" + (("tmp/testinstall") + (string-drop out 1)) + (("/man/man1") + "/share/man/man1")) + #t))) + (add-after 'unpack 'adjust-test-paths + (lambda _ + (substitute* '("test_extract_increment.sh" + "test_extract_features.sh" + "test_extract_features2.sh" + "test_dmath.sh") + (("\\./extract") "extract") + (("\\./dmath") "dmath") + (("/usr/local/bin/") "") + (("/bin/rm") "rm") + (("/bin/cp") "cp")) + #t)) + (delete 'check) + ;; The produced binaries are written directly to %output= /bin. + (delete 'install) + (add-after 'build 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (setenv "PATH" (string-append bin ":" + (getenv "PATH"))) + (with-directory-excursion + (format #f "../drm_tools-~a" ,version) + (invoke "sh" "test_all.sh"))))))))) + (native-inputs `(("which" ,which))) ;for tests + (inputs `(("pcre" ,pcre))) + (home-page "http://drmtools.sourceforge.net/") + (synopsis "Utilities to manipulate text and binary files") + (description "The drm_tools package contains the following commands: +@table @command +@item accudate +An extended version of the \"date\" program that has sub-second accuracy. +@item binformat +Format complex binary data into text. +@item binload +Load data into a binary file using simple commands from the input. +@item binorder +Sort, merge, search, retrieve or generate test data consisting of fixed si= ze +binary records. +@item binreplace +Find or find/replace in binary files. +@item binsplit +Split test data consisting of fixed size binary records into one or more +output streams. +@item chardiff +Find changes between two files at the character level. Unlike \"diff\", it +lists just the characters that differ, so if the 40,000th character is +different only that one character will be shown, not the entire line. +@item columnadd +Add columns of integers, decimals, and/or times. +@item datasniffer +A utility for formatting binary data dumps. +@item dmath +Double precision interactive command line math calculator. +@item extract +Extract and emit data from text files based on character or token position. +@item execinput +A utility that reads from STDIN and executes each line as a command in a +sub-process. +@item indexed_text +A utility for rapid retrieval of text by line numbers, in any order, from a +text file. +@item mdump +Format binary data. +@item msgqueue +Create message queues and send/receive messages. +@item mbin +@itemx mbout +Multiple buffer in and out. Used for buffering a lot of data between a sl= ow +device and a fast device. Mostly for buffering streaming tape drives for = use +with slower network connections, so that streaming is maintained as much as +possible to minimize wear on the tape device. +@item pockmark +Corrupt data streams - useful for testing error correction and data recove= ry. +@item tarsieve +Filter, list, or split a tar file. +@end table") + (license license:gpl2+))) + (define-public java-rsyntaxtextarea (package (name "java-rsyntaxtextarea") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0012-gnu-Add-libuemf.patch Content-Transfer-Encoding: quoted-printable From=20586c0ea29f3533e7b2cb558ecf1dfea82d12dfae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Jan 2020 01:21:24 -0500 Subject: [PATCH 12/14] gnu: Add libuemf. * gnu/packages/image.scm (libuemf): New variable. =2D-- gnu/packages/image.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c6fc26f9b8..d6afd96e3b 100644 =2D-- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,6 +25,7 @@ ;;; Copyright =C2=A9 2018 Rutger Helling ;;; Copyright =C2=A9 2020 Giacomo Leidi ;;; Copyright =C2=A9 2020 R Veera Kumar +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages textutils) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -856,6 +858,55 @@ compose, and analyze GIF images.") (home-page "http://giflib.sourceforge.net/") (license license:x11))) =20 +(define-public libuemf + (package + (name "libuemf") + (version "0.2.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libuemf/libUEMF-" + version ".tar.gz")) + (sha256 + (base32 + "05djs99vqf067x81xfpskh7a66y5x7b4mmjavybcy7swnm0swg7v")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Overriding CMAKE_INSTALL_PREFIX is not a good idea. + (add-after 'unpack 'fix-CMakeLists.txt + (lambda _ + (substitute* "CMakeLists.txt" + ((".*SET\\(CMAKE_INSTALL_PREFIX.*") "")) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (sources (string-append "../libUEMF-" ,version)) + (drm-tools (assoc-ref inputs "drm-tools")) + (extract (string-append drm-tools "/bin/extract")) + (execinput (string-append drm-tools "/bin/execinput"))) + (with-directory-excursion sources + (substitute* "testit.sh" + (("^EPATH=3D.*") + (format #f "EPATH=3D~a~%" bin)) + (("`which diff`") + "diff") + (("^EXTRACT=3D.*") + (format #f "EXTRACT=3D~a~%" extract)) + (("^EXECINPUT=3D.*") + (format #f "EXECINPUT=3D~a~%" execinput))) + (invoke "sh" "testit.sh")))))))) + (native-inputs `(("drm-tools" ,drm-tools))) ;for tests + (home-page "http://libuemf.sourceforge.net/") + (synopsis "Library for working with WFM, EMF and EMF+ images") + (description "The libUEMF library is a portable C99 implementation for +reading and writing @abbr{WFM, Windows Metafile}, @abbr{EMF, Enhanced +Metafile}, and @abbr{EMF+, Enhanced Metafile Plus} files.") + (license license:gpl2+))) + (define-public libungif (package (name "libungif") =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0013-gnu-inkscape-Update-to-1.0.patch Content-Transfer-Encoding: quoted-printable From=2070e1a1e89145b99aab6ba118da23a996af445107 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jan 2020 16:37:44 -0500 Subject: [PATCH 13/14] gnu: inkscape: Update to 1.0. * gnu/packages/inkscape.scm (inkscape)[version]: Update to 1.0. [origin]: Remove the obsolete Poppler patch. Add a macro to remove bundled libraries where possible. [inputs]: Upgrade gtk+-2 and gtkmm-2 to their current version. Add autotra= ce, gdl-minimal, lib2geom, libjpeg and libsoup. Upgrade python-2 to its current version, and move it... [native-inputs]: ...here. Add imagemagick and googletest. [arguments]: Enable tests, specifying the test target as "check". Move the check phase after the install phase. Remove the obsoleted adjust-for-new-poppler phase. Add a set-home phase to quiet Inkscape warnings. Add a disable-latex-export-tests phase to skip failing tests. [license]: Change to GPLv3+, although upstream says GPLv2+, due to an unresolved license incompatibility when building with the external lib2geom library. * gnu/packages/patches/inkscape-poppler-0.76.patch: Delete file. * gnu/local.mk: Unregister it. =2D-- gnu/local.mk | 1 - gnu/packages/inkscape.scm | 187 ++++++++++++++---- .../patches/inkscape-poppler-0.76.patch | 36 ---- 3 files changed, 148 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/inkscape-poppler-0.76.patch diff --git a/gnu/local.mk b/gnu/local.mk index 86efba5d2d..da8ac7c130 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1089,7 +1089,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-openexr-pkg-config.patch \ %D%/packages/patches/inetutils-hurd.patch \ =2D %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 26d4642547..803f58a8cb 100644 =2D-- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2016, 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2017, 2020 Marius Bakke ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,8 +31,12 @@ #:use-module (gnu packages aspell) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) @@ -46,64 +51,168 @@ (define-public inkscape (package (name "inkscape") =2D (version "0.92.4") =2D (source (origin =2D (method url-fetch) =2D (uri (string-append "https://media.inkscape.org/dl/" =2D "resources/file/" =2D "inkscape-" version ".tar.bz2")) =2D (patches (search-patches "inkscape-poppler-0.76.patch")) =2D (sha256 =2D (base32 =2D "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p"))= )) + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.inkscape.org/dl/" + "resources/file/" + "inkscape-" version ".tar.xz")) + (sha256 + (base32 + "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9")) + (modules '((guix build utils) + (ice-9 format))) + (snippet + '(begin + (let-syntax + ;; XXX: The build system doesn't currently support using + ;; system libraries over bundled ones (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876). + ((unbundle + (syntax-rules () + ((_ (name source-dir use-pkg-config?) ...) + (begin + ;; Delete bundled source directories. + (delete-file-recursively source-dir) ... + (substitute* '("src/CMakeLists.txt" + "src/3rdparty/CMakeLists.txt") + (((string-append ".*add_subdirectory\\(" + (basename source-dir) "\\).*")) + "") ...) + ;; Remove bundled entries from INKSCAPE_TARGET_LIBS. + (substitute* "src/CMakeLists.txt" + (((string-append name "_LIB.*")) "") ...) + ;; Register the external libraries, so that their + ;; headers are added to INKSCAPE_INCS_SYS and their + ;; shared libraries added to INKSCAPE_LIBS. + (if use-pkg-config? + (let* ((width (string-length "pkg_check_modules(= ")) + (indent (string-join (make-list width " "= ) ""))) + (substitute* "CMakeScripts/DefineDependsandFla= gs.cmake" + (("^pkg_check_modules\\(INKSCAPE_DEP REQUIRE= D.*" start) + (string-append start + (format #f "~a~a~%" indent n= ame))))) + (substitute* "CMakeScripts/DefineDependsandFlags= .cmake" + (("^find_package\\(Iconv REQUIRED\\).*" start) + (string-append (format #f " +find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h) +if(NOT ~:*~a_INCLUDE_DIR) + message(FATAL_ERROR \"~:*~a headers not found\") +else() + list(APPEND INKSCAPE_INCS_SYS ${~:*~a_INCLUDE_DIR}) +endif() + +find_library(~:*~a_LIB NAMES ~:*~a) +if(NOT ~:*~a_LIB) + message(FATAL_ERROR \"~:*~a library not found\") +else() + list(APPEND INKSCAPE_LIBS ~:*~a_LIB) +endif()~%~%" + name) + start)))) ... + ;; Fix the references to the headers of the + ;; unbundled libraries. + (substitute* (find-files "." "\\.h$|\\.cpp$") + (((string-append "#include (\"|<)3rdparty/" + (basename source-dir)) _ quote) + (string-append "#include " quote + (basename source-dir))) + ...)))))) + (unbundle ("2geom" "src/2geom" #t) + ;; libcroco cannot be unbundled as it is heavily + ;; modified (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876#= note_276114904). + ;; ("croco" "src/3rdparty/libcroco" #t) + ;; FIXME: Unbundle the following libraries once they + ;; have been packaged. + ;; ("cola" "src/3rdparty/adaptagrams/libcola") + ;; ("avoid" "src/3rdparty/adaptagrams/libavoid") + ;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc") + ;; libuemf cannot be unbundled as it slightly modif= ied + ;; from upstream (see: + ;; https://gitlab.com/inkscape/inkscape/issues/973). + ;; ("uemf" "src/3rdparty/libuemf" #f) + ;; FIXME: libdepixelize upstream is ancient and doe= sn't + ;; build with a recent lib2geom + ;; (see: https://bugs.launchpad.net/libdepixelize/+= bug/1862458). + ;;("depixelize" "src/3rdparty/libdepixelize") + ("autotrace" "src/3rdparty/autotrace" #t))) + ;; Lift the requirement on the double-conversion library, as + ;; it is only needed by lib2geom, which is now unbundled. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + ((".*find_package\\(DoubleConversion.*") "")) + #t)))) (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:test-target "check" ;otherwise some test binaries are = missing + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")) + #t)) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)) + (format #t "ARGS is set to: ~a" (getenv "ARGS")) + #t)) + ;; Move the check phase after the install phase, as when run in t= he + ;; tests, Inkscape relies on files that are not yet installed, su= ch + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) (inputs `(("aspell" ,aspell) =2D ("gtkmm" ,gtkmm-2) =2D ("gtk" ,gtk+-2) + ("autotrace" ,autotrace) + ("gdl" ,gdl-minimal) + ("gtkmm" ,gtkmm) + ("gtk" ,gtk+) ("gsl" ,gsl) ("poppler" ,poppler) + ;;("libcroco" ,libcroco) ;see comment in origin snippet above + ("lib2geom" ,lib2geom) + ;; ("libdepixelize" ,libdepixelize) ;build is currently broken + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) + ;;("libuemf" ,libuemf) ;see comment in origin snippet above ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libgc" ,libgc) + ("libsoup" ,libsoup-minimal) ("freetype" ,freetype) ("popt" ,popt) ("potrace" ,potrace) =2D ("python" ,python-2) ("lcms" ,lcms) ("boost" ,boost))) (native-inputs =2D `(("intltool" ,intltool) + `(("imagemagick" ,imagemagick) ;for tests + ("intltool" ,intltool) ("glib" ,glib "bin") + ("googletest" ,googletest) ("perl" ,perl) =2D ("pkg-config" ,pkg-config))) =2D ;; FIXME: tests require gmock =2D (arguments =2D `(#:tests? #f =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'patch-icon-cache-generator =2D (lambda _ =2D (substitute* "share/icons/application/CMakeLists.txt" =2D (("gtk-update-icon-cache") "true")) =2D #t)) =2D (add-after 'unpack 'adjust-for-new-poppler =2D (lambda _ =2D (substitute* (find-files "src/extension/internal/pdfinput") =2D ;; Needed for Poppler 0.82. =2D (("Unicode \\*u") "Unicode const *u") =2D ;; Needed for Poppler 0.83. =2D (("\\(GfxPath") "(const GfxPath") =2D (("GfxSubpath") "const GfxSubpath") =2D (("new GlobalParams\\(\\)") =2D "std::unique_ptr(new GlobalParams())") =2D (("new GlobalParams\\(poppler_datadir\\)") =2D "std::unique_ptr(new GlobalParams(poppler_= datadir))")) =2D #t))))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") (description "Inkscape is a vector graphics editor. What sets Inkscape apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C stand= ard, as the native format.") =2D (license license:gpl2+))) + ;; The external, unbundled lib2geom library effective license is GPLv3= +, + ;; given it links against the GNU Scientific Library, which in turn me= ans + ;; that the license of Inkscape should also be GPLv3+, when built this= way + ;; (see: https://gitlab.com/inkscape/inkscape/issues/784). + (license license:gpl3+))) diff --git a/gnu/packages/patches/inkscape-poppler-0.76.patch b/gnu/package= s/patches/inkscape-poppler-0.76.patch deleted file mode 100644 index 08e8303892..0000000000 =2D-- a/gnu/packages/patches/inkscape-poppler-0.76.patch +++ /dev/null @@ -1,36 +0,0 @@ =2DThis patch adds support for Poppler 0.76 and later. =2D =2DTaken from upstream: =2D =2D =2Ddiff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extens= ion/internal/pdfinput/pdf-parser.cpp =2Dindex 8484984bdf..4f798e35bf 100644 =2D--- a/src/extension/internal/pdfinput/pdf-parser.cpp =2D+++ b/src/extension/internal/pdfinput/pdf-parser.cpp =2D@@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { =2D error(errInternal, -1, "Weird page contents"); =2D return; =2D } =2D- parser =3D new Parser(xref, new Lexer(xref, obj), gFalse); =2D+ parser =3D new _POPPLER_NEW_PARSER(xref, obj); =2D go(topLevel); =2D delete parser; =2D parser =3D nullptr; =2Ddiff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/= src/extension/internal/pdfinput/poppler-transition-api.h =2Dindex 61a15083a0..5e8bc4ae90 100644 =2D--- a/src/extension/internal/pdfinput/poppler-transition-api.h =2D+++ b/src/extension/internal/pdfinput/poppler-transition-api.h =2D@@ -14,6 +14,13 @@ =2D=20 =2D #include =2D=20 =2D+#if POPPLER_CHECK_VERSION(0, 76, 0) =2D+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) =2D+#else =2D+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj= ), gFalse) =2D+#endif =2D+ =2D+ =2D #if POPPLER_CHECK_VERSION(0, 72, 0) =2D #define getCString c_str =2D #endif =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0014-gnu-WIP-Add-libdepixelize.patch Content-Transfer-Encoding: quoted-printable From=203853fb03cbd15ab84a6744cb8f65231e5702b0e1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 6 Feb 2020 00:13:06 -0500 Subject: [PATCH 14/14] gnu: WIP: Add libdepixelize. WIP: This currently fails to build. We need to figure out which ancient version of lib2geom it needs to link against. * gnu/packages/graphics.scm (libdepixelize): New variable. =2D-- gnu/packages/graphics.scm | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 208e2a521c..d27440dfea 100644 =2D-- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages plotutils) + #:use-module (gnu packages popt) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -87,6 +88,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix bzr-download) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) @@ -465,6 +467,71 @@ basic geometries.") ;; and https://gitlab.com/inkscape/inkscape/issues/784). (license license:gpl3+)))) =20 +;;; This older version of 2geom is used by libpixelize. +(define-public lib2geom-0.9 + (package + (inherit lib2geom) + (name "lib2geom") + (version "0.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/inkscape/lib2geom.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zfb9mkggn36pxyp04z67dvj7r0vqfdw8yy2a41zg7rlcw5v6v67")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/googletest") + ;; Fix py2geom module initialization (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/1= 8). + (substitute* "src/py2geom/__init__.py" + (("_py2geom") "py2geom._py2geom")) + ;; Disable toys and tests, as they cause build issues. + (substitute* "src/CMakeLists.txt" + ((".*ADD_SUBDIRECTORY \\(.*tests\\).*") "") + ((".*ADD_SUBDIRECTORY \\(toys\\).*") "") + ((".*gtest.*") "")) + #t)))))) + +(define-public libdepixelize + (let ((revision "187") ;no tags or official releases + (guix-revision "1")) + (package + (name "libdepixelize") + (version (string-append "0.0.0-" guix-revision "." revision)) + (source (origin + (method bzr-fetch) + (uri (bzr-reference + (url (string-append "lp:" name)) + (revision revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "19znvam2d2bya05d9sxcj37lnrnvj9c0403aa2p5fv60985xi5b9"))= )) + (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "src/priv/splines-kopf2011.h" + ((".*dest\\.pathVector\\.reserve.*") "")) + #t))))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("gtkmm" ,gtkmm-2) + ("lib2geom" ,lib2geom-0.9) + ("popt" ,popt))) + (home-page "https://launchpad.net/libdepixelize") + (synopsis "C++ library for vectorizing raster graphics") + (description "Depixelize is a library (and utility) for converting +raster graphics into vector graphics. It implements the algorithm describ= ed in +@url{https://johanneskopf.de/publications/pixelart/paper/pixel.pdf,Depixel= izing +Pixel Art}.") + (license (list license:gpl2+ license:lgpl2.1+))))) ;dual licensed + (define-public pstoedit (package (name "pstoedit") =2D-=20 2.26.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAl6zfx8ACgkQEmDkZILm NWLc0A//ZDZ+YduzLAjCWowCdfbZafXyRshib0PddSFPy3D9vKthyTt3v4QDuaqj MxQ+KZKdpCP/Um374SjOt/mq95AiY0o7/geEnDXiE25S896Hu74pUja5+f4ssKyz sRFxZcr0Cba7+tTsZE9fpdsj6hAFIpAosYocIA8y+pgKcPlSeLkUmDJREE0NQ2ga yFlrhqEDjo5DFjW70RaJ+Hvca89wtLCWjA0GJ3SIV2bPJZRt9EvFt6edeKlnfU7M 5aajlLXslXAm1p3KvoKUQkCH2ZRQZmVG5ezt5JLscuh86HnBXYM0P+qg5ytilB6i ax0PAe4c+880KxPZkS4euM29Y8Yz0ZZYv02g0z/GQuIb+WB79KMkrQ1LXKEYdTqJ Fe3YT/qd2uK/d9usocVQcS+Lm1b1aQQcHopFB+ZqUAhxDAqKKg7wA5lBaOF8NdIg olF+h5NrBn95Vto9nF9SpNwNQYEplpN+GFd0mD8rNmSI/vxFZsayK9gwHFynVn4c C09LQB0gN85gdUoIt7Yqlx5VovoKh7QuSq1wZLDbwgZdKdc3IQSVVL215Zu7Z+NO bS/kWa9Qi7fJlz6Nqf39wwEBBNfjw+NKMfbO1T0KQ7TTot7Y9v1n/5pWggwfMbKY kqld0S1glzJEJIRKQMKBuz53y3mGLSCLWv6V19jh55pgnqGWuJM= =5G1p -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 00:38:04 2020 Received: (at 41118) by debbugs.gnu.org; 7 May 2020 04:38:04 +0000 Received: from localhost ([127.0.0.1]:41784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWYIH-00010e-Lu for submit@debbugs.gnu.org; Thu, 07 May 2020 00:38:04 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:43672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWYIC-00010N-KL for 41118@debbugs.gnu.org; Thu, 07 May 2020 00:37:56 -0400 Received: by mail-qt1-f196.google.com with SMTP id z90so3647346qtd.10 for <41118@debbugs.gnu.org>; Wed, 06 May 2020 21:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version; bh=286yCoK8vz7RViuZgVhs/Tc5r5A3PgKSs+l0UeNSojk=; b=a+L50gLrvc5ZSH4HrxoElRF0Tmu+4jsUxaMecF1vUs97UbLtlThzRwiDloiPDYRmfN ajEyk4zWUG0+IifaNXY2dGnkn5098e1tpL0aB0kLHPEfM8iUKq5Kcb8k495+Zl3roi+a VzoP9ekDykcoRjY92hNAvBGcKUBKQnXfabyOBWOEND/6BnvXYsgc1oWfdRuegODpt/22 IsLs5rw9/vya51wRbofXHRz1RHO5VLuT8dcB8kX2x9mFwnAxBEXHxF6BMhwLtL4r1XSn o6h41xZP25p6LW5uWOT5+rNCq8/mBZwdOCcEW8aGfVNXmUrL9usTIrw/HwNE/Q1EdKyT 1Hkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version; bh=286yCoK8vz7RViuZgVhs/Tc5r5A3PgKSs+l0UeNSojk=; b=sEnT7e6RFAYJwYNC+nXF+LGEnxVk16qrXkgM6vE9UJNEfV33UWKlQBQyjxtDKd3isv hcK8QZjikwfy41UPgKUuQ+eW7B221aWJKLRN0UwWXW6E4iZvjV5euNPUA5QeRKYQiWE5 MIIbBw5Apj0S80izadYvmIRqgOCOYqphqrHTvvl3s9uLEzHXAe82eFuNcRMLa/mvGQyY mZAmY5qqZSE4WrQKRbQ2HOyTVU4ax0lhnrl9eC0CvWT446xgTl9/0zPHfuNsZADIAXrc CaKfl+VKumBOBPIOLNCqny3JYdo2qHgsBMJJ0D0PRSIHhHnT1flZAwL5Ud80S1UgLGn+ hZSA== X-Gm-Message-State: AGi0PuZ53gqZXPBr/NRD+azcC6cbXMtmZ/UxvJqF653hvKlUlBAVzn5b /nRF+t9990ZldyuCPynKVXt80PNK X-Google-Smtp-Source: APiQypLAxNsT6oSKw0oJd/yQzLucrnPKHaaIpb1yw/ECrM/VlmJOKldWvtph591xGz0b+4fanu26hg== X-Received: by 2002:ac8:1a85:: with SMTP id x5mr11910209qtj.302.1588826267069; Wed, 06 May 2020 21:37:47 -0700 (PDT) Received: from hurd (dsl-236-123-224.b2b2c.ca. [207.236.123.224]) by smtp.gmail.com with ESMTPSA id u190sm3293575qkb.102.2020.05.06.21.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 21:37:45 -0700 (PDT) From: Maxim Cournoyer To: 41118@debbugs.gnu.org Subject: Re: [bug#41118] [PATCH V2] gnu: inkscape: Update to 1.0. In-Reply-To: <87y2q41l9d.fsf@gmail.com> (Maxim Cournoyer's message of "Wed, 06 May 2020 23:23:10 -0400") References: <87y2q41l9d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) Date: Thu, 07 May 2020 00:37:35 -0400 Message-ID: <87wo5oz7g0.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41118 Cc: Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi again, Here's a v2 for the Inkscape 1.0 patch. It adds a couple optional dependencies that are nice to have. Thanks to Nicol=C3=B2 Balzarotti who shared another Inkscape 1.0 patch on guix-devel. Maxim --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0013_V2-gnu-inkscape-Update-to-1.0.patch Content-Transfer-Encoding: quoted-printable >From 30e39891c1e502bc325ce3d853d91238f5f61ca7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jan 2020 16:37:44 -0500 Subject: [PATCH] gnu: inkscape: Update to 1.0. * gnu/packages/inkscape.scm (inkscape)[version]: Update to 1.0. [origin]: Remove the obsolete Poppler patch. Add a macro to remove bundled libraries where possible. [inputs]: Upgrade gtk+-2 and gtkmm-2 to their current version. Add autotra= ce, gdl-minimal, lib2geom, libjpeg, libsoup, gtkspell3, libcdr, libwpd, libwpg = and libvisio. Upgrade python-2 to its current version, and move it... [native-inputs]: ...here. Add imagemagick and googletest. [arguments]: Enable tests, specifying the test target as "check". Move the check phase after the install phase. Remove the obsoleted adjust-for-new-poppler phase. Add a set-home phase to quiet Inkscape warnings. Add a disable-latex-export-tests phase to skip failing tests. [license]: Change to GPLv3+, although upstream says GPLv2+, due to an unresolved license incompatibility when building with the external lib2geom library. * gnu/packages/patches/inkscape-poppler-0.76.patch: Delete file. * gnu/local.mk: Unregister it. --- gnu/local.mk | 1 - gnu/packages/inkscape.scm | 193 ++++++++++++++---- .../patches/inkscape-poppler-0.76.patch | 36 ---- 3 files changed, 154 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/inkscape-poppler-0.76.patch diff --git a/gnu/local.mk b/gnu/local.mk index 86efba5d2d..da8ac7c130 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1089,7 +1089,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/ilmbase-openexr-pkg-config.patch \ %D%/packages/patches/inetutils-hurd.patch \ - %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 26d4642547..65d6e5687b 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2016, 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2017, 2020 Marius Bakke ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,8 +31,13 @@ #:use-module (gnu packages aspell) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) @@ -46,64 +52,173 @@ (define-public inkscape (package (name "inkscape") - (version "0.92.4") - (source (origin - (method url-fetch) - (uri (string-append "https://media.inkscape.org/dl/" - "resources/file/" - "inkscape-" version ".tar.bz2")) - (patches (search-patches "inkscape-poppler-0.76.patch")) - (sha256 - (base32 - "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p")))) + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.inkscape.org/dl/" + "resources/file/" + "inkscape-" version ".tar.xz")) + (sha256 + (base32 + "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9")) + (modules '((guix build utils) + (ice-9 format))) + (snippet + '(begin + (let-syntax + ;; XXX: The build system doesn't currently support using + ;; system libraries over bundled ones (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876). + ((unbundle + (syntax-rules () + ((_ (name source-dir use-pkg-config?) ...) + (begin + ;; Delete bundled source directories. + (delete-file-recursively source-dir) ... + (substitute* '("src/CMakeLists.txt" + "src/3rdparty/CMakeLists.txt") + (((string-append ".*add_subdirectory\\(" + (basename source-dir) "\\).*")) + "") ...) + ;; Remove bundled entries from INKSCAPE_TARGET_LIBS. + (substitute* "src/CMakeLists.txt" + (((string-append name "_LIB.*")) "") ...) + ;; Register the external libraries, so that their + ;; headers are added to INKSCAPE_INCS_SYS and their + ;; shared libraries added to INKSCAPE_LIBS. + (if use-pkg-config? + (let* ((width (string-length "pkg_check_modules(= ")) + (indent (string-join (make-list width " "= ) ""))) + (substitute* "CMakeScripts/DefineDependsandFla= gs.cmake" + (("^pkg_check_modules\\(INKSCAPE_DEP REQUIRE= D.*" start) + (string-append start + (format #f "~a~a~%" indent n= ame))))) + (substitute* "CMakeScripts/DefineDependsandFlags= .cmake" + (("^find_package\\(Iconv REQUIRED\\).*" start) + (string-append (format #f " +find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h) +if(NOT ~:*~a_INCLUDE_DIR) + message(FATAL_ERROR \"~:*~a headers not found\") +else() + list(APPEND INKSCAPE_INCS_SYS ${~:*~a_INCLUDE_DIR}) +endif() + +find_library(~:*~a_LIB NAMES ~:*~a) +if(NOT ~:*~a_LIB) + message(FATAL_ERROR \"~:*~a library not found\") +else() + list(APPEND INKSCAPE_LIBS ~:*~a_LIB) +endif()~%~%" + name) + start)))) ... + ;; Fix the references to the headers of the + ;; unbundled libraries. + (substitute* (find-files "." "\\.h$|\\.cpp$") + (((string-append "#include (\"|<)3rdparty/" + (basename source-dir)) _ quote) + (string-append "#include " quote + (basename source-dir))) + ...)))))) + (unbundle ("2geom" "src/2geom" #t) + ;; libcroco cannot be unbundled as it is heavily + ;; modified (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876#= note_276114904). + ;; ("croco" "src/3rdparty/libcroco" #t) + ;; FIXME: Unbundle the following libraries once they + ;; have been packaged. + ;; ("cola" "src/3rdparty/adaptagrams/libcola") + ;; ("avoid" "src/3rdparty/adaptagrams/libavoid") + ;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc") + ;; libuemf cannot be unbundled as it slightly modif= ied + ;; from upstream (see: + ;; https://gitlab.com/inkscape/inkscape/issues/973). + ;; ("uemf" "src/3rdparty/libuemf" #f) + ;; FIXME: libdepixelize upstream is ancient and doe= sn't + ;; build with a recent lib2geom + ;; (see: https://bugs.launchpad.net/libdepixelize/+= bug/1862458). + ;;("depixelize" "src/3rdparty/libdepixelize") + ("autotrace" "src/3rdparty/autotrace" #t))) + ;; Lift the requirement on the double-conversion library, as + ;; it is only needed by lib2geom, which is now unbundled. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + ((".*find_package\\(DoubleConversion.*") "")) + #t)))) (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:test-target "check" ;otherwise some test binaries are = missing + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")) + #t)) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)) + (format #t "ARGS is set to: ~a" (getenv "ARGS")) + #t)) + ;; Move the check phase after the install phase, as when run in t= he + ;; tests, Inkscape relies on files that are not yet installed, su= ch + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) (inputs `(("aspell" ,aspell) - ("gtkmm" ,gtkmm-2) - ("gtk" ,gtk+-2) + ("autotrace" ,autotrace) + ("gdl" ,gdl-minimal) + ("gtkmm" ,gtkmm) + ("gtk" ,gtk+) + ("gtkspell3" ,gtkspell3) ("gsl" ,gsl) ("poppler" ,poppler) + ;;("libcroco" ,libcroco) ;see comment in origin snippet above + ("lib2geom" ,lib2geom) + ;; ("libdepixelize" ,libdepixelize) ;build is currently broken + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) + ;;("libuemf" ,libuemf) ;see comment in origin snippet above ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libgc" ,libgc) + ("libsoup" ,libsoup-minimal) + ("libcdr" ,libcdr) + ("libvisio" ,libvisio) + ("libwpd" ,libwpd) + ("libwpg" ,libwpg) ("freetype" ,freetype) ("popt" ,popt) ("potrace" ,potrace) - ("python" ,python-2) ("lcms" ,lcms) ("boost" ,boost))) (native-inputs - `(("intltool" ,intltool) + `(("imagemagick" ,imagemagick) ;for tests + ("intltool" ,intltool) ("glib" ,glib "bin") + ("googletest" ,googletest) ("perl" ,perl) - ("pkg-config" ,pkg-config))) - ;; FIXME: tests require gmock - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-icon-cache-generator - (lambda _ - (substitute* "share/icons/application/CMakeLists.txt" - (("gtk-update-icon-cache") "true")) - #t)) - (add-after 'unpack 'adjust-for-new-poppler - (lambda _ - (substitute* (find-files "src/extension/internal/pdfinput") - ;; Needed for Poppler 0.82. - (("Unicode \\*u") "Unicode const *u") - ;; Needed for Poppler 0.83. - (("\\(GfxPath") "(const GfxPath") - (("GfxSubpath") "const GfxSubpath") - (("new GlobalParams\\(\\)") - "std::unique_ptr(new GlobalParams())") - (("new GlobalParams\\(poppler_datadir\\)") - "std::unique_ptr(new GlobalParams(poppler_da= tadir))")) - #t))))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") (description "Inkscape is a vector graphics editor. What sets Inkscape apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C stand= ard, as the native format.") - (license license:gpl2+))) + ;; The external, unbundled lib2geom library effective license is GPLv3= +, + ;; given it links against the GNU Scientific Library, which in turn me= ans + ;; that the license of Inkscape should also be GPLv3+, when built this= way + ;; (see: https://gitlab.com/inkscape/inkscape/issues/784). + (license license:gpl3+))) diff --git a/gnu/packages/patches/inkscape-poppler-0.76.patch b/gnu/package= s/patches/inkscape-poppler-0.76.patch deleted file mode 100644 index 08e8303892..0000000000 --- a/gnu/packages/patches/inkscape-poppler-0.76.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch adds support for Poppler 0.76 and later. - -Taken from upstream: - - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extensio= n/internal/pdfinput/pdf-parser.cpp -index 8484984bdf..4f798e35bf 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - error(errInternal, -1, "Weird page contents"); - return; - } -- parser =3D new Parser(xref, new Lexer(xref, obj), gFalse); -+ parser =3D new _POPPLER_NEW_PARSER(xref, obj); - go(topLevel); - delete parser; - parser =3D nullptr; -diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/sr= c/extension/internal/pdfinput/poppler-transition-api.h -index 61a15083a0..5e8bc4ae90 100644 ---- a/src/extension/internal/pdfinput/poppler-transition-api.h -+++ b/src/extension/internal/pdfinput/poppler-transition-api.h -@@ -14,6 +14,13 @@ -=20 - #include -=20 -+#if POPPLER_CHECK_VERSION(0, 76, 0) -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) -+#else -+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj),= gFalse) -+#endif -+ -+ - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str - #endif --=20 2.26.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 11:20:31 2020 Received: (at 41118) by debbugs.gnu.org; 7 May 2020 15:20:31 +0000 Received: from localhost ([127.0.0.1]:43738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWiK6-0002Nd-Us for submit@debbugs.gnu.org; Thu, 07 May 2020 11:20:31 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWiK4-0002NK-Nd for 41118@debbugs.gnu.org; Thu, 07 May 2020 11:20:29 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 1AE915C01CA; Thu, 7 May 2020 11:20:23 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 07 May 2020 11:20:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=/TJFvTiJJfrl7TOYRZhQnO64 AKg84LjGxgajE8kkNKM=; b=Ae/kxIKenyBWaW0Dhv5/1FkfHDQx+GyvD56Joji9 RFUxoJarzdgMRO/LU/op+1VNNy1zPo2lUYYfuF4gVhH2l72L9wPoCEGVLbL9yc+e Ij/W9S7CPK+WpmuAvw06nCN6KDzkUfcvfUZuLU0e2Ni5ma4dPdoxEX1LP+UqxeJT 2Vo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm2; bh=/TJFvT iJJfrl7TOYRZhQnO64AKg84LjGxgajE8kkNKM=; b=HqvV3dq25lRqfZgUy60loL s1RKKtEFR1E0dBbDtECYIJOO2RhrTK/0hil4Wg1UhCqjtKDvqEcmZePUIG1oc5Bj xy4g81icsf7xCBdmFlBdVz9j3IMtjGjsHwZclQTQ054lFx/OWKEijw+03hbTbv8+ sTDrPfP4D6zeC91LJSm+QuMGVX9N18wXzF7FHcSw9lMB2R0Lcr4OQUhIFZDSnAyU 1E6eR8QFsNtU/7euZzAhSUl8phJiPnmvawjO7OEHtPHWOfLOHXnmPT1VFcLR2LhI xtTeiLeczxyCpNLbfEoK9cPGkhyUSf+TCWI/luGMOC3QywxXwR901LSqBjd0vv8A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrkedtgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepudfghfffhedtleelgfdttdfhhfeiuefhjeefveevleeiieefieeileeujeeggfff necuffhomhgrihhnpehgihhtlhgrsgdrtghomhenucfkphepjeeirdduvdegrddufeekrd eifeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehl vghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id BC269328005E; Thu, 7 May 2020 11:20:22 -0400 (EDT) Date: Thu, 7 May 2020 11:20:20 -0400 From: Leo Famulari To: Maxim Cournoyer Subject: Re: [PATCH] gnu: inkscape: Update to 1.0. Message-ID: <20200507152020.GA16387@jasmine.lan> References: <87y2q41l9d.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Dxnq1zWXvFF0Q93v" Content-Disposition: inline In-Reply-To: <87y2q41l9d.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Dxnq1zWXvFF0Q93v Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, May 06, 2020 at 11:23:10PM -0400, Maxim Cournoyer wrote: > The following updates Inkscape to its 1.0 version. The test suite is > enabled and an effort is made to unbundle as much of 3rd party libraries > as possible (but more can be done, if you'd like to help: see the > comments in the patch). >=20 > The last patch of the series (Add libdepixelize) is added as a WIP, and > is included as a curiosity only (not intended to be merged in its > current state). Thanks! Too bad about the licensing issues... it seems like it might be a while before they are resolved upstream. I think it's not totally correct to say that the license of lib2geom is effectively GPL3+. Only the copyright-holders of lib2geom can say that, right? The licenses are effectively incoherent and I'd say the software is not something we have the right to distribute :/ I'm no expert, however. I did notice that Inkscape's COPYING has addressed this issue for a few years, due to some files from copied GIMP, and reads: "As such, the complete binaries of Inkscape are currently covered by the terms of GNU GPL version 3 or later." Given that, I guess we are only waiting on lib2geom to make a decision? I saw the bug report on Inkscape's GitLab page [0], but I'm wondering if there was actually any public discussion upstream, like on a mailing list? [0] https://gitlab.com/inkscape/inkscape/-/issues/784 --Dxnq1zWXvFF0Q93v Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl60JzQACgkQJkb6MLrK fwjROxAA1n+zFEZXYv2SHW4hika2LiH5vz/c/BNpjWxMSIEOrXj/LWTYH05zrcTg 0d3YNP5mpS4nFHMWGJeZwyp4sjtj4tCg/cYmPMOQY05FOZ1BalHCdlEbsGdr7x6Y 62ViwYjsJsCch1kniBeTr20tFBUvVeY0TCF8ptxTyNFbd12qR0TL8mcwT7+Omuws 0u5hqv7uXK8deKxVl+UwTbpZAhN62+OQIl6FKrPbX47uDEQyx8Weu+C3BHMfpL5+ r+2PhYbFsWPp+aZ6cSw1ZPGcX96JeCqquApIKczuu5yKw2Or+v9w2piCJroqV8uo je1FBRs+lhTs4JjItjNhOK1095qReb2FBygOh77H/umH/LWxb3IMQunilsND8Y5G tVQH2GZ/fWx2GT+MtbDW1ZuF3PzyVsLFBgX2EFdAvHs8RmP15NTsjFktTZcaAtyd 5OtDRq+lI2XikVKH1TJOY6mwnpEjZmQSQ9g7Zn/o6yvHzm3LTjFxKmuh0RzDBnHZ QsjCGsp7n3HwYESufEC8fmoMaVpMMu7/pNwcFOQNUsd5CcDBaBwus00f3q2GQDgI w2iOYYfEERzX3NqighFPmLIz8Ed3ZAeyfkVFFd6b3FZH2IzqMcSJ4tmEg0N++mSg 8xpjdh2Z8SwHH8gNP82x3U0XuruG9hSEO8L+/1vYZ5dfzMViUhA= =Qz9+ -----END PGP SIGNATURE----- --Dxnq1zWXvFF0Q93v-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 11:27:43 2020 Received: (at submit) by debbugs.gnu.org; 7 May 2020 15:27:43 +0000 Received: from localhost ([127.0.0.1]:43744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWiR4-0002ZD-Ne for submit@debbugs.gnu.org; Thu, 07 May 2020 11:27:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:41258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWiR2-0002Z4-LU for submit@debbugs.gnu.org; Thu, 07 May 2020 11:27:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWiR1-0004M3-4x for guix-patches@gnu.org; Thu, 07 May 2020 11:27:40 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWiQx-0004Y6-PC for guix-patches@gnu.org; Thu, 07 May 2020 11:27:38 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id E0CE45C0102; Thu, 7 May 2020 11:27:34 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 07 May 2020 11:27:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=r986LXGnIbQrWtCpYzxj5yOW 2TC2BIsl/Oyz9/1A8d0=; b=oLkdefmN1qPus8/R8ZGQB2FBESS/aCvb5V4hEVVY GdSYXA5jZfU2hv84XbkWIUJkArpuIL9Or+MD+p6rqPnazLupS87GK63wq/SHXm+Y YzAqCPiaMvDCyhblIBDw7v0c6JfgduhiLJyRUWLDCuTQaiCO8zidj1aNYeHOXcMO Cfo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm2; bh=r986LX GnIbQrWtCpYzxj5yOW2TC2BIsl/Oyz9/1A8d0=; b=YXgpb+qLpR1WE+8qjdtnr9 3Q5+HY9hVaXrDZLpfpRQwwXI0KypaxhkOZbI/gRFIzUS8xwUEv/+HM38XpzPaSz/ barX6hawcMbVu/5zp+8iFKwttpeesntPnlIeVUaquRnaotE5vHDjPI2dARV0ARIi GMUXzsWlkyGbXBrWnpHajEEdbsIMKuSB+gna4NtS49YUwbRv5auDS08212rCEQf6 u5SY5U82GvzooQJoYX19xlj6CqVoVdDvPQOA7yC6SblEFyLFRtXmiDdnGkbIOlwK j2UgRU8IEWUr8QEnIx4FZ53+E9c6mtweMEBl0jekTX3VTflKlSddvOieDtlkoWmQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrkedtgdekiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepudekveegteekleetgfeitdejgfejkeffudethedvhfeukeduleeikeejfeehffet necukfhppeejiedruddvgedrudefkedrieefnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id B33D830661B0; Thu, 7 May 2020 11:27:34 -0400 (EDT) Date: Thu, 7 May 2020 11:27:32 -0400 From: Leo Famulari To: Maxim Cournoyer Subject: Re: [PATCH] gnu: inkscape: Update to 1.0. Message-ID: <20200507152732.GA16992@jasmine.lan> References: <87y2q41l9d.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="huq684BweRXVnRxX" Content-Disposition: inline In-Reply-To: <87y2q41l9d.fsf@gmail.com> Received-SPF: pass client-ip=66.111.4.26; envelope-from=leo@famulari.name; helo=out2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 11:27:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: guix-patches X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --huq684BweRXVnRxX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, May 06, 2020 at 11:23:10PM -0400, Maxim Cournoyer wrote: > The following updates Inkscape to its 1.0 version. The test suite is > enabled and an effort is made to unbundle as much of 3rd party libraries > as possible (but more can be done, if you'd like to help: see the > comments in the patch). What commit do these patches apply to? I can't get patch 7 to apply to either master or core-updates. --huq684BweRXVnRxX Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl60KOQACgkQJkb6MLrK fwhRjA//bT2188+g+or/DdgBjKGzcLtVQ1oyhcVLgFFgB0y3o19duM2t23DsoF3B iIF3EGAbAOiCyFDaO/rRo0ypxEjJoB/uwJSwQZs/6TTZrvZ5HNkBQSZu5vQbL0of EtaPvwimJKu5NYTh9C38S0OkzYmUQWAlgdzWqiyZqQird0JYJNS7rJw99fsEJ/Q/ cJXxUDuiaPR8yVd9LqYkLv2Yb8fYa2qhNWGZ+Jt3YFI7eYZ4JffM+XleCa8mTdQu 3FuyGyz19fnv97ivyzSXw9CZfn8XlwRIpJxT2QtTclzJaYkMa2eG2clNPHQpFp5W 5WN/ji7gU/dQNO3fMdduXrUnCyGxhF3SJevsnan84qhv+Mhuzl9MqTG8hmbEwaRz /2mxiWo1hRs/sVXKkqcpWrDLncwhemrJVHujs0z3p4vnTsNtVkzE2i6s9LSc5fqd yuiKUiSpUn6xBqsGKWRDqk9tc6k8W/Dd39f3wFJwb/pvrv0/A2V+afwonGOx45wA Z1KgfQwZbPjm16xfNUSP0adc2WMyWSCf5/5uuqLSWo3hEpcsG9DpfOiPJY4Hk2+M JCppNLt+jRhyH/N0QP7KoiD+0Xp03jZXlf16qeHsWytT6y74mGU7XVqK3yWGX6k2 rLMzpALGk67HRlR6UL6YgfqewAkrwLENTnnamCTFUsMNI9xMvFI= =KkJy -----END PGP SIGNATURE----- --huq684BweRXVnRxX-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 11:30:26 2020 Received: (at submit) by debbugs.gnu.org; 7 May 2020 15:30:26 +0000 Received: from localhost ([127.0.0.1]:43760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWiTU-0002fF-3Q for submit@debbugs.gnu.org; Thu, 07 May 2020 11:30:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:51156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWiTS-0002f5-25 for submit@debbugs.gnu.org; Thu, 07 May 2020 11:30:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWiTR-0000VD-OM for guix-patches@gnu.org; Thu, 07 May 2020 11:30:09 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:57933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWiTQ-0006nj-TL for guix-patches@gnu.org; Thu, 07 May 2020 11:30:09 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 184625C0085; Thu, 7 May 2020 11:30:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 07 May 2020 11:30:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=JFMkO5ng6jIhsYMyCuzhl+7S DtBK7ZkVdtlMwKuJEN0=; b=rVNXOE20ZYUECxts4JyKBhLh+4GoRPv9+3E5SlwL RGKwHiMCnDM+6mQnKkcY6y/xuLZToDb0RDESJRIZ2BBxJ5n3fcpa/nVjS9kmTlit T8qdYcT8tBcdYL7PTFBIK7iaeIkBtqMxbzGlXrG3xPorlSgOf4pF54RJOSSjDBR+ dwo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm2; bh=JFMkO5 ng6jIhsYMyCuzhl+7SDtBK7ZkVdtlMwKuJEN0=; b=pYAehgkcjF+MvEI4jvKkBC AK0k9G0KhEtg+O3AGf5j+TMV+ifQte7aAZ2opi1FYsBRqYWj/PNdYdlDdDreikPb +eSdsj9Z/QHEMaKm8n6Rq1oiUwscXbHD6AC51N+jKnyc1BciVn1JjbdzyBOlVEXO eQfAzTtH60jNS0qAYQ5MBxDMNJTISIBDbLojylw3Hmf8W9FxMWLhTpdomUfi8Ri6 FV2qfs9QEAEjlJTJp2Dt2HbxjFDB+nQQptel5XaKrXj/BNyuqQ/sHX1ITEWSQ1Ix QGRl3GkakckjE9YwU/CAmuQcr2rd6TikKWDhC514UK8TrxDFA6vIndeisy1unyCA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrkedtgdekjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepudekveegteekleetgfeitdejgfejkeffudethedvhfeukeduleeikeejfeehffet necukfhppeejiedruddvgedrudefkedrieefnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id B6C5930661D3; Thu, 7 May 2020 11:30:07 -0400 (EDT) Date: Thu, 7 May 2020 11:30:06 -0400 From: Leo Famulari To: Maxim Cournoyer Subject: Re: [PATCH] gnu: inkscape: Update to 1.0. Message-ID: <20200507153006.GA17970@jasmine.lan> References: <87y2q41l9d.fsf@gmail.com> <20200507152732.GA16992@jasmine.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ZGiS0Q5IWpPtfppv" Content-Disposition: inline In-Reply-To: <20200507152732.GA16992@jasmine.lan> Received-SPF: pass client-ip=66.111.4.26; envelope-from=leo@famulari.name; helo=out2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 11:27:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: guix-patches X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --ZGiS0Q5IWpPtfppv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, May 07, 2020 at 11:27:32AM -0400, Leo Famulari wrote: > What commit do these patches apply to? I can't get patch 7 to apply to > either master or core-updates. Sorry, false alarm! I wasn't actually applying them to my core-updates tree. They do apply on core-udpates. --ZGiS0Q5IWpPtfppv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIyBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl60KX4ACgkQJkb6MLrK fwgSZg/4uL5R87oVe8BI20fFatQX+nk3ahi2VzqUl0/lgimjemT+59M5of3Gu0nR gLAGU1Lo5sKAJ/DMtb4EAwJ+T4Xaxef/cMqy1HtKum4Ite90AAz3eZOVIhPT/2oM S2o9+WL0YDN4x/LAlL0KLnFXwwx+B3lLukBbgq6UBqlQEwBWKpYKSMyBqWLZDQke 2A+T7po1jar5Ea4vbrTzbjlmLc0O8f0UQyyb3/DZwt67yODNQsZ8MRiYfCroz3m0 dryogpIOgoalWnbbE7O6/Ip3+lYrOFUKUYs4mp9BzMFde8I9L92dNmQg+wn3MtG3 a5tY12KH1YTFDq9xT33vYPW0+T3jVPm3JGU8s+7N6zztM4iK92KfHTg5RgIuY5eM ctVmLJZY2oGIfbo6R56i1JLT1R+YXVlreS2yix46n3GwHy161u9Q66VN/Z52oqSc BMtrYLFq4RbF3FXMbk4wNczyNGXNvZi4frdERuu8309a5aMb07dbzju2mi1MtRTt xXNU726KtMNQElOHztfOEua3nmXm0PeOWXTOvMtZAR9+tdmiu8tIqt6yJvyKdH+s eVLdm92CW4fLrcLlFbi2tcdCUA+w5z77MGmocbm4mTnTK7pIksXh3lyBI55+g9SO ue7X13VIcMuNQzpVy/X3SpJgU3Sj9CdQORWaKSpDKsGOziy2ew== =fRn9 -----END PGP SIGNATURE----- --ZGiS0Q5IWpPtfppv-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 15 09:36:23 2020 Received: (at 41118) by debbugs.gnu.org; 15 May 2020 13:36:23 +0000 Received: from localhost ([127.0.0.1]:36289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZaVi-0004LV-LH for submit@debbugs.gnu.org; Fri, 15 May 2020 09:36:22 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:33381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZaVg-0004LH-Sw for 41118@debbugs.gnu.org; Fri, 15 May 2020 09:36:21 -0400 Received: by mail-qt1-f194.google.com with SMTP id t25so1952691qtc.0 for <41118@debbugs.gnu.org>; Fri, 15 May 2020 06:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=aUOOKt1oeUGRITZYcaV0DWT2yCdnrduR0oMwzw4h5K0=; b=WtpL/TS1DY29inzH1Gr5VzTvnPsXNd5apT4msc7z5t0iP+vhIavCCSoWtJKU/bT1xY Vq2SYqbuu/fwwVXyIPFJUWfjdYcySZBXh27LUEP8oNHjM/bkFxkfLo5UJlrzN8A8nUYl 4g7GXgiO+IdZesTfI5nyvf9Atc0iwVx1yEhO3IzDqMKpzoL2PokA7cyUnqWmiEULvUyz 6FrMgbz4QKtVxgagY+qESfiPsJt/5xvVk53ed3P1jqLFDHtnhGtLpZo0KiHaTqvd6RIB Aux3Nqp2jkM5oc6CNRLmSaqFkMfwb7lHybjqvz26IO0senAOpXwr36U1zVtoFrZSk3EO t6kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=aUOOKt1oeUGRITZYcaV0DWT2yCdnrduR0oMwzw4h5K0=; b=r2AWw1HJsuai8W8KDC/0e41My+xPpw+l8umtlKu3+5fQ+XGOItqn98+9DF6ZjZv4Bp g6BzwEuTxTKlfztRhXajG6DhZYPeHZJmNsm2yInkVPlW2F0GswAt1LKilEn4YmxDRb2i ynGusg+VXUQSNK4A0Dz2OPeJb3yO0SNDK5zqz6rrXR8fRpnGrrgSLD9y+EQNJnK6U/LS EANJSUtVknA89XuWb/13tjJBXYKOCWEWspKTFN//ZIUkpTU9R+pSB88F1wmaGQkfHTa2 b14cGR4p1gcSRiBDuNWlQV6Rlt2UfPUgez/79mbpep/w5H6aI28ritDRt+VVJD3EqP4l KAoA== X-Gm-Message-State: AOAM533r3jafb+NAcbEKeG6FlB6vWubQ55wf/lszYntqTqZ4VeO+R/A5 4pKvr07GBwMOnVgPrGDFpluXoicP X-Google-Smtp-Source: ABdhPJyD5bgGLow2RYlNwZh+VDawiWth/ricZm4p3Ml6nMxqhYE86HjL/4Sr+OqPodUq5/j8stk1NQ== X-Received: by 2002:ac8:c8b:: with SMTP id n11mr3593749qti.49.1589549775120; Fri, 15 May 2020 06:36:15 -0700 (PDT) Received: from hurd (dsl-151-246.b2b2c.ca. [66.158.151.246]) by smtp.gmail.com with ESMTPSA id o136sm1592859qke.78.2020.05.15.06.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 06:36:14 -0700 (PDT) From: Maxim Cournoyer To: Leo Famulari Subject: Re: [PATCH] gnu: inkscape: Update to 1.0. References: <87y2q41l9d.fsf@gmail.com> <20200507152020.GA16387@jasmine.lan> Date: Fri, 15 May 2020 09:36:13 -0400 In-Reply-To: <20200507152020.GA16387@jasmine.lan> (Leo Famulari's message of "Thu, 7 May 2020 11:20:20 -0400") Message-ID: <87v9kxb9rm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Leo! Leo Famulari writes: > On Wed, May 06, 2020 at 11:23:10PM -0400, Maxim Cournoyer wrote: >> The following updates Inkscape to its 1.0 version. The test suite is >> enabled and an effort is made to unbundle as much of 3rd party libraries >> as possible (but more can be done, if you'd like to help: see the >> comments in the patch). >> >> The last patch of the series (Add libdepixelize) is added as a WIP, and >> is included as a curiosity only (not intended to be merged in its >> current state). > > Thanks! Thanks for having a look. > Too bad about the licensing issues... it seems like it might be a while > before they are resolved upstream. I think it's not totally correct to > say that the license of lib2geom is effectively GPL3+. Only the > copyright-holders of lib2geom can say that, right? The licenses are > effectively incoherent and I'd say the software is not something we have > the right to distribute :/ I'm no expert, however. You're probably right, that this needs to be sorted upstream first. > I did notice that Inkscape's COPYING has addressed this issue for a few > years, due to some files from copied GIMP, and reads: "As such, the > complete binaries of Inkscape are currently covered by the terms of GNU > GPL version 3 or later." Given that, I guess we are only waiting on > lib2geom to make a decision? Yes, it seems only inertia is preventing a move to GPL v3+ as a whole, which would be much clearer, but in the meantime, there's at least that bit of text which means it's safe to distribute Inkscape under the GPL v3+ license. Thanks for pointing that out to me! > I saw the bug report on Inkscape's GitLab page [0], but I'm wondering if > there was actually any public discussion upstream, like on a mailing > list? I've searched the mailing lists of both Inkscape and lib2geom, but haven't found any recent discussion on the licensing topic. > [0] https://gitlab.com/inkscape/inkscape/-/issues/784 I've attempted to stir up some action in that thread. A comment was made by one of the Inkscape developer on the matter, directed to another Inkscape developer: > If a license change from GPLv2+ to GPLv3+ (of the raw Inkscape code) > is something you're actually interested in you should probably make a > comparison of pros and cons of either license (i.e. why would we as a > project as well as possible re-users profit from upgrading to GPLv3+? > What would we loose?) and post it to the mailing list. I don't think > anybody feels particularly strong about keeping GPLv2 in principle, > but a lot of effort was put in to keep our codebase compatible with it > in the past, so there's some hesitation to just "throw that away" > without having good reasons for doing so. This was made here: https://gitlab.com/inkscape/inkscape/-/issues/784. If you have a good grasp of the GPL v2 vs GPL v3 merits, perhaps it'd be useful to them to to post that there. IIRC, I think the big new things in GPL v3 were immunization to patent attacks (nice to have for Inkscape) as well as preventing tivoization (this is not so applicable), and clarifying that linking with GPL code means the whole should be GPL. I'll re-read the licenses text in detail when I have a chance. Anyway, if this doesn't move quickly enough, we could reluctantly build Inkscape with its bundled lib2geom, which is a subset of the full lib2geom and which doesn't link with GSL (IIRC). Maxim From debbugs-submit-bounces@debbugs.gnu.org Fri May 15 10:43:40 2020 Received: (at 41118) by debbugs.gnu.org; 15 May 2020 14:43:40 +0000 Received: from localhost ([127.0.0.1]:38444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZbYm-0000TN-Py for submit@debbugs.gnu.org; Fri, 15 May 2020 10:43:40 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZbYl-0000T5-IS for 41118@debbugs.gnu.org; Fri, 15 May 2020 10:43:36 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 66ADB5C0092; Fri, 15 May 2020 10:43:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 15 May 2020 10:43:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=qvak9HDqj10Y87X75FtJ4A/R H2f+pvC04/fGoqYjRrk=; b=l79iW4nR9tVqboVzBvxWmC0iwF4vES/+KDgBsS52 cRtH0ng5v+xp6Qd/EiDQd/ovrFXJIxs5LO5/IBioL6OSgmyWTtXuyITPgh0ESRtJ otNPyp2a/nu/a6+laPOn3YMfUncmbEa1/9KQabFtC9V3MWV5p6+yGxGRb6DnbGev 24E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm2; bh=qvak9H Dqj10Y87X75FtJ4A/RH2f+pvC04/fGoqYjRrk=; b=ZUje6MT6+j7SQZa0hGL6Eg qJhW/l2Wzejdm1PjXJ+mRCrGhXpNkak/tsriw3cxJy6aEdDgv2yuJzxydMQEDzeZ EaZNXAJZCY1bbOYWySXFe9ASh3+lIsduWjZbLtNmjBKkHpIiPMFYfd823QZ1Ld1p +9MH0Ok92NodSwdblA0NOqqsQ6d2DzC64euTyAEaSE5DgdYQVnPSSsP2pA1xLgej S3gr9xqRCzpehu8YZGhfRCc3kZ9opsKmBzA2UUwQ2ptD81Ujn8fBYW1dppUJmdY6 tt7Qf9Mh2FooNDt/qWDdOsgf9OECaeVTlSv9E/7i50WJVOzBvkfjjy+dLK3Vkxjg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrleekgdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepieeuvdefveffffefveehffetuedtffefvdekffeuueeuieffueejieefkeehgfff necuffhomhgrihhnpehgihhtlhgrsgdrtghomhdpghhnuhdrohhrghdpfhhsfhdrohhrgh enucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id D8DE73280063; Fri, 15 May 2020 10:43:28 -0400 (EDT) Date: Fri, 15 May 2020 10:43:24 -0400 From: Leo Famulari To: Maxim Cournoyer Subject: Re: [PATCH] gnu: inkscape: Update to 1.0. Message-ID: <20200515144324.GA18054@jasmine.lan> References: <87y2q41l9d.fsf@gmail.com> <20200507152020.GA16387@jasmine.lan> <87v9kxb9rm.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87v9kxb9rm.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Fri, May 15, 2020 at 09:36:13AM -0400, Maxim Cournoyer wrote: > This was made here: https://gitlab.com/inkscape/inkscape/-/issues/784. > If you have a good grasp of the GPL v2 vs GPL v3 merits, perhaps it'd be > useful to them to to post that there. IIRC, I think the big new things > in GPL v3 were immunization to patent attacks (nice to have for > Inkscape) as well as preventing tivoization (this is not so applicable), > and clarifying that linking with GPL code means the whole should be GPL. > I'll re-read the licenses text in detail when I have a chance. > > Anyway, if this doesn't move quickly enough, we could reluctantly build > Inkscape with its bundled lib2geom, which is a subset of the full > lib2geom and which doesn't link with GSL (IIRC). In they seem to demonstrate a misunderstanding about lib2geom's license. That commenter thinks that lib2geom is GPL2+, when it's actually LGPL-2.1 or MPL-1.1. However, gnu.org says that LGPL-2.1 is compatible with GPL2 and GPL3. So maybe it's fine; I don't know. I think we should ask FSF for advice . From debbugs-submit-bounces@debbugs.gnu.org Fri May 15 23:53:33 2020 Received: (at 41118) by debbugs.gnu.org; 16 May 2020 03:53:33 +0000 Received: from localhost ([127.0.0.1]:39246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZntF-0002Kc-8x for submit@debbugs.gnu.org; Fri, 15 May 2020 23:53:33 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:46043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZntE-0002KQ-30 for 41118@debbugs.gnu.org; Fri, 15 May 2020 23:53:32 -0400 Received: by mail-qk1-f196.google.com with SMTP id i5so4773648qkl.12 for <41118@debbugs.gnu.org>; Fri, 15 May 2020 20:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=lAMsz+naM67y0+Qo+Pw+gVuQ453FbtGhrtIo5JdSW+Q=; b=l07FTxZ0HDSYR+ZW/1okpMNL6a6ARwDHNFc0HyYeh8vnfRq27Y+H/kgr63xKS6q5Ke eOFzDLDonPk3Y7pmp3tZeWCO0vPOpIALjqr3EXOFB7ZOwe1nLOHydjn6WIk3SVQT9moV yGdNgzPTvT6hl2s/FsadQkDW1b5L4UNrN5Fm4BRgrHgL3P3RoN96gpVof6AzQLv07/3f lpnJbUnxkCKkDXRQlAxWTSiYW5tbPCkfOT+iPvBzm1pWPN3/rALsVHlzrQBBl5YyF77k TWYOI6okapUe69KS2MSrmkv3cP0yiwoKPcOvu7BX6Zpmv2n751QYDah5IObmQneb8SM3 p2+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=lAMsz+naM67y0+Qo+Pw+gVuQ453FbtGhrtIo5JdSW+Q=; b=IiDpR2o+Xlq1q62yTeRAJWWqaiUdOEg2KQpmu5PN3E9x3ewhKAyrHO/WA0VQtsp7Hl 5vCn7hZAuE9MNxaLhDE0Y87x48DwU/qY6ImarvINQGhTTI6UIl9VoLcp8QEihyTv5ZzX qkCeBWxi5o7M32ff1lj9GwUhJe4pteyKZhXpX3pJjYwbOzjGlAP01AMDU9iCdB1XJR1N RnH+9utWkJh655Mi4a6tkbJVm1dPFNzwXZZ94a2Fj/m0n+/G4BKQSct00F8QqTa4QjRA sbtZpo3xmmb7Gv9bvv5MAQ5jW8PpxO6Okrkfpm+jynORECw2rdMBDQvDIfUie8Fi5Uxn foEA== X-Gm-Message-State: AOAM533opdsaRBBxwmmXA6sizYBBfU0m7oMdmlvNQYo26RVIBXi2NsCJ O/OQ6pcYx0kY8W8woz7tL52w3xoz X-Google-Smtp-Source: ABdhPJzJ2bUz0G7E1iK0lzzfjynHhT+/YtMUr3YLaKOULSpDwSfTyt6Qv2azbHvEferQys2Zrj3V9g== X-Received: by 2002:a37:9b0a:: with SMTP id d10mr6668282qke.31.1589601206311; Fri, 15 May 2020 20:53:26 -0700 (PDT) Received: from hurd (dsl-151-246.b2b2c.ca. [66.158.151.246]) by smtp.gmail.com with ESMTPSA id p2sm3030940qkm.41.2020.05.15.20.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 20:53:25 -0700 (PDT) From: Maxim Cournoyer To: Leo Famulari Subject: Re: [PATCH] gnu: inkscape: Update to 1.0. References: <87y2q41l9d.fsf@gmail.com> <20200507152020.GA16387@jasmine.lan> <87v9kxb9rm.fsf@gmail.com> <20200515144324.GA18054@jasmine.lan> Date: Fri, 15 May 2020 23:53:24 -0400 In-Reply-To: <20200515144324.GA18054@jasmine.lan> (Leo Famulari's message of "Fri, 15 May 2020 10:43:24 -0400") Message-ID: <87ftc0bknf.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Leo, Leo Famulari writes: > On Fri, May 15, 2020 at 09:36:13AM -0400, Maxim Cournoyer wrote: >> This was made here: https://gitlab.com/inkscape/inkscape/-/issues/784. >> If you have a good grasp of the GPL v2 vs GPL v3 merits, perhaps it'd be >> useful to them to to post that there. IIRC, I think the big new things >> in GPL v3 were immunization to patent attacks (nice to have for >> Inkscape) as well as preventing tivoization (this is not so applicable), >> and clarifying that linking with GPL code means the whole should be GPL. >> I'll re-read the licenses text in detail when I have a chance. >> >> Anyway, if this doesn't move quickly enough, we could reluctantly build >> Inkscape with its bundled lib2geom, which is a subset of the full >> lib2geom and which doesn't link with GSL (IIRC). Actually, this doesn't help with the licensing incompatibility, given that Inkscape already depends on the GPL v3+ GNU Scientific Library (GSL) and that the bundled lib2geom sources within Inkscape make use of GSL. I've pointed that here: https://gitlab.com/inkscape/inkscape/-/issues/784#note_343667232. > In > they seem to demonstrate a misunderstanding about lib2geom's license. > That commenter thinks that lib2geom is GPL2+, when it's actually > LGPL-2.1 or MPL-1.1. I've brought this to their attention, thank you. > However, gnu.org says that LGPL-2.1 is compatible with GPL2 and GPL3. So > maybe it's fine; I don't know. I think we should ask FSF for advice > . That's a good idea. Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat May 16 07:05:52 2020 Received: (at 41118) by debbugs.gnu.org; 16 May 2020 11:05:52 +0000 Received: from localhost ([127.0.0.1]:39875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZudY-0007Pw-Nt for submit@debbugs.gnu.org; Sat, 16 May 2020 07:05:52 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:47829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZudX-0007Pd-4K for 41118@debbugs.gnu.org; Sat, 16 May 2020 07:05:47 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id C66EF5C0085; Sat, 16 May 2020 07:05:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 16 May 2020 07:05:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=QC/gzRe2XbbsuJ6R/71I6k9uTh b0C8EePFOshZl00jE=; b=On/0GN/GSciZGgKmjXcNqTxKHkzWMPwBhIEu2KRnlq XsB6jwA80BB9jLpzI3HAsNJrFGKlSHIe2PLCCWmKODrL6Pcx1t2rN1wMx6+2i3KG mvaPzcDH52v6tzuQnd2LpsQjBTNW+rnxxeEhXjyPMiLcFRDDkFfMJZtm6ZsFddqB VhwCofp15fMSBBFEfjgZJguJ/V+/hgaaQRi0/97QZ80LVpxy65f6Yyt0WcpJnnHf /PAfw8vk1bouHmrr6KHoND7qOVMZpIafnwbzH7wafmI1DWKtvBc/XAO7OOhIXLrX ju5/723btc6VyBvu6O2bm90dw9/PzoHGEhsmjPb+wLGA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm2; bh=QC/gzR e2XbbsuJ6R/71I6k9uThb0C8EePFOshZl00jE=; b=BAJZX40hyhfHk0KIMmHwsQ kwC/PbAFOGggMi3hvLs4fMsbRrNvc7qtAqDSwrtk4cQlMevHjoBSfg4G+Il5/Mfh cqCNMS3ZTOqHSbR0qWWj60dEe0DX+CE0k9fQPs6XLYL1UPzc9W0/JqCnTIQpGso6 NtW8WUNL/Md8HGh+HFPeCami7XmHoSPCkmu1Dq2GIcq7CevCExCs+CA9BgLHmHFw ok2IYU85Hayy/4O9P7s9Oj7GcZPCPaeA6SyZZZQ//mRTLgR4cUOCjK9tfF/LdFzi B0e+RAn9vrMsZLwG2E2wsh/5xJo65YHATd2Y8CEtUE2k8fPs+bBiPoSlGRY9vG/w == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddttddgfeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpeeitdevteehtefhfedtueffgfetjefhfffgjedvhefhfefgkefffeehvedt vdeggeenucffohhmrghinhepghhithhlrggsrdgtohhmpdhgnhhurdhorhhgnecukfhppe ekgedrvddtvddrieekrdejheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 989083066370; Sat, 16 May 2020 07:05:40 -0400 (EDT) From: Marius Bakke To: Maxim Cournoyer , Leo Famulari Subject: Re: [bug#41118] [PATCH] gnu: inkscape: Update to 1.0. In-Reply-To: <87ftc0bknf.fsf@gmail.com> References: <87y2q41l9d.fsf@gmail.com> <20200507152020.GA16387@jasmine.lan> <87v9kxb9rm.fsf@gmail.com> <20200515144324.GA18054@jasmine.lan> <87ftc0bknf.fsf@gmail.com> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Sat, 16 May 2020 13:05:38 +0200 Message-ID: <87eerkta0t.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Maxim Cournoyer writes: > Hello Leo, > > Leo Famulari writes: > >> On Fri, May 15, 2020 at 09:36:13AM -0400, Maxim Cournoyer wrote: >>> This was made here: https://gitlab.com/inkscape/inkscape/-/issues/784. >>> If you have a good grasp of the GPL v2 vs GPL v3 merits, perhaps it'd be >>> useful to them to to post that there. IIRC, I think the big new things >>> in GPL v3 were immunization to patent attacks (nice to have for >>> Inkscape) as well as preventing tivoization (this is not so applicable), >>> and clarifying that linking with GPL code means the whole should be GPL. >>> I'll re-read the licenses text in detail when I have a chance. >>>=20 >>> Anyway, if this doesn't move quickly enough, we could reluctantly build >>> Inkscape with its bundled lib2geom, which is a subset of the full >>> lib2geom and which doesn't link with GSL (IIRC). > > Actually, this doesn't help with the licensing incompatibility, given > that Inkscape already depends on the GPL v3+ GNU Scientific Library > (GSL) and that the bundled lib2geom sources within Inkscape make use of > GSL. I've pointed that here: > https://gitlab.com/inkscape/inkscape/-/issues/784#note_343667232. What exactly is the license incompatibility? As Leo points out, LGPL2.1+ is compatible with GPL3. Your initial assessment that the entire works become GPL3+ seems correct to me. GNU has a handy chart that shows compatibility between the various GNU licenses: . --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6/yQIACgkQoqBt8qM6 VPrqSggAtGMVJlYVCVhdO44Bm+Q8s0JomK5Mz/1zZzp3qnR/fGwHYeNEyvmNzH5q eSVQNiHIRH8sopFkSeo9f2uwzUmkabGwdOd5FFsq7Fol7MFXb/wSjNtbl4Y/1me/ NuqFuANUOttP2GL2236DMA6JMyrC1VJEvIh71acXvWXHrBW9VII94gK8hlvftYnZ fl8SoYkl9G0uy/wymP3FSGZmYjtDrmLo3U4/Y3OJ7PqYO8sKrjGqirScM9YRCnMK TuqVhh2ZcQQvUWA6bqsBF0OCQMowBO3StN5j15pGAM26inva/mI/ohh6Qh0FgN/f qn1mJXAZ/WxWuRPu+gWYn54GiaQpaA== =pFdp -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 16 14:59:33 2020 Received: (at 41118) by debbugs.gnu.org; 16 May 2020 18:59:33 +0000 Received: from localhost ([127.0.0.1]:41755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ja221-0003CI-IQ for submit@debbugs.gnu.org; Sat, 16 May 2020 14:59:33 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:40818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ja21z-0003C5-FO for 41118@debbugs.gnu.org; Sat, 16 May 2020 14:59:32 -0400 Received: by mail-qt1-f194.google.com with SMTP id c24so4848978qtw.7 for <41118@debbugs.gnu.org>; Sat, 16 May 2020 11:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=TcXANk6mOpMlKWLZnDZAaRw9tKLRsjYqLbZZyjrSpJE=; b=pYU3aDPFmcKzgMgg8vv3TGiNRzlR6FOxvTbiLNnsqgAwzfkSqkozBtoB2rGpf5mrPS z9nsZUM88/0ZsHCgejvDTNF6qDFEVd4uXjA3M+VaQerwYckvnBcCYMxiZHUcRlxKFtRD Wg1mH+Lddm0Dpi9TFC2cF/BOCwb3L3v2ktFNrayjclID9aURuie/t+ghFLTqEkxJmvI+ MLAiPz0yHcIMYfRh1l1GSh9jpUL06CmTc4Z9NON6KWMxuWlnxKFN0qWEFyBaCY9uwuLV c/Wfwh1MtASOhD32IbKNeBl974KD33X+P43Z1dCK2Ij7SdZBWDPXZNin5Bh3AmWWNBUa Uo+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=TcXANk6mOpMlKWLZnDZAaRw9tKLRsjYqLbZZyjrSpJE=; b=QPAHRxYpJIeGhQmHONxjaA7B2HXNQkWjHHjICmkNH8zB25vtFCpMoBqnPpkLKKkX9Y pvlzKOBJ2lBn5l7yLFKpvBRDUYdJV2WZyiuYxJndlX5b2W6wgwnYg39BZBUZ4oK+T3Nl fuByB/k6IYawOgZ1LQugR1Y0ps7cVtJ+6FfzFts+HQoRQLgoxEIhWYQCcNDbOAl+HIUR RRYzUruXSqb6KIC4FjmkmZU4/bCS56fQXk3a8mlv/6G/J6NKZ23FL0cKAMEZxbF0AVF6 QmMCkvd7qEMsSR1k6ECExBWz9e3mMlORjyBSs1hpo/CUqaakHc5ZVSQcV9XCOfW/ANtq Yk8w== X-Gm-Message-State: AOAM532cO+QZ+JwkibxnipvPkPnoaWUCUBkoBkZlFEubL3hu3jYfdb1s wYZnUFSmerlQbb0oyL0xYoe4njmG1q8= X-Google-Smtp-Source: ABdhPJzPm+KDP8PWbXGDYf739nN+pQvTA5SxNsVlgY7igWsKcHISw/poW6nWXK1ZjBgFGG4m5sDChA== X-Received: by 2002:ac8:7153:: with SMTP id h19mr9407480qtp.5.1589655565654; Sat, 16 May 2020 11:59:25 -0700 (PDT) Received: from hurd (dsl-236-125-8.b2b2c.ca. [207.236.125.8]) by smtp.gmail.com with ESMTPSA id l2sm4362080qkd.57.2020.05.16.11.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2020 11:59:25 -0700 (PDT) From: Maxim Cournoyer To: Marius Bakke Subject: Re: [bug#41118] [PATCH] gnu: inkscape: Update to 1.0. References: <87y2q41l9d.fsf@gmail.com> <20200507152020.GA16387@jasmine.lan> <87v9kxb9rm.fsf@gmail.com> <20200515144324.GA18054@jasmine.lan> <87ftc0bknf.fsf@gmail.com> <87eerkta0t.fsf@devup.no> Date: Sat, 16 May 2020 14:59:24 -0400 In-Reply-To: <87eerkta0t.fsf@devup.no> (Marius Bakke's message of "Sat, 16 May 2020 13:05:38 +0200") Message-ID: <87blmnbt9v.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hey Marius! Marius Bakke writes: > Maxim Cournoyer writes: > >> Hello Leo, >> >> Leo Famulari writes: >> >>> On Fri, May 15, 2020 at 09:36:13AM -0400, Maxim Cournoyer wrote: >>>> This was made here: https://gitlab.com/inkscape/inkscape/-/issues/784. >>>> If you have a good grasp of the GPL v2 vs GPL v3 merits, perhaps it'd be >>>> useful to them to to post that there. IIRC, I think the big new things >>>> in GPL v3 were immunization to patent attacks (nice to have for >>>> Inkscape) as well as preventing tivoization (this is not so applicable), >>>> and clarifying that linking with GPL code means the whole should be GPL. >>>> I'll re-read the licenses text in detail when I have a chance. >>>> >>>> Anyway, if this doesn't move quickly enough, we could reluctantly build >>>> Inkscape with its bundled lib2geom, which is a subset of the full >>>> lib2geom and which doesn't link with GSL (IIRC). >> >> Actually, this doesn't help with the licensing incompatibility, given >> that Inkscape already depends on the GPL v3+ GNU Scientific Library >> (GSL) and that the bundled lib2geom sources within Inkscape make use of >> GSL. I've pointed that here: >> https://gitlab.com/inkscape/inkscape/-/issues/784#note_343667232. > > What exactly is the license incompatibility? As Leo points out, > LGPL2.1+ is compatible with GPL3. Your initial assessment that the > entire works become GPL3+ seems correct to me. > > GNU has a handy chart that shows compatibility between the various GNU > licenses: > . This helps! It indeed shows that's it's OK to copy code from a GPLv3+ project (link to) from a LGPL2.1+ code base, as long as the combined work becomes GPLv3+. What I wasn't sure, following the remark from Leo, was if this permission was automatically granted to downstream users, without having the upstream stating that yes, it indeed is OK to do so. In retrospect, it would make sense that users are empowered to choose the combination of their choice, as long as the effective license is properly stated. I just find it confusing that upstream says 'this is LGPLv2+', when in reality the combined product is necessarily GPLv3+. Thanks for tipping in, Marius! Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed May 27 23:35:05 2020 Received: (at 41118) by debbugs.gnu.org; 28 May 2020 03:35:05 +0000 Received: from localhost ([127.0.0.1]:50523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1je9Jx-0006Wq-7z for submit@debbugs.gnu.org; Wed, 27 May 2020 23:35:05 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:33303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1je9Jw-0006WI-2E for 41118@debbugs.gnu.org; Wed, 27 May 2020 23:35:04 -0400 Received: by mail-qk1-f194.google.com with SMTP id z80so1923140qka.0 for <41118@debbugs.gnu.org>; Wed, 27 May 2020 20:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=dwg7KAJR6rfRj2AGBcOLODaFTsUEuuPqoCxUjT+Qwds=; b=ABkYH/nYv7IsV7WREJIvchbRLhmsBF5AUQn0cGIw6yeKhHhLHq/mceehuO/hgAqj3g GL/B+0OR/+2krcE9k98yUCHWJ68DOjNklrXXRTNIryNKXazqYklbrupDiZMWAhY13ahF Ewsuvtv9GEMoNQWj+QFvEGmaiHU623yubxBS85Iwzw6hhRUXv36KArfiTHoQYhzUpo+V DvROc7V+VeDYMV7ZJqMs+o0DPt6fNHhARBVZ+ftjzp9td//DXxrlXbZzT/aZF0gGVY7c YhslJ0Ffc9scD+FdHYiK6Hhuxrd4Cfh8jpMx1y5WWy+sbst5SO1m9uX6/KoJzpbsSo7Y TKog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=dwg7KAJR6rfRj2AGBcOLODaFTsUEuuPqoCxUjT+Qwds=; b=hGiAiUCWuGX+Wp/s/rw5aXn4ejLMyLxKk/9aleFooeN86iAJf2ts3f7WniZdIAoPzJ 4PmoQhjl0TyYoTXOlhLtlLWiQRQaFmdir+wTV2KlgpsWGhN4cLpG2xSaowj+wlRccgcJ i6oXzz/XQoRUhvm73ZomWI+ezWZX+1cf7ZCw+oBgQ3m+AHj0FvFTKZ3jFYsdemW0F1XL IF0GpCFrTYAqhfeLY78ppiwda6NCVQ5ZT7Mu+0vAo07N24f4tr2JGvPAyUoRToyfeFzy WnhvM+sDOO45Xi8hQsle2sUp8rXPmoeu5/PUuJK9YAGKoIAj2M1RGqeIPxl8HSmQV4uH x0qw== X-Gm-Message-State: AOAM53095AsVBKsw43dvq3JyUmYJVv1AarU0fTmUzSbCsZlto5DTB0dr /RANzC5WkYTK2FYoAxsHbBVQg2xUozc= X-Google-Smtp-Source: ABdhPJyUM7rEOaf8vKmy7vCcW4Ag0YQUXRdrutVvo8kcY3G6GiucABU0hKWaQjwBA4wgnpEWlAoKZg== X-Received: by 2002:a37:6cd:: with SMTP id 196mr902176qkg.393.1590636898379; Wed, 27 May 2020 20:34:58 -0700 (PDT) Received: from hurd (dsl-10-130-200.b2b2c.ca. [72.10.130.200]) by smtp.gmail.com with ESMTPSA id 10sm4204496qkv.136.2020.05.27.20.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 20:34:57 -0700 (PDT) From: Maxim Cournoyer To: Leo Famulari Subject: Re: [bug#41118] [PATCH] gnu: inkscape: Update to 1.0. References: <87y2q41l9d.fsf@gmail.com> <20200507152732.GA16992@jasmine.lan> <20200507153006.GA17970@jasmine.lan> Date: Wed, 27 May 2020 23:34:56 -0400 In-Reply-To: <20200507153006.GA17970@jasmine.lan> (Leo Famulari's message of "Thu, 7 May 2020 11:30:06 -0400") Message-ID: <87wo4w68bj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Leo! Leo Famulari writes: > On Thu, May 07, 2020 at 11:27:32AM -0400, Leo Famulari wrote: >> What commit do these patches apply to? I can't get patch 7 to apply to >> either master or core-updates. > > Sorry, false alarm! I wasn't actually applying them to my core-updates > tree. They do apply on core-udpates. Did you have a chance to try this? With the licensing issue resolved (it's OK to license the combined works as GPLv3+ for both lib2geom and Inkscape), I'll be looking to merge this while it's still relatively fresh :-). I'll leave it another week, then merge it to staging if no one objects. Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu May 28 09:39:29 2020 Received: (at 41118) by debbugs.gnu.org; 28 May 2020 13:39:29 +0000 Received: from localhost ([127.0.0.1]:51290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeIke-000107-F5 for submit@debbugs.gnu.org; Thu, 28 May 2020 09:39:29 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:48241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeIkc-0000zs-QI for 41118@debbugs.gnu.org; Thu, 28 May 2020 09:39:15 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 97E085A4; Thu, 28 May 2020 09:39:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 28 May 2020 09:39:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=kSi3A9OUcVr5kz3mcVOCIrUf 8f/3ymlGWMcHHlAGOvU=; b=WwdL164B5xp1XTVefVTuthMkMF01oa9FB4Qk7OWa OLG8OgeFSevWHpvo+/6mN79LxU1d+7RvItB5kmJPtZYyRAVvGZMujKII+SrUzi35 S770y0VSwOfG69BoNz2wzhcyUXWM4ekXzAMEBe0xXbJaRGVFUXsHUF7qXj6UlLa2 UdU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type: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=fm2; bh=kSi3A9 OUcVr5kz3mcVOCIrUf8f/3ymlGWMcHHlAGOvU=; b=qHjRmxT8lJtmzv+Fk5Fx3v 0PBTTtWB53ZcgChnFyXKk3a3cTIynWfV8v7l86yI6+6YiKZ5wFEEyBOq2i0NCxyi jZtEL1C+2S2A093brYUATaoUMQlA1XWV9ygcbGSW5dVj589Rkxg74YOjZik4oMcC BD7uhN46XkqezY/3AseZJIKNyZu6ffmnWb9n1w/2OiKAk4yL6XhXITaDJlKXMtBU x/jE+Dp4O4kovU4TtWmKtF9hgJaFmuwRliTsu/5qXgukucN0/c2oWLOHlDzKdvNb 9/+/RnfxyuTjQlITpid3+wO+etXo4YOU9Ybn5TKEo20Rf+20QjzPUhCaZPNCGXhA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddviedgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id D95AD3060F09; Thu, 28 May 2020 09:39:07 -0400 (EDT) Date: Thu, 28 May 2020 09:39:05 -0400 From: Leo Famulari To: Maxim Cournoyer Subject: Re: [bug#41118] [PATCH] gnu: inkscape: Update to 1.0. Message-ID: <20200528133905.GA31644@jasmine.lan> References: <87y2q41l9d.fsf@gmail.com> <20200507152732.GA16992@jasmine.lan> <20200507153006.GA17970@jasmine.lan> <87wo4w68bj.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87wo4w68bj.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41118 Cc: 41118@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Wed, May 27, 2020 at 11:34:56PM -0400, Maxim Cournoyer wrote: > Did you have a chance to try this? With the licensing issue resolved > (it's OK to license the combined works as GPLv3+ for both lib2geom and > Inkscape), I'll be looking to merge this while it's still relatively > fresh :-). No, I didn't try it... if it works for you, I'm sure it's okay. I'd check for post-release major bugs before pushing since it's probably been well-tested in other distros. From debbugs-submit-bounces@debbugs.gnu.org Sun May 31 23:14:42 2020 Received: (at 41118-done) by debbugs.gnu.org; 1 Jun 2020 03:14:42 +0000 Received: from localhost ([127.0.0.1]:34239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfauQ-0008DV-DJ for submit@debbugs.gnu.org; Sun, 31 May 2020 23:14:42 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:36728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfauO-0008DI-Ig for 41118-done@debbugs.gnu.org; Sun, 31 May 2020 23:14:41 -0400 Received: by mail-qk1-f193.google.com with SMTP id 205so7848901qkg.3 for <41118-done@debbugs.gnu.org>; Sun, 31 May 2020 20:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=PkOkLxLhWJsb0AH20b7Yr8x8+e50CgoTmX2pVcY9jew=; b=BCUQgoN60Wn73tcwUaDK87Nr4ltzJDFHZSIHzCoVU0XHIZWQ03rAd/b4t2qvWF545h Th3Hhaqnjb80bDPupT89LmXBZx1szRRaHGrirzLK5JmqOB6pKKV9MOuiqiaeie9FjRyj vxRWXbQI1ZsN4en8kbS4ShkCVsLqvRr3KWzSCbnFh/Y7x/Q1zNnu2vYkH/Vrf3ubeImV lL7D33kugf3oUNgB9m/kECMoV+H5o2EP3lASb+xQ+ovUJrV2GM1/KjfYoYhBkwka3AfB bH3N6+mvJi5zjMnViAvGP8xZFHU2sQe1YtleuwGci4ePwNNiC0n5RFQ/GCwFeoHRCnZL RKPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=PkOkLxLhWJsb0AH20b7Yr8x8+e50CgoTmX2pVcY9jew=; b=oJ+xjUS7aofp+UnfzxmGe6X7e0gbSZRRsoidoTvwk5KPk2SqBhtm3bltRIvJKD1JAW v93Ss8rV/SArJ0uZLowHiDSNWaBqkF+Lkrw24xsiajXU/ZfkzCliuCE3e6yicCUoOCzQ qPpSSUdWKjtL8Ehmfj8dohXpf6L0CT/54hfIOjxPbaM/9HIoVahZxje+TF80UwAfQFx/ hzW/47YtTab/5Gex5+6fXQU7K31P6uyFOJQvQU28sX07zRlG0PQ4q+fA0XN7zV2lXR3i cq4IZPW3Qk34hS3xqIRzFFCmIeXIiNGS7PbaFuOqUo+xQ6OxCL+5LeVtPkvNihcCiAK+ 0dwQ== X-Gm-Message-State: AOAM530i7Wv5VFnCOc73UUUzSQrIVRbKyttVwuXXqe6FDdjmweufnnnH qa82UuBa7QmRZrBzw+ToBHgLmWX5 X-Google-Smtp-Source: ABdhPJxEXGCSUxQ/yVaCn9sCfV3mOTxyDnJ2lZkPVC9air25NKFBD6EJW7MmPCHoIxGXFYMMl7EpcA== X-Received: by 2002:a37:445:: with SMTP id 66mr18480374qke.146.1590981274847; Sun, 31 May 2020 20:14:34 -0700 (PDT) Received: from hurd (dsl-10-148-140.b2b2c.ca. [72.10.148.140]) by smtp.gmail.com with ESMTPSA id g64sm14172968qtd.39.2020.05.31.20.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 20:14:34 -0700 (PDT) From: Maxim Cournoyer To: Leo Famulari Subject: Re: [bug#41118] [PATCH] gnu: inkscape: Update to 1.0. References: <87y2q41l9d.fsf@gmail.com> <20200507152732.GA16992@jasmine.lan> <20200507153006.GA17970@jasmine.lan> <87wo4w68bj.fsf@gmail.com> <20200528133905.GA31644@jasmine.lan> Date: Sun, 31 May 2020 23:14:33 -0400 In-Reply-To: <20200528133905.GA31644@jasmine.lan> (Leo Famulari's message of "Thu, 28 May 2020 09:39:05 -0400") Message-ID: <87lfl75vfq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 41118-done Cc: 41118-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Leo Famulari writes: > On Wed, May 27, 2020 at 11:34:56PM -0400, Maxim Cournoyer wrote: >> Did you have a chance to try this? With the licensing issue resolved >> (it's OK to license the combined works as GPLv3+ for both lib2geom and >> Inkscape), I'll be looking to merge this while it's still relatively >> fresh :-). > > No, I didn't try it... if it works for you, I'm sure it's okay. I'd > check for post-release major bugs before pushing since it's probably > been well-tested in other distros. I've made some edits to simplify the wording of some comments, made sure to not cause a rebuild of many packages, and pushed to master (staging is currently frozen) as a second inkscape-1.0 package. Thank you, I'm closing this. Maxim From unknown Fri Jun 20 07:10:03 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 29 Jun 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator