Maxim Cournoyer <maxim.cournoyer@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.Received: (at 78401) by debbugs.gnu.org; 16 May 2025 14:51:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 16 10:51:18 2025 Received: from localhost ([127.0.0.1]:39689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uFwP7-0004JS-E7 for submit <at> debbugs.gnu.org; Fri, 16 May 2025 10:51:18 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:50428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1uFwOt-0004GB-9z for 78401 <at> debbugs.gnu.org; Fri, 16 May 2025 10:51:09 -0400 Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-b26ee6be1ecso587070a12.0 for <78401 <at> debbugs.gnu.org>; Fri, 16 May 2025 07:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747407056; x=1748011856; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=H/XMLAwlXy4VgpkQ0oXEMWPdKaxiqTehzTVkGTd8kHY=; b=B4XIQmHEdQ8LMzacJnh/cDobijOrXQqD3+etZML4dgWtdMAFLbw69Io81FWAGCl/hH 7q6bFdqZIQpUYAgxfy63C1AkCJ/YnH0XyOeG9ujMKE/aZoSqxi0QQf/kuOExuN9uwBf2 44Y/MtIKsE74g/PKEyELZ31YtwKNk52hXDlM/XNOEkhc7nW7ywCH3LhK1UeZqsU5hpsZ q04wo9jwqvf1NsCOvz2T5LjYuT7U3QGDwdjU42H7IApwDWjLHhLdM8NesThWop9tnN5/ P4gemP+P5o1qJiYLZBd4/GpUNzyZsLRuAHZNDXhe5RVrADixI2088RVjf2vRzxZv+349 VUDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747407056; x=1748011856; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=H/XMLAwlXy4VgpkQ0oXEMWPdKaxiqTehzTVkGTd8kHY=; b=DtPSrV59uNaa0luKPhoHLP2ej1MMUWuaSEM19HOtaWM6Pp2CCxBYk82Q6bYTrjScBE 1cDVl9Qb7/0DF/xvqGgjebhTG0SwG8G7UPmGBCoGd2LnUOy6jR33/VfseuKX8UjwGohk 5B0y+JmTC1DBlpdTz/FZDEFPflfg5pRmkPR4IOSrhTVDHCDZfLoKQ7pjBRrSR5CsJLbL hpm/fYl8ozzJLoO8vv/5BJ+WKgcE6tg4Ag4vR67NlOyiw3ruJKatK7urMwhIvkcELsZ3 GFDFaHOQdKor2ylwgqe0YUSLHxVcwCkvzwpyzGvJpHpI7J/y8MCOs/wxBVFl+8f76i3T i1iw== X-Gm-Message-State: AOJu0Yyzanj6oZBCoPeGe9KSv9Jc7DVJ7rWKtNk3BmG7R2srjdY+RsXE NjwA+sIUgWRQIiRo9UtWZkzv8zkGB7Md7IkFbYCU7klRdsahnQjkQiRItSjOvQ== X-Gm-Gg: ASbGncu1iAQJ7zdRD1gZQrnwmi/Dr8oS1sSowmwzaoctuYs9OAaAIj2yuieYLrsvFbP UHGYRxP04WIndfKSdjYGWL9E2SFLio+1bba8vp+xOEo3ZYJnjI3rkstiOebPk9LkE0oCG6y32HU uNMbEMAbOmRIY/a/U+lgI8eV28rF3gzbgk5MovX1YjV+XdhVpAaoz1YwA0ZO3HsDSONBQ71o4SO VCg8kt8P+FuPDe2512X7EwFYLuHin3EyfRsJAHgDJNyvCo+5VbFpergkuNwh42k2pCSaMXQIxkz fCZxeMoZjJNlVcF26QTPnPVqIOfHIC8CK4YL8u8ZbaWZHr1xAw== X-Google-Smtp-Source: AGHT+IFgfEs8/QDSwZ6Z+m/Hw41JKcm+RS9VgGNyHlYfKSYVWQZjz1l0PVSnIDgSX8lqIKfzPPaxEQ== X-Received: by 2002:a17:902:e78b:b0:231:c992:3722 with SMTP id d9443c01a7336-231de35fea0mr33650335ad.16.1747407056414; Fri, 16 May 2025 07:50:56 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebac32sm15176845ad.170.2025.05.16.07.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 May 2025 07:50:55 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Divya Ranjan <divya@HIDDEN> Subject: Re: [bug#78401] [PATCH] gnu: mupdf: Update to 1.26.0., [PATCH] gnu: mupdf: Update to 1.26.0., [PATCH] gnu: mupdf: Modify #:make-flags In-Reply-To: <87sel52i8k.fsf@HIDDEN> (Divya Ranjan's message of "Fri, 16 May 2025 06:16:11 +0000") References: <ac3d2cd080bc79c2d0790c5b35f3957b18646b25.1747104615.git.divya@HIDDEN> <871psrmh3l.fsf@HIDDEN> <87sel52i8k.fsf@HIDDEN> Date: Fri, 16 May 2025 23:50:53 +0900 Message-ID: <87wmagfw36.fsf_-_@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78401 Cc: 78401 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Divya, Divya Ranjan <divya@HIDDEN> writes: [...] >>> * gnu/packages/pdf.scm (mupdf): Update to 1.26.0. >> >> Various changes done here are not listed in the change log. Please >> consult other commits for examples or (info "(standards) Style of Change >> Logs"). > > Please find the updated patch with the indentation and commit message fixed. Thanks for you efforts, but the change log is still missing many entries. It should list for example every input added or remove, every configure flag added or removed, every phase added or removed, etc. For some examples, you can install the 'standards' package and consult (info "(standards) Style of Change Logs"), or simply read examples through 'git log'. While the whitespace is fixed in v2, it seems you ran the package through 'guix style', which sadly is not always optimal and adds noise to the diff. Could you please keep this commit to just modify what's needed? Thanks for the explanations, it makes sense! Could you please send a v3 with the cosmetic changes reverted and the change log expound again? -- Thanks, Maxim
guix-patches@HIDDEN:bug#78401; Package guix-patches.
Full text available.
Received: (at 78401) by debbugs.gnu.org; 16 May 2025 06:16:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 16 02:16:27 2025
Received: from localhost ([127.0.0.1]:32832 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uFoMp-0002Zu-5x
for submit <at> debbugs.gnu.org; Fri, 16 May 2025 02:16:27 -0400
Received: from latitanza.investici.org ([82.94.249.234]:61931)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <divya@HIDDEN>)
id 1uFoMk-0002Ys-Cv
for 78401 <at> debbugs.gnu.org; Fri, 16 May 2025 02:16:21 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subvertising.org;
s=stigmate; t=1747376176;
bh=DtqGRMT4UANbqSf+pYmLr5K8m8zxl/uOKKYgLAL4kGg=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=szSTU79A1+NPz2uD5D6J/fU5jiiEM9ZP9dfJpLRRFIPBth977kFIUvisBxG+ksOsf
SuUwYsIRFeKIss55MQuzgw/v+xNSUCpa/NcXL2y8luQzslwUoJcke1Q+dP89gyZl9j
mWaSAQF4oocths3D5yc4mBai0Q1CgcIiM39RCOxM=
Received: from mx3.investici.org (unknown [127.0.0.1])
by latitanza.investici.org (Postfix) with ESMTP id 4ZzH0058pNzGpjq;
Fri, 16 May 2025 06:16:16 +0000 (UTC)
Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234])
(Authenticated sender: divya@HIDDEN) by localhost (Postfix) with
ESMTPSA id 4ZzGzz6XzvzGpjp; Fri, 16 May 2025 06:16:15 +0000 (UTC)
From: Divya Ranjan <divya@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#78401] [PATCH] gnu: mupdf: Update to 1.26.0.
In-Reply-To: <871psrmh3l.fsf@HIDDEN> (Maxim Cournoyer's message of "Wed, 14
May 2025 22:55:58 +0900")
References: <ac3d2cd080bc79c2d0790c5b35f3957b18646b25.1747104615.git.divya@HIDDEN>
<871psrmh3l.fsf@HIDDEN>
Date: Fri, 16 May 2025 06:16:11 +0000
Message-ID: <87sel52i8k.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 78401
Cc: 78401 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes:
> Hi,
Hello Maxim,
> Divya Ranjan <divya@HIDDEN> writes:
>
>> * gnu/packages/pdf.scm (mupdf): Update to 1.26.0.
>
> Various changes done here are not listed in the change log. Please
> consult other commits for examples or (info "(standards) Style of Change
> Logs").
Please find the updated patch with the indentation and commit message fixed.
--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline; filename=0001-gnu-mupdf-Update-to-1.26.0.patch
Content-Transfer-Encoding: quoted-printable
From 77c6b79a43a2cd7982d417e5373c55af1b13fcd5 Mon Sep 17 00:00:00 2001
Message-ID: <77c6b79a43a2cd7982d417e5373c55af1b13fcd5.1747375422.git.divya@=
subvertising.org>
From: Divya Ranjan <divya@HIDDEN>
Date: Fri, 16 May 2025 05:58:06 +0000
Subject: [PATCH] gnu: mupdf: Update to 1.26.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=3DUTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/pdf.scm (mupdf): Update to 1.26.0.
[inputs]: Add brotli
[arguments]: Build using system=E2=80=99s brotli
[arguments]: Enable SONAME to avoid symlink conflicts
Change-Id: I6dc7f08f9e21d6d5233e3fb7b886037c9d912ec7
---
gnu/packages/pdf.scm | 63 +++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index a1c9da2c8a..c8c636976a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -862,14 +862,14 @@ (define-public python-pydyf
(define-public mupdf
(package
(name "mupdf")
- (version "1.25.2")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
- (uri (string-append "https://mupdf.com/downloads/archive/"
- "mupdf-" version "-source.tar.lz"))
+ (uri (string-append "https://mupdf.com/downloads/archive/" "mupdf-"
+ version "-source.tar.lz"))
(sha256
- (base32 "0lg45wp3ici2g2i49fmwa1k32bgkqqgl51nxnqqk0i8ilmdh8hnx"))
+ (base32 "1nncar9w0qdpwp4s00nazr7hbl2kpbp665a6gwpsmdz5d7j1hqz9"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
@@ -882,31 +882,32 @@ (define-public mupdf
(scandir ".")
(cons* "." ".." keep))))))))
(build-system gnu-build-system)
- (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))
+ (inputs (list curl
+ libxrandr
+ libxi
+ freeglut ;for GL/gl.h
+ freetype
+ gumbo-parser
+ harfbuzz
+ jbig2dec
+ libjpeg-turbo
+ libx11
+ libxext
+ mujs
+ brotli
+ openjpeg
+ openssl
+ zlib))
+ (native-inputs (list pkg-config))
(arguments
(list
- #:tests? #f ;no check target
+ #:tests? #f ;no check target
#:make-flags
#~(list "verbose=3Dyes"
- (string-append "CC=3D" #$(cc-for-target))
+ (string-append "CC=3D"
+ #$(cc-for-target))
"XCFLAGS=3D-fpic"
+ "USE_SYSTEM_BROTLI=3Dyes"
"USE_SYSTEM_FREETYPE=3Dyes"
"USE_SYSTEM_GUMBO=3Dyes"
"USE_SYSTEM_HARFBUZZ=3Dyes"
@@ -921,10 +922,12 @@ (define-public mupdf
"USE_SYSTEM_CURL=3Dyes"
"USE_SYSTEM_LEPTONICA=3Dyes"
"USE_SYSTEM_TESSERACT=3Dyes"
- "USE_SONAME=3Dno" ;install as libmupdf.so
+ "USE_SONAME=3Dyes"
"shared=3Dyes"
- (string-append "LDFLAGS=3D-Wl,-rpath=3D" #$output "/lib")
- (string-append "prefix=3D" #$output))
+ (string-append "LDFLAGS=3D-Wl,-rpath=3D"
+ #$output "/lib")
+ (string-append "prefix=3D"
+ #$output))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)))) ;no configure script
@@ -940,9 +943,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
=20
(define-public mupdf-1.24 ; Needed for sioyek
base-commit: efac01f19b65d7d77a98bbfd57fe2073fb13064a
--=20
2.49.0
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
>
>> (modules '((guix build utils)
>> (ice-9 ftw)
>> (srfi srfi-1)))
>> @@ -895,6 +895,7 @@ (define-public mupdf
>> libx11
>> libxext
>> mujs
>> + brotli
>
> Is this strictly needed for the update? Otherwise, it'd be best done in
> a distinct, separated commit.
Indeed, it is a new dependency with the update.
>
>> openjpeg
>> openssl
>> zlib))
>> @@ -907,6 +908,7 @@ (define-public mupdf
>> #~(list "verbose=3Dyes"
>> (string-append "CC=3D" #$(cc-for-target))
>> "XCFLAGS=3D-fpic"
>> + "USE_SYSTEM_BROTLI=3Dyes"
>
> I assume that's necessary and not something the build system
> automatically tries? If the later, do not explicit it (it makes inputs
> rewriting less useful).
Indeed, the build system doesn=E2=80=99t do that with USE_SYSTEM_LIBS=3Dyes.
>> "USE_SYSTEM_FREETYPE=3Dyes"
>> "USE_SYSTEM_GUMBO=3Dyes"
>> "USE_SYSTEM_HARFBUZZ=3Dyes"
>> @@ -921,7 +923,7 @@ (define-public mupdf
>> "USE_SYSTEM_CURL=3Dyes"
>> "USE_SYSTEM_LEPTONICA=3Dyes"
>> "USE_SYSTEM_TESSERACT=3Dyes"
>> - "USE_SONAME=3Dno" ;install as libmupdf.so
>> + "USE_SONAME=3Dyes"
>
Without enabling that, one runs in to "Too many levels of symbolic links" e=
rrors. This is due to a recent change in mupdf upstream that updated their =
symbol table for the library. I was part of the changes made for this, and =
the devs agree that USE_SONAME should be enabled. Here=E2=80=99s the backtr=
ace with USE_SONAME=3Dyes:
error: in phase 'validate-runpath': uncaught exception:
system-error "open-file" "~A: ~S" ("Too many levels of symbolic links" "/gn=
u/store/j6r6rgvmmm59a8i7vh330c7bpxmgicma-mupdf-1.26.0/lib/libmupdf.so") (40=
)=20
phase `validate-runpath' failed after 0.0 seconds
Backtrace:
13 (primitive-load "/gnu/store/304wldk8xn5xd2cnpvr66lbkn82=E2=80=
=A6")
In guix/build/gnu-build-system.scm:
966:2 12 (gnu-build #:source _ #:outputs _ #:inputs _ #:phases . #)
In ice-9/boot-9.scm:
1752:10 11 (with-exception-handler _ _ #:unwind? _ # _)
In srfi/srfi-1.scm:
634:9 10 (for-each #<procedure 7fffef021240 at guix/build/gnu-b=E2=80=
=A6> =E2=80=A6)
In ice-9/boot-9.scm:
1752:10 9 (with-exception-handler _ _ #:unwind? _ # _)
In guix/build/gnu-build-system.scm:
987:23 8 (_)
605:16 7 (validate-runpath #:validate-runpath? _ # _ #:outputs _)
In guix/build/utils.scm:
735:23 6 (loop ("/gnu/store/j6r6rgvmmm59a8i7vh330c7bpxmgicma=E2=80=A6" =
=E2=80=A6) =E2=80=A6)
In guix/build/gnu-build-system.scm:
587:36 5 (validate "/gnu/store/j6r6rgvmmm59a8i7vh330c7bpxmgicma-=E2=80=
=A6")
In guix/build/utils.scm:
549:10 4 (find-files "/gnu/store/j6r6rgvmmm59a8i7vh330c7bpxmgic=E2=80=
=A6" =E2=80=A6)
In ice-9/ftw.scm:
505:39 3 (loop _ _ #(25 88653728 16877 1 999 30000 0 22 # # # =E2=80=A6=
) =E2=80=A6)
In guix/build/utils.scm:
551:34 2 (_ "/gnu/store/j6r6rgvmmm59a8i7vh330c7bpxmgicma-mupdf-=E2=80=
=A6" =E2=80=A6)
In ice-9/boot-9.scm:
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure open-file: Too many levels of symbolic links: "/gnu/store/j6r6=
rgvmmm59a8i7vh330c7bpxmgicma-mupdf-1.26.0/lib/libmupdf.so"
build process 18 exited with status 256
Also, I don=E2=80=99t want to open another bug report, but enabling SONAME =
breaks sioyek which depends on mupdf-1.24. Since the latter inherits from m=
updf, thus also inheriting USE_SONAME=3Dyes, it breaks sioyek that relies o=
n having it disabled.
I=E2=80=99ve attached another patch that specifically disables SONAME for m=
updf-1.24, allowing sioyek to build fine as usual.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=0001-gnu-mupdf-Modify-make-flags.patch
From 9e57a2805db3f870e5c0edc0d13eba308b0827a3 Mon Sep 17 00:00:00 2001
Message-ID: <9e57a2805db3f870e5c0edc0d13eba308b0827a3.1747375463.git.divya@HIDDEN>
From: Divya Ranjan <divya@HIDDEN>
Date: Fri, 16 May 2025 06:01:18 +0000
Subject: [PATCH] gnu: mupdf: Modify #:make-flags
[arguments]: Disable SONAME
Change-Id: I070c59100ffedf9c451a7ce344ae6e210f1190f6
---
gnu/packages/pdf.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c8c636976a..25a3f84533 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -948,7 +948,8 @@ (define-public mupdf
license:silofl1.1 ;resources/fonts/{han,noto,sil,urw}
license:asl2.0)))) ; resources/fonts/droid
-(define-public mupdf-1.24 ; Needed for sioyek
+(define-public mupdf-1.24
+ ;Needed for sioyek
(package
(inherit mupdf)
(name "mupdf")
@@ -956,8 +957,8 @@ (define-public mupdf-1.24 ; Needed for sioyek
(source
(origin
(method url-fetch)
- (uri (string-append "https://mupdf.com/downloads/archive/"
- "mupdf-" version "-source.tar.lz"))
+ (uri (string-append "https://mupdf.com/downloads/archive/" "mupdf-"
+ version "-source.tar.lz"))
(sha256
(base32 "0hydmp8sdnkrkpqyysa6klkxbwv9awf1xc753r27gcj7ds7375fj"))
(modules '((guix build utils)
@@ -970,7 +971,14 @@ (define-public mupdf-1.24 ; Needed for sioyek
(for-each delete-file-recursively
(lset-difference string=?
(scandir ".")
- (cons* "." ".." keep))))))))))
+ (cons* "." ".." keep))))))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments mupdf)
+ ((#:make-flags flags)
+ #~(append (filter (lambda (flag)
+ (not (string-prefix? "USE_SONAME=" flag)))
+ #$flags)
+ (list "USE_SONAME=no")))))))
(define-public qpdf
base-commit: efac01f19b65d7d77a98bbfd57fe2073fb13064a
prerequisite-patch-id: e0b65c11f00f64b0496909046ee872884b87653c
--
2.49.0
--=-=-=
Content-Type: text/plain
--
Divya Ranjan,
Philosophy, Mathematics, Libre Software.
PGP Fingerprint: F0B3 1A69 8006 8FB8 096A 2F12 B245 10C6 108C 8D4A
--=-=-=--
guix-patches@HIDDEN:bug#78401; Package guix-patches.
Full text available.Received: (at 78401) by debbugs.gnu.org; 14 May 2025 13:56:14 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 14 09:56:13 2025 Received: from localhost ([127.0.0.1]:43841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uFCaj-0007nb-EU for submit <at> debbugs.gnu.org; Wed, 14 May 2025 09:56:13 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:44486) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1uFCae-0007fE-D8 for 78401 <at> debbugs.gnu.org; Wed, 14 May 2025 09:56:10 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-30a8cfa713fso6425378a91.1 for <78401 <at> debbugs.gnu.org>; Wed, 14 May 2025 06:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747230962; x=1747835762; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=CfyTvmxng9rrFSJzewgrL2tawcvUCtvQmOVNJZ7T6z4=; b=dlAbxLZ7FmpjqAHiS88S5vE4RQ7/gplTBLPNxsyDxRXEZKgSICrDdisczwEOHhwAcQ iDiNzqFG+oQW2YrJyErCMnPe9XQk2fhL0KfaaLSaalWovuCP2wH9pnlbPGCphWNsqQTH y4e6TZyX5Us8jhvIq/skSxecDVU7D1TNPwyB6xjbz8U5YULv7JQLTUyGELa9eGn3JN0i D69uKK8HBWYrGCKKbvEUZIt0M7VMPNpDsliMz7W64toRGnjdRNutHgFf2mzGVAisr5WC 3xbukXOoKKDW222svxRLPUEnqF9uqkXpsUB8RFZuRXwB6pr41Xv9ekt5e2kVZfamMU5L jzNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747230962; x=1747835762; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CfyTvmxng9rrFSJzewgrL2tawcvUCtvQmOVNJZ7T6z4=; b=A5jZLMRqUClRWjqFVtPmCeW36GWG4Lh6Yad5Zg7nyl2m0WdC3ce76x2IutCxIjcOU4 IvPa2oBebAMcZ+/vP4nFWqanQ8w2je/SvEmh673ZMoVJOsHp40AbMsHYd2jt29cpGl2z F6b6ESu/5TeyzUZKHctPHZOOxp+tuFCjkxBMr5qSbvV4vH6l99Wzgsa470AaNw+qQoL3 YYrgccV+OK2xd2Z6/SqeHfDnY1wJQy+ubJcjkGnT3gh23de177hodYh7dFbC40VBiOWU JtM8GERKx9uFxjVv6CT5Tpb3/yyH/KoMF0JnemR7yOpGSIh0SX0Q+Qspy+sAXgCVoCDM Gbmw== X-Gm-Message-State: AOJu0YzkoYTJ+l6ltWws+vWJvnwltRIE2Y69YwClQzckET1yLxtBxAv6 D1/YrLy5ojidlfwNv9D6xeRZnBiQIrSrF0IJDKmaDvrDgetb3flCAUQjjQ== X-Gm-Gg: ASbGnct77Fpt8VuRbZpAxqIynkhO8jvzbBn/531pCFHzOtrP/O0EETpP/IW7HE6w5wr ifLmJHSWxcCWgUwnehak1a1WPOwlAAGBpNUxHFJMNCldGtXkUn6xcv16Pp16VQZbbugGzVUrhGF dwq88mXUblrsTgCQRhPwrzjstUqj2hwbfPSgDUHEqTUxFrW6+weWxye3n6/iCr/39Turw4h2byb BSgyvhjLFKBZrX3+YG3PfhIzUCdD/+TOwD1j1nrkV3i2mq+lufyEA1eN9+nf5/ia4gDegRu8Tib 5qo8Gy9t0BJbNoJMzgP5q6ONQakxQtOOAEC6P+L9nl0+liew0g== X-Google-Smtp-Source: AGHT+IE+L/BbtM9ZFkl8pIosQEmMkJmuCL5Aa+cwI8QAW/uZswtZgbtfgFqoOaxqFOBI5BPYGovdww== X-Received: by 2002:a17:90a:e7c6:b0:2fe:a8b1:7d8 with SMTP id 98e67ed59e1d1-30e2e65e722mr5582321a91.25.1747230961555; Wed, 14 May 2025 06:56:01 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30e3347e87fsm1560367a91.31.2025.05.14.06.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 06:56:01 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Divya Ranjan <divya@HIDDEN> Subject: Re: [bug#78401] [PATCH] gnu: mupdf: Update to 1.26.0. In-Reply-To: <ac3d2cd080bc79c2d0790c5b35f3957b18646b25.1747104615.git.divya@HIDDEN> (Divya Ranjan's message of "Tue, 13 May 2025 02:52:58 +0000") References: <ac3d2cd080bc79c2d0790c5b35f3957b18646b25.1747104615.git.divya@HIDDEN> Date: Wed, 14 May 2025 22:55:58 +0900 Message-ID: <871psrmh3l.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78401 Cc: 78401 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Divya Ranjan <divya@HIDDEN> writes: > * gnu/packages/pdf.scm (mupdf): Update to 1.26.0. Various changes done here are not listed in the change log. Please consult other commits for examples or (info "(standards) Style of Change Logs"). > Change-Id: I9b650356c8f6cbb36008c1956a59f4dd99c8d964 > --- > gnu/packages/pdf.scm | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm > index a1c9da2c8a..91d47a74e3 100644 > --- a/gnu/packages/pdf.scm > +++ b/gnu/packages/pdf.scm > @@ -862,14 +862,14 @@ (define-public python-pydyf > (define-public mupdf > (package > (name "mupdf") > - (version "1.25.2") > + (version "1.26.0") > (source > (origin > (method url-fetch) > (uri (string-append "https://mupdf.com/downloads/archive/" > "mupdf-" version "-source.tar.lz")) > (sha256 > - (base32 "0lg45wp3ici2g2i49fmwa1k32bgkqqgl51nxnqqk0i8ilmdh8hnx")) > + (base32 "1nncar9w0qdpwp4s00nazr7hbl2kpbp665a6gwpsmdz5d7j1hqz9")) Extraneous whitespace inserted. > (modules '((guix build utils) > (ice-9 ftw) > (srfi srfi-1))) > @@ -895,6 +895,7 @@ (define-public mupdf > libx11 > libxext > mujs > + brotli Is this strictly needed for the update? Otherwise, it'd be best done in a distinct, separated commit. > openjpeg > openssl > zlib)) > @@ -907,6 +908,7 @@ (define-public mupdf > #~(list "verbose=yes" > (string-append "CC=" #$(cc-for-target)) > "XCFLAGS=-fpic" > + "USE_SYSTEM_BROTLI=yes" I assume that's necessary and not something the build system automatically tries? If the later, do not explicit it (it makes inputs rewriting less useful). > "USE_SYSTEM_FREETYPE=yes" > "USE_SYSTEM_GUMBO=yes" > "USE_SYSTEM_HARFBUZZ=yes" > @@ -921,7 +923,7 @@ (define-public mupdf > "USE_SYSTEM_CURL=yes" > "USE_SYSTEM_LEPTONICA=yes" > "USE_SYSTEM_TESSERACT=yes" > - "USE_SONAME=no" ;install as libmupdf.so > + "USE_SONAME=yes" What is the rational for the above change? -- Thanks, Maxim
guix-patches@HIDDEN:bug#78401; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 13 May 2025 02:53:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 12 22:53:38 2025
Received: from localhost ([127.0.0.1]:56433 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uEflx-0002jy-MP
for submit <at> debbugs.gnu.org; Mon, 12 May 2025 22:53:38 -0400
Received: from lists.gnu.org ([2001:470:142::17]:48408)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <divya@HIDDEN>)
id 1uEflv-0002jg-27
for submit <at> debbugs.gnu.org; Mon, 12 May 2025 22:53:35 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <divya@HIDDEN>)
id 1uEflp-0000FB-5N
for guix-patches@HIDDEN; Mon, 12 May 2025 22:53:29 -0400
Received: from latitanza.investici.org ([2001:888:2000:56::19])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <divya@HIDDEN>)
id 1uEflm-0001fP-43
for guix-patches@HIDDEN; Mon, 12 May 2025 22:53:28 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=subvertising.org;
s=stigmate; t=1747104794;
bh=Gzzaf8c3PKQ4chMHsSHM3U1XvGW+k57E0RD4iBCvkB4=;
h=From:To:Cc:Subject:Date:From;
b=Qvelho/cz+Nq9DGmCSwnxiJjrNutAlaUdO26er9Yc8WETv8Y68Vy0TpoD98uLuGre
n3xGrcW8vMTvlwdLNUaJt3pGNcbdjMnzPcWF5hucwgUbAsrBkjSp/4fPXN1osIdvmY
d8GN4hgTGVxatuBq89EqKefwArNCgs91E7JVHE2E=
Received: from mx3.investici.org (unknown [127.0.0.1])
by latitanza.investici.org (Postfix) with ESMTP id 4ZxLd61d2RzGpKJ;
Tue, 13 May 2025 02:53:14 +0000 (UTC)
Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234])
(Authenticated sender: divya@HIDDEN) by localhost (Postfix) with
ESMTPSA id 4ZxLd54GzgzGpKD; Tue, 13 May 2025 02:53:13 +0000 (UTC)
From: Divya Ranjan <divya@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: mupdf: Update to 1.26.0.
Date: Tue, 13 May 2025 02:52:58 +0000
Message-ID: <ac3d2cd080bc79c2d0790c5b35f3957b18646b25.1747104615.git.divya@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2001:888:2000:56::19;
envelope-from=divya@HIDDEN; helo=latitanza.investici.org
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 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,
RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Divya Ranjan <divya@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* gnu/packages/pdf.scm (mupdf): Update to 1.26.0.
Change-Id: I9b650356c8f6cbb36008c1956a59f4dd99c8d964
---
gnu/packages/pdf.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index a1c9da2c8a..91d47a74e3 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -862,14 +862,14 @@ (define-public python-pydyf
(define-public mupdf
(package
(name "mupdf")
- (version "1.25.2")
+ (version "1.26.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://mupdf.com/downloads/archive/"
"mupdf-" version "-source.tar.lz"))
(sha256
- (base32 "0lg45wp3ici2g2i49fmwa1k32bgkqqgl51nxnqqk0i8ilmdh8hnx"))
+ (base32 "1nncar9w0qdpwp4s00nazr7hbl2kpbp665a6gwpsmdz5d7j1hqz9"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
@@ -895,6 +895,7 @@ (define-public mupdf
libx11
libxext
mujs
+ brotli
openjpeg
openssl
zlib))
@@ -907,6 +908,7 @@ (define-public mupdf
#~(list "verbose=yes"
(string-append "CC=" #$(cc-for-target))
"XCFLAGS=-fpic"
+ "USE_SYSTEM_BROTLI=yes"
"USE_SYSTEM_FREETYPE=yes"
"USE_SYSTEM_GUMBO=yes"
"USE_SYSTEM_HARFBUZZ=yes"
@@ -921,7 +923,7 @@ (define-public mupdf
"USE_SYSTEM_CURL=yes"
"USE_SYSTEM_LEPTONICA=yes"
"USE_SYSTEM_TESSERACT=yes"
- "USE_SONAME=no" ;install as libmupdf.so
+ "USE_SONAME=yes"
"shared=yes"
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
(string-append "prefix=" #$output))
@@ -945,7 +947,7 @@ (define-public mupdf
license:silofl1.1 ;resources/fonts/{han,noto,sil,urw}
license:asl2.0)))) ; resources/fonts/droid
-(define-public mupdf-1.24 ; Needed for sioyek
+(define-public mupdf-1.24 ; Needed for sioyek
(package
(inherit mupdf)
(name "mupdf")
base-commit: 364694773ef1c61d4c9ec73e24f73642786486ca
--
2.49.0
Divya Ranjan <divya@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#78401; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.