From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aKtoC+SQs14YBgAA0tVLHw (envelope-from ) for ; Thu, 07 May 2020 04:39:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kDuzDfCQs16wbAAA1q6Kng (envelope-from ) for ; Thu, 07 May 2020 04:39:12 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 A81CA940053 for ; Thu, 7 May 2020 04:39:08 +0000 (UTC) Received: from localhost ([::1]:57350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWYJQ-0002T0-8y for larch@yhetil.org; Thu, 07 May 2020 00:39:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWYJK-0002Sh-Pp for guix-patches@gnu.org; Thu, 07 May 2020 00:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWYJK-0003Ea-G1 for guix-patches@gnu.org; Thu, 07 May 2020 00:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jWYJK-00012Q-BT for guix-patches@gnu.org; Thu, 07 May 2020 00:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41118] [PATCH V2] 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 04:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41118@debbugs.gnu.org Cc: Leo Famulari Received: via spool by 41118-submit@debbugs.gnu.org id=B41118.15888262843913 (code B ref 41118); Thu, 07 May 2020 04:39:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 X-Spam-Score: 0.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=a+L50gLr; 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 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [0.09 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49759642258046]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; R_DKIM_REJECT(1.00)[gmail.com:s=20161025]; HAS_ATTACHMENT(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.11), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DKIM_TRACE(0.00)[gmail.com:-]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[maximcournoyer@gmail.com,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[gitlab.com:url,elephly.net:email,inkscape.org:url,tobias.gr:email,fastmail.com:email,launchpad.net:url]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; PREVIOUSLY_DELIVERED(0.00)[41118@debbugs.gnu.org]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : SPF not aligned (relaxed),none] X-TUID: kAY2fE62wmjk --=-=-= 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 --=-=-=--