From: "Pierre-Henry Fröhring" <contact@phfrohring.com>
To: 57251@debbugs.gnu.org
Cc: "Pierre-Henry Fröhring" <contact@phfrohring.com>
Subject: [bug#57251] [PATCH] gnu: mupdf: Update to 1.20.3.
Date: Wed, 17 Aug 2022 00:31:19 +0200 [thread overview]
Message-ID: <20220816223119.3026859-1-contact@phfrohring.com> (raw)
* Copy/paste is fixed.
The build now uses the patched version of freeglut that is included in the
thirdparty directory so that copy/paste works.
---
gnu/packages/pdf.scm | 127 +++++++++++++++++++++++--------------------
1 file changed, 69 insertions(+), 58 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 39266a2822..f21a30e805 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -731,66 +731,77 @@ (define-public python-pydyf
(define-public mupdf
(package
(name "mupdf")
- (version "1.19.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://mupdf.com/downloads/archive/"
- "mupdf-" version "-source.tar.xz"))
- (sha256
- (base32 "0gl0wf16m1cafs20h3v1f4ysf7zlbijjyd6s1r1krwvlzriwdsmm"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- ;; Remove bundled software.
- (let* ((keep (list "extract"
- "lcms2")) ; different from our lcms2 package
- (from "thirdparty")
- (kept (string-append from "~temp")))
- (mkdir-p kept)
- (for-each (lambda (file)
- (rename-file (string-append from "/" file)
- (string-append kept "/" file)))
- keep)
- (delete-file-recursively from)
- (rename-file kept from))))))
+ (version "1.20.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://mupdf.com/downloads/archive/"
+ "mupdf-" version "-source.tar.lz"))
+ (sha256
+ (base32
+ "0s0qclxxdjis04mczgz0fhfpv0j8llk48g82zlfrk0daz0zgcwvg"))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ (let* ((keep (list "extract" "freeglut" "lcms2"))
+ (from "thirdparty")
+ (kept (string-append from "~temp")))
+ (mkdir-p kept)
+ (for-each (lambda (file)
+ (rename-file (string-append from "/"
+ file)
+ (string-append kept "/"
+ file)))
+ keep)
+ (delete-file-recursively from)
+ (rename-file kept from))))))
(build-system gnu-build-system)
- (inputs
- (list curl
- freeglut
- freetype
- gumbo-parser
- harfbuzz
- jbig2dec
- libjpeg-turbo
- libx11
- libxext
- mujs
- openjpeg
- openssl
- zlib))
- (native-inputs
- (list pkg-config))
+ (inputs (list curl
+ libxrandr
+ libxi
+ freeglut ;for GL/gl.h
+ freetype
+ gumbo-parser
+ harfbuzz
+ jbig2dec
+ libjpeg-turbo
+ libx11
+ libxext
+ mujs
+ openjpeg
+ openssl
+ zlib))
+ (native-inputs (list pkg-config))
(arguments
- (list
- #:tests? #f ; no check target
- #:make-flags
- #~(list "verbose=yes"
- (string-append "CC=" #$(cc-for-target))
- "XCFLAGS=-fpic"
- "USE_SYSTEM_LIBS=yes"
- "USE_SYSTEM_MUJS=yes"
- "shared=yes"
- ;; Even with the linkage patch we must fix RUNPATH.
- (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
- (string-append "prefix=" #$output))
- #:phases
- #~(modify-phases %standard-phases
- (delete 'configure)))) ; no configure script
+ (list #:tests? #f ;no check target
+ #:make-flags #~(list "verbose=yes"
+ (string-append "CC="
+ #$(cc-for-target))
+ "XCFLAGS=-fpic"
+ "USE_SYSTEM_FREETYPE=yes"
+ "USE_SYSTEM_GUMBO=yes"
+ "USE_SYSTEM_HARFBUZZ=yes"
+ "USE_SYSTEM_JBIG2DEC=yes"
+ "USE_SYSTEM_JPEGXR=no # not available"
+ "USE_SYSTEM_LCMS2=no # lcms2mt is strongly preferred"
+ "USE_SYSTEM_LIBJPEG=yes"
+ "USE_SYSTEM_MUJS=no # not available"
+ "USE_SYSTEM_OPENJPEG=yes"
+ "USE_SYSTEM_ZLIB=yes"
+ "USE_SYSTEM_GLUT=no"
+ "USE_SYSTEM_CURL=yes"
+ "USE_SYSTEM_LEPTONICA=yes"
+ "USE_SYSTEM_TESSERACT=yes"
+ "USE_SYSTEM_MUJS=yes"
+ "shared=yes"
+ (string-append "LDFLAGS=-Wl,-rpath="
+ #$output "/lib")
+ (string-append "prefix="
+ #$output))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)))) ;no configure script
(home-page "https://mupdf.com")
(synopsis "Lightweight PDF viewer and toolkit")
(description
- "MuPDF is a C library that implements a PDF and XPS parsing and
+ "MuPDF is a C library that implements a PDF and XPS parsing and
rendering engine. It is used primarily to render pages into bitmaps,
but also provides support for other operations such as searching and
listing the table of contents and hyperlinks.
@@ -799,9 +810,9 @@ (define-public mupdf
line tools for batch rendering @command{pdfdraw}, rewriting files
@command{pdfclean}, and examining the file structure @command{pdfshow}.")
(license (list license:agpl3+
- license:bsd-3 ; resources/cmaps
- license:x11 ; thirdparty/lcms2
- license:silofl1.1 ; resources/fonts/{han,noto,sil,urw}
+ license:bsd-3 ;resources/cmaps
+ license:x11 ;thirdparty/lcms2
+ license:silofl1.1 ;resources/fonts/{han,noto,sil,urw}
license:asl2.0)))) ; resources/fonts/droid
(define-public qpdf
--
2.37.1
next reply other threads:[~2022-08-16 22:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-16 22:31 Pierre-Henry Fröhring [this message]
2022-08-29 15:53 ` bug#57251: [PATCH] gnu: mupdf: Update to 1.20.3 Marius Bakke
[not found] ` <handler.57251.D57251.166178839825428.notifdone@debbugs.gnu.org>
2022-08-29 20:51 ` [bug#57251] closed (Re: [bug#57251] [PATCH] gnu: mupdf: Update to 1.20.3.) Pierre-Henry Fröhring
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=20220816223119.3026859-1-contact@phfrohring.com \
--to=contact@phfrohring.com \
--cc=57251@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).