From unknown Wed Jun 18 23:18:18 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#57685 <57685@debbugs.gnu.org> To: bug#57685 <57685@debbugs.gnu.org> Subject: Status: [PATCH] gnu: libharu: Update to 2.4.1. Reply-To: bug#57685 <57685@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:18:18 +0000 retitle 57685 [PATCH] gnu: libharu: Update to 2.4.1. reassign 57685 guix-patches submitter 57685 "Paul A. Patience" severity 57685 normal tag 57685 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 08 15:51:36 2022 Received: (at submit) by debbugs.gnu.org; 8 Sep 2022 19:51:36 +0000 Received: from localhost ([127.0.0.1]:60149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWNYl-0004bz-UX for submit@debbugs.gnu.org; Thu, 08 Sep 2022 15:51:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:41252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWNYk-0004bs-84 for submit@debbugs.gnu.org; Thu, 08 Sep 2022 15:51:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWNYi-00048u-Dd for guix-patches@gnu.org; Thu, 08 Sep 2022 15:51:32 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:42277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWNYe-00005f-1Y for guix-patches@gnu.org; Thu, 08 Sep 2022 15:51:31 -0400 Date: Thu, 08 Sep 2022 19:51:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1662666682; x=1662925882; bh=VAbmhZshay7A5xB5tssLzfv56XeH2OS2OczCUtvtjQw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=J6df0yZ9cMnCB2O+evECmHGJYKTeIjEyHPogoBvW5zvo8kRsi62gVX6aMFr6OPDAo EZWVdOvd2NdPGbY2eENcrZzaxL4FPYvPPl4xHQqT1GfgpkCaVX0ubtM7B34OyiQY6h h4sUGogBLg2vIRiKlQGoiX6urPD5F+voChtgNqpqbp++hOk84WU4KGlrotyiVrTgrN YhvPZsm6y0I6+UbRS+qqJk25MIdSX/RI1UhAZVItV5wFHb1WhD3eSeaVso5yBx4H/I SRiRwfgp1bwL3P+sfT7A19qabUgI4MwokLOShSo9NzJ+0IUEz5gas5E/eJvZ7QUNMs hoBSUtgxfq31Q== To: guix-patches@gnu.org From: "Paul A. Patience" Subject: [PATCH] gnu: libharu: Update to 2.4.1. Message-ID: <20220908195104.346056-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail-4018.proton.ch 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: "Paul A. Patience" 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: , Reply-To: "Paul A. Patience" Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/pdf.scm (libharu): Update to 2.4.1. [build-system]: Switch to cmake-build-system. [arguments]: Remove #:configure-flags, add #:tests? and #:phases. [inputs]: Sort them. [native-inputs]: Remove. --- gnu/packages/pdf.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 14f75d9ef9..d449d36818 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -22,6 +22,7 @@ ;;; Copyright =C2=A9 2020 Timotej Lazar ;;; Copyright =C2=A9 2020, 2022 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Maxime Devos +;;; Copyright =C2=A9 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,29 +364,30 @@ (define-public python-poppler-qt5 (define-public libharu (package (name "libharu") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libharu/libharu") - (commit (string-append - "RELEASE_" - (string-join (string-split version #\.) "_")))= )) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q")))) - (build-system gnu-build-system) + (version "2.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libharu/libharu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0371ba8ffqczdw7xnkx6pkjdbgw8s2yvqp7b8j0n2ky9cx4ga8v4")))) + (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-zlib=3D" - (assoc-ref %build-inputs "zlib")) - (string-append "--with-png=3D" - (assoc-ref %build-inputs "libpng"))))) + (list #:tests? #f ; No tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("^install\\(FILES (README\\.md CHANGES) INSTALL DEST= INATION .*\\)" + _ files) + (format #f "install(FILES ~a DESTINATION ~a/share/doc= /~a-~a)" + files #$output #$name #$version)))))))) (inputs - (list zlib libpng)) - (native-inputs - (list autoconf automake libtool)) + (list libpng zlib)) (home-page "http://libharu.org/") (synopsis "Library for generating PDF files") (description -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 10 05:56:10 2022 Received: (at 57685) by debbugs.gnu.org; 10 Sep 2022 09:56:10 +0000 Received: from localhost ([127.0.0.1]:36611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWxDe-0006Bd-A1 for submit@debbugs.gnu.org; Sat, 10 Sep 2022 05:56:10 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWxDc-0006BV-DZ for 57685@debbugs.gnu.org; Sat, 10 Sep 2022 05:56:08 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:fc93:27fb:8412:c8b7]) by mira.cbaines.net (Postfix) with ESMTPSA id F0BCA27BBE9; Sat, 10 Sep 2022 10:56:07 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 200352cd; Sat, 10 Sep 2022 09:56:07 +0000 (UTC) References: <20220908195104.346056-1-paul@apatience.com> User-agent: mu4e 1.6.11; emacs 28.1 From: Christopher Baines To: "Paul A. Patience" Subject: Re: [bug#57685] [PATCH] gnu: libharu: Update to 2.4.1. Date: Sat, 10 Sep 2022 10:55:26 +0100 In-reply-to: <20220908195104.346056-1-paul@apatience.com> Message-ID: <87sfkz1rk8.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57685 Cc: 57685@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 (-) --=-=-= Content-Type: text/plain "Paul A. Patience" writes: > * gnu/packages/pdf.scm (libharu): Update to 2.4.1. > [build-system]: Switch to cmake-build-system. > [arguments]: Remove #:configure-flags, add #:tests? and #:phases. > [inputs]: Sort them. > [native-inputs]: Remove. > --- > gnu/packages/pdf.scm | 44 +++++++++++++++++++++++--------------------- > 1 file changed, 23 insertions(+), 21 deletions(-) This looks to break the build for the saga package. Do you see it fail to build locally with this change? Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmMcXzdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdIaw//c9eleTY0XHKDKupRyvgNdhQYwmQ/rXs8 pjNFLcGvNlGQeZunJgn/sWTodxguqXgw4JjiXbQ83omvuXUUR+/mf0q7jI6Whtzr SpTlFAOZDH6mtSJCShpZyzaoykbxS81R5U2B2gkfaWj50pOxrgkqJJL7u1KMf39r fnVKeglWK4vLGiP/D7GACoqNdwjZzwAkuouwrnnqcFuUy4HP/6KYla3dSXmBW/3d neeW+ECSJyBioMY+OBw+LKXL5eieoXFg4Nsm8jYFm9WnG07WXL547sYhDiLAfoXj Nedztqa0zZawvd6ikcu0zG1SQklxmcfHRJdBN7umtwABUkilt0EEOR7StvXqnN7w 9okPMNotqIfV+qfPWxMaMALm/1anY3kk5ymm7ocIk6WA2OyCQjLpXSXPtLTCx8ns H502HEUdMEn7mKzRAedygk50TuTe9RPPWLzFOWaYLa5Y2eAcTGRq4dlh8FZHoJOl Q2zzGsMr8Gkx5fCJKSDBUaryTBuwHd3KAuBq2wuAj7Fn6vJQO0ssTinBBk0E1OBN IabeCpQI6vWv3bP96HyXNvOiqS/PUf5TBdRYBDhyjFzLVUvfBgXGZUQ+TgidSWom PiO5iDWCWsL2m75pf4ebj8lIqrv2bn44S9NNtNJWnON/Cp0Wbo06RvVVPWfAZfg8 UCe5AJf4YNE= =P0W5 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 12 15:25:44 2022 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:44 +0000 Received: from localhost ([127.0.0.1]:48077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp3v-0000Nx-VO for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:44 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:13861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp3r-0000Ne-7D for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:42 -0400 Date: Mon, 12 Sep 2022 19:25:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010732; x=1663269932; bh=CJ0jY+CW/QMp5DRYHpiR1HafqugGfLXgbWUzalj5/3Y=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=Teq4N//icAoSHXY5Hur7ljmljVj1UCck/TC21DNHrQDn29+ZtvEWPOpXa2sHkrzeX IoXqgcZ2KBOO9sVbKGRb5FZ19R6txgLTIx3tPmwpdVjWHkW2hBeRhTVZj6qYnK05KL 06eIl9maqJvsJbRUzJDpGI+7AyrdTUiJpGY48VVrkkF5lJZr0EDnzLDrfZiXAFf/t1 YiTpa88AZLCW9APKcgj2TGo8IvvkV8+Y/jrCo7IKkCl9Mwy3u0B+X53fcb2kwhzDqg FOyOLzoeT2e7nHe5+OjHHrFxXWAWyMn+2Y+iv9NoO3pC1wURdx620yloZmIEvuQFnI QZw2y/T5r56oQ== To: 57685@debbugs.gnu.org From: "Paul A. Patience" Subject: [PATCH v2 0/3] gnu: libharu: Update to 2.4.2. Message-ID: <20220912192510.420112-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57685 Cc: "Paul A. Patience" 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: , Reply-To: "Paul A. Patience" Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The issue causing the saga build to fail was fixed in libHaru 2.4.2, so I updated it to that version. (I had tested the build of emboss, which also depends on libHaru, but not t= hat of saga; I should have.) saga still needed a patch, and VTK too, because the 2.4.0 update of libHaru contained several breaking changes. Paul A. Patience (3): gnu: libharu: Update to 2.4.2. gnu: saga: Fix build with newer libHaru. gnu: vtk: Use system libHaru. gnu/packages/geo.scm | 9 ++++++- gnu/packages/image-processing.scm | 22 ++++++++++------ gnu/packages/pdf.scm | 44 ++++++++++++++++--------------- 3 files changed, 45 insertions(+), 30 deletions(-) -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 12 15:25:52 2022 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:52 +0000 Received: from localhost ([127.0.0.1]:48081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp44-0000OI-6q for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:52 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:33457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp41-0000Nw-IL for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:50 -0400 Date: Mon, 12 Sep 2022 19:25:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010743; x=1663269943; bh=r5IpmSzNLXK/UnQqOfL5i2Gn1mw4pGofLtxhuKTrJOM=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=CLzNal7I7KOxPJKG0PibP3Gfbdqcx7oSs3KcLLrcJgvraw9AWgM18/E/pGfBldcZF aq6DqlHwiin06YUwB//8bKdXjI+x7M7rdPu6Ifjrn2unsH/axCmGYUT04r76rsDsvq tN1IsCHib5/KXCnuPc2V76Sb1wW/yF66JHV6zipn5gFcxeYxMKXwpngx0gjoUjN0WV JruK5UzHQCbLn178E3YnCd6tbnkgZeZHkcvnvCqUxy533zx8Ju3IVln+xq7nDCAPHP 8bdZ/T8M+f+riNU/y6EEkWXKNiU15IiBVo3Q5kRUwFXuPOawyuGXurcegr/JZNna0Z XqDb0G2ByCRvQ== To: 57685@debbugs.gnu.org From: "Paul A. Patience" Subject: [PATCH v2 1/3] gnu: libharu: Update to 2.4.2. Message-ID: <20220912192510.420112-2-paul@apatience.com> In-Reply-To: <20220912192510.420112-1-paul@apatience.com> References: <20220912192510.420112-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57685 Cc: "Paul A. Patience" 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: , Reply-To: "Paul A. Patience" Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pdf.scm (libharu): Update to 2.4.2. [build-system]: Switch to cmake-build-system. [arguments]: Remove #:configure-flags, add #:tests? and #:phases. [inputs]: Sort them. [native-inputs]: Remove. --- gnu/packages/pdf.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 14f75d9ef9..c5076fbe45 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -22,6 +22,7 @@ ;;; Copyright =C2=A9 2020 Timotej Lazar ;;; Copyright =C2=A9 2020, 2022 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Maxime Devos +;;; Copyright =C2=A9 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,29 +364,30 @@ (define-public python-poppler-qt5 (define-public libharu (package (name "libharu") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libharu/libharu") - (commit (string-append - "RELEASE_" - (string-join (string-split version #\.) "_")))= )) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q")))) - (build-system gnu-build-system) + (version "2.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libharu/libharu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jwzqvv81zf5f7zssyixhyjirlp9ddwkbaabd177syb1bxljlsdc")))) + (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-zlib=3D" - (assoc-ref %build-inputs "zlib")) - (string-append "--with-png=3D" - (assoc-ref %build-inputs "libpng"))))) + (list #:tests? #f ; No tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("^install\\(FILES (README\\.md CHANGES) INSTALL DEST= INATION .*\\)" + _ files) + (format #f "install(FILES ~a DESTINATION ~a/share/doc= /~a-~a)" + files #$output #$name #$version)))))))) (inputs - (list zlib libpng)) - (native-inputs - (list autoconf automake libtool)) + (list libpng zlib)) (home-page "http://libharu.org/") (synopsis "Library for generating PDF files") (description -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 12 15:25:56 2022 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:56 +0000 Received: from localhost ([127.0.0.1]:48085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp47-0000OY-Iz for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:55 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:61043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp46-0000O9-Od for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:55 -0400 Date: Mon, 12 Sep 2022 19:25:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010749; x=1663269949; bh=51vh3s36rHx9aKxccdCScQYBmC64Oz1lKbd01La0ar8=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=WFTZcX2lIsJGT38AK0D24CGJI0kmw/TzCDJlnI7e44eDIyUXAZiGSmLoS+HwOPX7i lJY9pVBN37aj1LwnvMczCMhNaiEp8WwbTUaQhjYN0ujYPLsCvedRNt85SOZzF6cIo6 noCH2xXmAc1o6Jg5X2qwzgabtF7sRR/YZ1b/S0/UIuQ/sgyFx0s7CNApHebXfNBngO nZI6hlXivPbT0CHibCAwi2+pRVxyEZFtyOssylz83ozPgtGq8Ph/WWZqcNP/qrF0fI ih0Nf+LURdl0sd59K93/UgXw5mjSpbo8ztA7VjEFO9yoDMbcq6O9eLnUsj2K2E/LjI X0hTq5a7YE4Mw== To: 57685@debbugs.gnu.org From: "Paul A. Patience" Subject: [PATCH v2 3/3] gnu: vtk: Use system libHaru. Message-ID: <20220912192510.420112-4-paul@apatience.com> In-Reply-To: <20220912192510.420112-1-paul@apatience.com> References: <20220912192510.420112-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57685 Cc: "Paul A. Patience" 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: , Reply-To: "Paul A. Patience" Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/image-processing.scm (vtk)[snippet]: Delete bundled libHaru and patch VTK for newer libHaru. Reindent and remove trailing boolean. [arguments]: Specify external libHaru in configure flags. [inputs]: Add libharu. --- gnu/packages/image-processing.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-process= ing.scm index 0225f72651..4600c71ce0 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -324,14 +324,18 @@ (define-public vtk (snippet '(begin (for-each - (lambda (dir) - (delete-file-recursively - (string-append "ThirdParty/" dir "/vtk" dir))) - ;; pugixml depended upon unconditionally - '("doubleconversion" "eigen" "expat" "freetype" "gl2ps= " - "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "= lz4" - "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib"= )) - #t)))) + (lambda (dir) + (delete-file-recursively + (string-append "ThirdParty/" dir "/vtk" dir))) + ;; pugixml depended upon unconditionally + '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" + "glew" "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" + "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora= " + "tiff" "zlib")) + (substitute* "IO/ExportPDF/vtkPDFContextDevice2D.cxx" + (("\\bHPDF_UINT16 (noPen|dash|dot|denseDot|dashDot|das= hDotDot)\\b" + _ var) + (string-append "HPDF_REAL " var))))))) (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments @@ -348,6 +352,7 @@ (define-public vtk "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=3DON" @@ -381,6 +386,7 @@ (define-public vtk glew glu hdf5 + libharu libjpeg-turbo jsoncpp libtheora -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 12 15:25:59 2022 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:59 +0000 Received: from localhost ([127.0.0.1]:48089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp4B-0000Oo-1Z for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:59 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:21997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp48-0000OH-TE for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:57 -0400 Date: Mon, 12 Sep 2022 19:25:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010751; x=1663269951; bh=cHG636Xs3CkQGXg/WQXldBsA74hfsxvlqf96QW1RyI4=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=euZu4jmLqE6Q75T8rpUz3M96JfBMAg2/FucT1oN15/B9E+EuEDQZsCZYrxuTbyB0M COEEtS7FII9sOI8Daa/wxW3/dNgi/2j24XVflR1vs6ymaXjC7QC+T35UycmUmyfYnI wQ64efMSLJT00+N8QK3mqub2c4HKOhEfOTJsCIpayb36UhQbuxyW4ben9T6/xkiW91 WdwXvFj6xXKGGta2xY11wbezWo5OwluiIdbg7m50i1jFlOLzmkKOEB92ZdJP0ecwqm uQu1x0Qui9ZsHG2AUgzake8s8NO0aBeFHUuAPw8HtZ1HRwJ4ISdBsNIFyoUY3IOb3n zT15tpnjmAPpg== To: 57685@debbugs.gnu.org From: "Paul A. Patience" Subject: [PATCH v2 2/3] gnu: saga: Fix build with newer libHaru. Message-ID: <20220912192510.420112-3-paul@apatience.com> In-Reply-To: <20220912192510.420112-1-paul@apatience.com> References: <20220912192510.420112-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57685 Cc: "Paul A. Patience" 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: , Reply-To: "Paul A. Patience" Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/geo.scm (saga)[modules, snippet]: New fields. --- gnu/packages/geo.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9734ae66fe..082a55fc91 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2338,7 +2338,14 @@ (define-public saga (version-major version) "/SAGA%20-%20" version "/saga-" version ".tar.gz")) (sha256 - (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")))) + (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv")) + (modules '((guix build utils))) + (snippet + '(substitute* "saga-gis/src/tools/docs/docs_pdf/doc_pdf.cpp" + (("^#include \n" all) + (string-append all "#include \n")) + (("\\bHPDF_PROJECTING_SCUARE_END\\b") + "HPDF_PROJECTING_SQUARE_END"))))) (build-system cmake-build-system) (native-inputs (list pkg-config swig)) -- 2.37.3 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 17 13:20:59 2022 Received: (at 57685-done) by debbugs.gnu.org; 17 Sep 2022 17:20:59 +0000 Received: from localhost ([127.0.0.1]:47094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZbUw-0007GZ-Ot for submit@debbugs.gnu.org; Sat, 17 Sep 2022 13:20:59 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZbUu-0007GQ-HN for 57685-done@debbugs.gnu.org; Sat, 17 Sep 2022 13:20:56 -0400 Received: from localhost (unknown [134.157.22.165]) by mira.cbaines.net (Postfix) with ESMTPSA id 21EFC27BBE9; Sat, 17 Sep 2022 18:20:56 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5dc7bb2f; Sat, 17 Sep 2022 17:20:56 +0000 (UTC) References: <20220908195104.346056-1-paul@apatience.com> <20220912192510.420112-1-paul@apatience.com> User-agent: mu4e 1.8.9; emacs 28.1 From: Christopher Baines To: "Paul A. Patience" Subject: Re: [bug#57685] [PATCH v2 0/3] gnu: libharu: Update to 2.4.2. Date: Sat, 17 Sep 2022 19:20:05 +0200 In-reply-to: <20220912192510.420112-1-paul@apatience.com> Message-ID: <87y1uhrk7c.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57685-done Cc: 57685-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 (-) --=-=-= Content-Type: text/plain "Paul A. Patience" writes: > The issue causing the saga build to fail was fixed in libHaru 2.4.2, so I > updated it to that version. > (I had tested the build of emboss, which also depends on libHaru, but not that > of saga; I should have.) > > saga still needed a patch, and VTK too, because the 2.4.0 update of libHaru > contained several breaking changes. > > Paul A. Patience (3): > gnu: libharu: Update to 2.4.2. > gnu: saga: Fix build with newer libHaru. > gnu: vtk: Use system libHaru. > > gnu/packages/geo.scm | 9 ++++++- > gnu/packages/image-processing.scm | 22 ++++++++++------ > gnu/packages/pdf.scm | 44 ++++++++++++++++--------------- > 3 files changed, 45 insertions(+), 30 deletions(-) Thanks, these changes generally look good to me, and seem to update/fix things, so I've gone ahead and pushed them to master as c967d1153cae419e4acbe0dbed8f558d95ced0e3. Thanks again, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmMmAfdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xcorw/8DNMVTfxx+MjdciQwLeCh6o6gutWvFYDd +pQFcbzXWzbBaPoLRPLGrUi9LYQby22dbEeNv0IixUq5GfOBRrogcJD34nu39wix a4kh/JIqRmLcleDedBwrfekSamRXgIVT2RC9DEk+7vppdU+YShs9X1nvWK//OCK5 UVtUVzTJSyIHySQHMsJcusL5fBnySMDSPTrIgU4dVifjgr4i+WOMu4rkDpnJP0hP I9Ly8Bjm9RFYpkbrhIBdhME9hkJAw+df1WQuSYhYPRN9sf9VfePkfKalVLnhixe3 unWFQMZG7v3OKk99P/9g2WEkUFh4a8G01cougzfBWaEBjGkieog+rJeN9jyKZvv5 q2awP7VZPuQslCAGjdvzUj+i9xJWoSMJNUMYzHZTQAwXpGYiIyoTa1TT/6FHDrhc 6YDJlmE8Kxz8FTIf2HWLhDl0AAhZW25Ce/Ricx7bDjx0iJg2W6+r1dUl4DWs1SVJ qC4TB9+mn6r2hrYKMRq12OI/op5jS9uFuTeqGXN15x9dymL/QgYNKbH2UFoGLWsX JAxq1RqS/u7q1n/hwBIA+PaZvedizGCCzeoXskMaIe7IK+mNO8oaBPHg4UkwQI1z CekVJL79n9Nzi59U8Cgw541UuSOS2If0S07ql2HKP88i/SALDARoqAzX++s1IyI5 6++xZnENHiI= =Gv/G -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Jun 18 23:18:18 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 16 Oct 2022 11:24:10 +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