From patchwork Thu May 7 03:23:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 21917 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E636927BBE3; Thu, 7 May 2020 04:24:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 1F24827BBE1 for ; Thu, 7 May 2020 04:24:09 +0100 (BST) Received: from localhost ([::1]:33958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWX8q-0004Rt-Ku for patchwork@mira.cbaines.net; Wed, 06 May 2020 23:24:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWX8k-0004Rj-Pg for guix-patches@gnu.org; Wed, 06 May 2020 23:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWX8k-0002wJ-Er for guix-patches@gnu.org; Wed, 06 May 2020 23:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jWX8k-0007QR-9s for guix-patches@gnu.org; Wed, 06 May 2020 23:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41118] [PATCH] gnu: inkscape: Update to 1.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 May 2020 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41118@debbugs.gnu.org Cc: Leo Famulari X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.158882182628516 (code B ref -1); Thu, 07 May 2020 03:24:02 +0000 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 Date: Wed, 06 May 2020 23:23:10 -0400 Message-ID: <87y2q41l9d.fsf@gmail.com> MIME-Version: 1.0 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From 3853fb03cbd15ab84a6744cb8f65231e5702b0e1 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. --- 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 --- 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+)))) +;;; 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/18). + (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 described in +@url{https://johanneskopf.de/publications/pixelart/paper/pixel.pdf,Depixelizing +Pixel Art}.") + (license (list license:gpl2+ license:lgpl2.1+))))) ;dual licensed + (define-public pstoedit (package (name "pstoedit") -- 2.26.2