From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EHaJIqPbeGECbwAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 06:54:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gOU/HqPbeGFWOAAAB5/wlQ (envelope-from ) for ; Wed, 27 Oct 2021 04:54:59 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 23A208E4D for ; Wed, 27 Oct 2021 06:54:59 +0200 (CEST) Received: from localhost ([::1]:38828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxm-00036C-78 for larch@yhetil.org; Wed, 27 Oct 2021 00:54:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawx-0001wV-P0 for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawx-0003ov-9j for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawx-00059m-9f for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 13/13] gnu: inkscape: Remove the legacy 0.92 version. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041619649 (code B ref 51428); Wed, 27 Oct 2021 04:54:07 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:36 +0000 Received: from localhost ([127.0.0.1]:48142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawS-00056i-5g for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:36 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:45728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw8-00053n-5J for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:17 -0400 Received: by mail-qt1-f180.google.com with SMTP id r2so130231qtw.12 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d1wel20SbxXhLLNn9Zpp1v7uw5Oz/RCSror7Tm/KR5Y=; b=oSUXbmd7iME9tdAeYPHRtG4Zd8Ye4NZMiG37fekAoCP05FU4+W1dC7Ri70oiybqM/e lYihJ6OSB4RFfXsNlpIlIzt58JcPaqCbFQzaJmBYwCExXHIoid4M+ukKJB0aB4RWQFwV +XFMydoGDjMc0AxC0U1BHluPs0C0yHuw6VIsu6QEJFGOaoywDrHdxhkVvtw6YCDkwkPK Xh6gC6/5r0ScHmtH7/lDXYU8l2FZF3+KuoFLxJFOQUuzJb/jDD6jNCphPrc+p2bfOg+3 pjBdybsYorvfmbepVNBfLLP7O702yCLR/mJyBc42/OJ4C9rNnihQlVEiXWlxLVnCf89U EuxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d1wel20SbxXhLLNn9Zpp1v7uw5Oz/RCSror7Tm/KR5Y=; b=kACM6Ae+0rccBBhMhV0IVUlaXQolXqEyQ+ckz5V/M5ebMasfc5m076DGBWlpQNXPBG rI71xqHWTDK1K1DAs1OiGUVdcSeQUk5VnYMtGMN9gpc7YdPsTBoNjOgAuyyy3NDUatmr UsQwi73dUC3rkzYST6NMJVnoy6vp8CLXDc0BXP+FRVOcdcjme2jXoiENS65XV201lsi0 zildlBLvXJ3MlgzEqUcEPBQzTfJ6o4XTL9/3g0jQsCZYD0CimVM+3LqivRy5GV+8allT AfRiLwq/k0/qJa9DMtVnRcr+8za73lp5xjo9+hdJXSjCvKeNANaAJIBA4/z61uwZ5ODa 8bHw== X-Gm-Message-State: AOAM533ZbsDQKsaxAQDfSWIHsHWv9oTDGv12hr8wJHZ0htz43W7yAVOr ci4pRViIOS9whNqP/ynz55ftsSNZkEs= X-Google-Smtp-Source: ABdhPJykxkswA9BajR8wvkm9ni+CySpL+RmKrHm/bms+Zjecq/GtfJ+RFHgqMwABTYRFgD/itA6wvw== X-Received: by 2002:ac8:614b:: with SMTP id d11mr29158919qtm.396.1635310390402; Tue, 26 Oct 2021 21:53:10 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:09 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:44 -0400 Message-Id: <20211027045151.9889-13-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635310499; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=d1wel20SbxXhLLNn9Zpp1v7uw5Oz/RCSror7Tm/KR5Y=; b=C+Fnuh9I3kJRG5wyXWGufXBT+VkRpxlB64ypKe9bHMVs++4dxq6KCHvLdUp/NcF9tlWMyj zizgEEOBzq0HouLtw4Cwgh0EC13V9WAtToHkfCmAT7ZnlarvxwIf5H4DuYDgKZvq+iy+MF L8ZBTAuwHsL4GoPAY210xMnqdN4ooCicVxasbPSbebM646jMgyo36fDrXInOQsVbO/Uiq4 MZJu3AMvaRwo2dHesN9Jb+NZsgACtsXTyT8tq6pu4LAXGxcR99zIWs2prXk5aTfSSYElm4 ymkiBHoOV0IiVRoYvJ3QxrBZL8YqFIHgXR++YjGYIr07C29mDZx+tAovSbGIwQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635310499; a=rsa-sha256; cv=none; b=QZaxBVYLKTRTT9HDjLIabfnbaUsJZsOylhh3WYkVi1ThrgX7DOE7Etlb8fKkv+wBf62A4Y hRNY6JpXOBOy9v0fKtlw3kQsJLvW46Yd44nly0rRl5saXPtpaz7DnnyraM4BQdl+a1hsIt +7rhqW9LxTLIhz1h6BtA2zuAtIoc9XSn8rAnrgE4UgePrP1vUh2KTL23Ydwji7pZzxssJV IEAWqaArxEcBddRinMOxJypJHGbLx08Pmh4TiTGsWawNmsZsccZ5z6B7sWk3B8xd6IFh01 LdB1Dla7/Vr023q3DpQzAUVw/AMEO0IruwNzwwi97ei+iUKCLNJmEyqAiK05fA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=oSUXbmd7; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=oSUXbmd7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 23A208E4D X-Spam-Score: 0.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: IIQ4Qp+HHu24 The older 0.92 Inkscape package was previously kept because of problems building lib2geom on the ARM architectures. As this no longer appears to be a problem (tested on the overdrive1 machine), finally replace the older Inkscape by the newer 1.1 release. * gnu/packages/inkscape.scm (inkscape-1.1): Delete variable, moving the package definition to... (inkscape): ... the now single inkscape variable. Remove trailing #t. [tests?]: Remove. [phases]{generate-gdk-pixbuf-loaders-cache-file}: Add phase. --- gnu/packages/inkscape.scm | 90 +++++---------------------------------- 1 file changed, 11 insertions(+), 79 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 1fd328eb1c..e891a707c1 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Ekaitz Zarraga ;;; @@ -53,71 +53,6 @@ (define-module (gnu packages inkscape) #:use-module (gnu packages pkg-config)) (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")))) - (build-system cmake-build-system) - (inputs - `(("aspell" ,aspell) - ("gtkmm" ,gtkmm-2) - ("gtk" ,gtk+-2) - ("gsl" ,gsl) - ("poppler" ,poppler) - ("libpng" ,libpng) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libgc" ,libgc) - ("freetype" ,freetype) - ("popt" ,popt) - ("potrace" ,potrace) - ("python" ,python-wrapper) - ("lcms" ,lcms) - ("boost" ,boost))) - (native-inputs - `(("intltool" ,intltool) - ("glib" ,glib "bin") - ("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_datadir))")) - #t))))) - (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 standard, -as the native format.") - (license license:gpl2+))) - -(define-public inkscape-1.1 (package (name "inkscape") (version "1.1") @@ -211,12 +146,10 @@ (define-public inkscape-1.1 ;; 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)))) + ((".*find_package\\(DoubleConversion.*") "")))))) (build-system cmake-build-system) (arguments - `(#:tests? #t - #:test-target "check" ;otherwise some test binaries are missing + `(#:test-target "check" ;otherwise some test binaries are missing #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) #:modules ((guix build cmake-build-system) @@ -224,11 +157,13 @@ (define-public inkscape-1.1 (guix build utils)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) (add-after 'unpack 'patch-icon-cache-generator (lambda _ (substitute* "share/icons/application/CMakeLists.txt" - (("gtk-update-icon-cache") "true")) - #t)) + (("gtk-update-icon-cache") "true")))) (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 @@ -236,14 +171,11 @@ (define-public inkscape-1.1 (lambda _ (substitute* "testfiles/cli_tests/CMakeLists.txt" (("add_cli_test\\(export-latex") - "message(TEST_DISABLED: export-latex")) - #t)) + "message(TEST_DISABLED: export-latex")))) (add-after 'unpack 'set-home ;; Mute Inkscape warnings during tests. (lambda _ - (setenv "HOME" (getcwd)) - (format #t "ARGS is set to: ~a" (getenv "ARGS")) - #t)) + (setenv "HOME" (getcwd)))) ;; Move the check phase after the install phase, as when run in the ;; tests, Inkscape relies on files that are not yet installed, such ;; as the "share/inkscape/ui/units.xml" file. @@ -259,8 +191,8 @@ (define-public inkscape-1.1 (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) - #t))))) + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH")))))))))) (inputs `(("aspell" ,aspell) ("autotrace" ,autotrace) -- 2.33.1