From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: TeX Live 2019 wanted Date: Mon, 16 Dec 2019 21:38:26 +0100 Message-ID: <87tv60c8fx.fsf@devup.no> References: <871rt6enh0.fsf@devup.no> <20191216185714.GA6488@jurong> <20191216194950.GA8280@jurong> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:33674) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igx8U-0005hM-6A for guix-devel@gnu.org; Mon, 16 Dec 2019 15:38:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igx8S-0008Sd-L3 for guix-devel@gnu.org; Mon, 16 Dec 2019 15:38:33 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:58115) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1igx8S-0008Mg-8N for guix-devel@gnu.org; Mon, 16 Dec 2019 15:38:32 -0500 In-Reply-To: <20191216194950.GA8280@jurong> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Andreas Enge Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Andreas Enge writes: > I gave it a try, dropped the patches, then the phase use-code-for-new-poppler > fails for texlive-bin; maybe these poppler phases can be dropped, but I am > not quite familiar with them. The 'use-code-for-new-poppler' phase needs to be rewritten along these lines (for both 2018 and 2019): --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=diff Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d184d7616b..9184bd1552 100644 =2D-- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -238,6 +238,15 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-S= YSTEM is used." (sha256 (base32 "1b8zigzg8raxkhhzphcmynf84rbdbj2ym2qkz24v8n0qx82zmqms")))) =20 +(define (texlive-svn-file name revision hash) + (origin + (method url-fetch) + (uri (string-append "https://tug.org/svn/texlive/trunk/Build/source/" + name "?revision=3D" revision "&view=3Dco")) + (file-name (string-append "texlive-" (match (string-split name #\/) + ((dirs ... file-name) file-name= )))) + (sha256 (base32 hash)))) + (define-public texlive-bin (package (name "texlive-bin") @@ -285,6 +294,12 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-S= YSTEM is used." (sha256 (base32 "0wrjls1y9b4k1z10l9l8w2l3yjcw7v7by2y16kchdpkiyldlkry6")))) + ("pdftosrc-poppler-compat" + ,(texlive-svn-file "texk/web2c/pdftexdir/pdftosrc-poppler0.83.0.cc"= "52959" + "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g= 06380")) + ("pdftoepdf-poppler-compat" + ,(texlive-svn-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.83.0.cc= " "52959" + "0981acbsig4pqbhg3a2ghiygd0zv1kqvmncacigfzvpj5r5= k8px1")) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("fontforge" ,fontforge) @@ -356,10 +371,10 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-= SYSTEM is used." (string-append "\"" (assoc-ref inputs "ghostscript") "/bin/= gs\""))) #t)) (add-after 'unpack 'use-code-for-new-poppler =2D (lambda _ =2D (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc" + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (assoc-ref inputs "pdftoepdf-poppler-compat") "texk/web2c/pdftexdir/pdftoepdf.cc") =2D (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc" + (copy-file (assoc-ref inputs "pdftosrc-poppler-compat") "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-popp= ler --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Can you try that? Wrt the other TeX packages, I think %texlive-tag and %texlive-revision from (guix build-system texlive) needs to be bumped, and all the hashes changed accordingly. Thanks! --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl3360IACgkQoqBt8qM6 VPr7fQgAkfJUeGddAdaFlAnls1IZiZsqmR87jU757cunoWw/9OAT3MKRMjfFHvgg M73sH+jNHACMkSr4ZhjRga2rzUqh0U2neIx92AHWNC3h7CIKyYzwG47jQDYndklw G44kUdshH6+VhWjnzolPPoJHQDCV5+a9gsbgUY0NrT+aRLgt3QGZ/KeHUkDdV4Rq 2kYVUgbfhuuhkTVXm4BXZzDcjz2XAdvLaU1DaeD1q4UUs5EVJ8A5yAVyYCwmX4ty jyAfMSXL1bUeJz9Jw0VLtIiPbLp6d/ICXHi+FqOwqtcXwTjgTNB6fSufh1lj2jbf XUsbl9jfm/GQyA7Jw7MQlZM26ww8eA== =rGXB -----END PGP SIGNATURE----- --==-=-=--