unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Paul A. Patience" <paul@apatience.com>
To: 57685@debbugs.gnu.org
Cc: "Paul A. Patience" <paul@apatience.com>
Subject: [bug#57685] [PATCH v2 1/3] gnu: libharu: Update to 2.4.2.
Date: Mon, 12 Sep 2022 19:25:32 +0000	[thread overview]
Message-ID: <20220912192510.420112-2-paul@apatience.com> (raw)
In-Reply-To: <20220912192510.420112-1-paul@apatience.com>

* 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 © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
 ;;;
 ;;; 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="
-                           (assoc-ref %build-inputs "zlib"))
-            (string-append "--with-png="
-                           (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 DESTINATION .*\\)"
+                      _ 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






  reply	other threads:[~2022-09-12 19:26 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-08 19:51 [bug#57685] [PATCH] gnu: libharu: Update to 2.4.1 Paul A. Patience
2022-09-10  9:55 ` Christopher Baines
2022-09-12 19:25 ` [bug#57685] [PATCH v2 0/3] gnu: libharu: Update to 2.4.2 Paul A. Patience
2022-09-12 19:25   ` Paul A. Patience [this message]
2022-09-12 19:25   ` [bug#57685] [PATCH v2 2/3] gnu: saga: Fix build with newer libHaru Paul A. Patience
2022-09-12 19:25   ` [bug#57685] [PATCH v2 3/3] gnu: vtk: Use system libHaru Paul A. Patience
2022-09-17 17:20   ` bug#57685: [PATCH v2 0/3] gnu: libharu: Update to 2.4.2 Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220912192510.420112-2-paul@apatience.com \
    --to=paul@apatience.com \
    --cc=57685@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).