From unknown Sat Aug 16 15:54:48 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#57251 <57251@debbugs.gnu.org> To: bug#57251 <57251@debbugs.gnu.org> Subject: Status: [PATCH] gnu: mupdf: Update to 1.20.3. Reply-To: bug#57251 <57251@debbugs.gnu.org> Date: Sat, 16 Aug 2025 22:54:48 +0000 retitle 57251 [PATCH] gnu: mupdf: Update to 1.20.3. reassign 57251 guix-patches submitter 57251 Pierre-Henry Fr=C3=B6hring severity 57251 normal tag 57251 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 16 18:31:35 2022 Received: (at submit) by debbugs.gnu.org; 16 Aug 2022 22:31:36 +0000 Received: from localhost ([127.0.0.1]:48582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO55z-0003ai-EF for submit@debbugs.gnu.org; Tue, 16 Aug 2022 18:31:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:50502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO55x-0003aa-7D for submit@debbugs.gnu.org; Tue, 16 Aug 2022 18:31:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO55x-0002lv-0Q for guix-patches@gnu.org; Tue, 16 Aug 2022 18:31:33 -0400 Received: from relay6-d.mail.gandi.net ([2001:4b98:dc4:8::226]:52617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO55u-0004yO-HD for guix-patches@gnu.org; Tue, 16 Aug 2022 18:31:32 -0400 Received: (Authenticated sender: contact@phfrohring.com) by mail.gandi.net (Postfix) with ESMTPSA id 4F400C0007; Tue, 16 Aug 2022 22:31:23 +0000 (UTC) From: =?UTF-8?q?Pierre-Henry=20Fr=C3=B6hring?= To: guix-patches@gnu.org Subject: [PATCH] gnu: mupdf: Update to 1.20.3. Date: Wed, 17 Aug 2022 00:31:19 +0200 Message-Id: <20220816223119.3026859-1-contact@phfrohring.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4b98:dc4:8::226; envelope-from=contact@phfrohring.com; helo=relay6-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, 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.6 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Pierre-Henry=20Fr=C3=B6hring?= 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: -2.6 (--) * 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 29 11:53:18 2022 Received: (at 57251-done) by debbugs.gnu.org; 29 Aug 2022 15:53:18 +0000 Received: from localhost ([127.0.0.1]:33522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSh4g-0006c4-Bt for submit@debbugs.gnu.org; Mon, 29 Aug 2022 11:53:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSh4e-0006bs-PP for 57251-done@debbugs.gnu.org; Mon, 29 Aug 2022 11:53:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSh4Z-0006J0-8q; Mon, 29 Aug 2022 11:53:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ZpcduM0HWa/ml0ssxAMLwaWxxUQ4woNWt4PO9KXZm/4=; b=i36hq5kJ/yzTYhNMgEiL QDJuNzNrGIFitp96LLgVKgKBOxby2fjhn5VOIJYAiTpTVK+/0wH6UYKmWhQRa10V4sRnVUMirizJf ZgHm7vwsgWD+TVoefZoASl9tQjZikxdf971dvTbK0Kft0nZFa5LDIHR58AFXEHIK6g8dUzb9pr+Sl NSk37y8JBJ0dWEZ5NGW1XwzR+IbeO7jTa2k+z+tPoWz6xWDVQ8nxYQTyzHd7pXCrUy7opfcB15C9K VuR+8KoiRhtA/iBleQHIz8P+0y+aYfMwFxs9iN1VNRlrhzAUCr7j6ySgEZfYUYVUoisYKmnXGivHe SWEJxnoulUqMKw==; Received: from [84.214.173.6] (port=40580 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSh4Y-0006Ha-Ru; Mon, 29 Aug 2022 11:53:11 -0400 From: Marius Bakke To: Pierre-Henry =?utf-8?Q?Fr=C3=B6hring?= , 57251-done@debbugs.gnu.org Subject: Re: [bug#57251] [PATCH] gnu: mupdf: Update to 1.20.3. In-Reply-To: <20220816223119.3026859-1-contact@phfrohring.com> References: <20220816223119.3026859-1-contact@phfrohring.com> Date: Mon, 29 Aug 2022 17:53:08 +0200 Message-ID: <87czcjdp23.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 57251-done Cc: Pierre-Henry =?utf-8?Q?Fr=C3=B6hring?= 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: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pierre-Henry Fr=C3=B6hring skriver: > * 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. Pushed as f26b9d5ced516343d0c6bb8534d2043f34b7ddd7! I filled in the commit message for you. In future patches, please list what changes are done in the various fields (snippet, arguments) etc. See the commit log for inspiration. I also (mostly) reverted the indentation changes to make it easier to see what went on in the patch. Feel free to submit it separately. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYwzg5A8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHf7xwEA2dkp9susJ1WYNW2QLvN/xbuipacmt56fB4HW rpQ9h1YBAJIUE8lOo1q7d+HbHVEIHlAR5MjOgp/ivQkO6h1WMaMH =8gWM -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 29 17:42:01 2022 Received: (at 57251) by debbugs.gnu.org; 29 Aug 2022 21:42:01 +0000 Received: from localhost ([127.0.0.1]:34071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSmW5-0007FT-S0 for submit@debbugs.gnu.org; Mon, 29 Aug 2022 17:42:01 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:55523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSlmy-00065b-H4 for 57251@debbugs.gnu.org; Mon, 29 Aug 2022 16:55:21 -0400 Received: (Authenticated sender: contact@phfrohring.com) by mail.gandi.net (Postfix) with ESMTPSA id AB270100002 for <57251@debbugs.gnu.org>; Mon, 29 Aug 2022 20:55:13 +0000 (UTC) References: <87czcjdp23.fsf@gnu.org> <20220816223119.3026859-1-contact@phfrohring.com> User-agent: mu4e 1.8.9; emacs 28.1 From: Pierre-Henry =?utf-8?Q?Fr=C3=B6hring?= To: 57251@debbugs.gnu.org Subject: Re: bug#57251: closed (Re: [bug#57251] [PATCH] gnu: mupdf: Update to 1.20.3.) Date: Mon, 29 Aug 2022 22:51:37 +0200 In-reply-to: Message-ID: <87zgfmvkgq.fsf@phfrohring.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57251 X-Mailman-Approved-At: Mon, 29 Aug 2022 17:41:56 -0400 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.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Marius, > I filled in the commit message for you. In future patches, please > list what changes are done in the various fields (snippet, arguments) > etc. See the commit log for inspiration. I also (mostly) reverted > the indentation changes to make it easier to see what went on in the > patch. Feel free to submit it separately. Great. I included these remarks into our little guide about building packages. Thanks! =E2=80=94 Pierre-Henry Fr=C3=B6hring =E2=80=94 GPG signing key: 4E452C9CA3456D9BF5CD2DA09856B12E14312667 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRORSyco0Vtm/XNLaCYVrEuFDEmZwUCYw0npQAKCRCYVrEuFDEm Z6XkAP9etyQzb0IKSj7YEaHtDRxwb+on9SigcwPzFqeGI78BBQD/azMH+/p/Vzkw QQ3VeWpDhZLlcUlAN9izqFKYSOn1mAY= =QUrA -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 16 15:54:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 27 Sep 2022 11:24:05 +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