From 80b3b7f486c6986831ff5b80f87e93d3dc20f9b3 Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Wed, 12 Feb 2025 15:49:25 +0100
Subject: [PATCH] * update texlive-texmf to 2024.2-4

---
 texlive-texmf/.SRCINFO      |  12 ++--
 texlive-texmf/PKGBUILD      |  24 ++++---
 texlive-texmf/newtxtt.patch | 126 ++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+), 13 deletions(-)
 create mode 100644 texlive-texmf/newtxtt.patch

diff --git a/texlive-texmf/.SRCINFO b/texlive-texmf/.SRCINFO
index 0a56d58c44..cc413b8961 100644
--- a/texlive-texmf/.SRCINFO
+++ b/texlive-texmf/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = texlive-texmf
 	pkgdesc = TeX Live -
 	pkgver = 2024.2
-	pkgrel = 2
+	pkgrel = 4
 	url = https://tug.org/texlive/
 	arch = any
 	license = GPL
 	makedepends = subversion
 	depends = texlive-bin
 	options = !strip
-	source = texmf-dist-2024.2::svn://tug.org/texlive/tags/texlive-2024.2/Master/texmf-dist#revision=70897
-	source = tlpkg-2024.2::svn://tug.org/texlive/tags/texlive-2024.2/Master/tlpkg#revision=70897
-	source = x86_64-linux-2024.2::svn://tug.org/texlive/tags/texlive-2024.2/Master/bin/x86_64-linux#revision=70897
+	source = svn://tug.org/texlive/tags/texlive-2024.2/Master/texmf-dist#revision=70897
+	source = svn://tug.org/texlive/tags/texlive-2024.2/Master/tlpkg#revision=70897
+	source = svn://tug.org/texlive/tags/texlive-2024.2/Master/bin/x86_64-linux#revision=70897
 	source = 09-texlive-fonts.conf
 	source = texmf.cnf.patch
 	source = texmfcnf.lua.patch
@@ -23,6 +23,8 @@ pkgbase = texlive-texmf
 	source = texlive-updmap.script
 	source = 80-mtxrun.hook
 	source = mtxrun.script
+	source = https://github.com/rrthomas/pdfjam/commit/f9b86dcf.patch
+	source = newtxtt.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -38,6 +40,8 @@ pkgbase = texlive-texmf
 	sha256sums = ee6e76192a5ad880a2152cd7900b86c8465239fb228045a2f8360b0d7a449f4a
 	sha256sums = f6bb67db32d37ca15eba88bd15d8b9882c61915f98bc8d7c3c21a66c8cf8f019
 	sha256sums = 98b730e917281227e29077ba5689ad78baee0af3859b55966b2604c6a85f1305
+	sha256sums = 5f027b8a2492d89a04c2083c0628ff2305b2646412a1e7bdf79a498b98d08d6a
+	sha256sums = 77d6f116d092447779de27922cb22fd7757254c0c7c2bc871d4943596630d10c
 
 pkgname = texlive-doc
 	pkgdesc = TeX Live - documentation
diff --git a/texlive-texmf/PKGBUILD b/texlive-texmf/PKGBUILD
index 795548b021..8d3483fb99 100644
--- a/texlive-texmf/PKGBUILD
+++ b/texlive-texmf/PKGBUILD
@@ -12,16 +12,16 @@ for _coll in ${_collections[@]}; do
 done
 _rev=70897
 pkgver=2024.2
-pkgrel=2.2
+pkgrel=4
 pkgdesc='TeX Live - '
 license=(GPL)
 arch=(any)
 depends=(texlive-bin)
 makedepends=(subversion)
 url='https://tug.org/texlive/'
-source=(texmf-dist-$pkgver::svn://tug.org/texlive/tags/texlive-$pkgver/Master/texmf-dist#revision=$_rev
-        tlpkg-$pkgver::svn://tug.org/texlive/tags/texlive-$pkgver/Master/tlpkg#revision=$_rev
-        x86_64-linux-$pkgver::svn://tug.org/texlive/tags/texlive-$pkgver/Master/bin/x86_64-linux#revision=$_rev
+source=(svn://tug.org/texlive/tags/texlive-$pkgver/Master/texmf-dist#revision=$_rev
+        svn://tug.org/texlive/tags/texlive-$pkgver/Master/tlpkg#revision=$_rev
+        svn://tug.org/texlive/tags/texlive-$pkgver/Master/bin/x86_64-linux#revision=$_rev
         09-texlive-fonts.conf
         texmf.cnf.patch
         texmfcnf.lua.patch
@@ -33,7 +33,9 @@ source=(texmf-dist-$pkgver::svn://tug.org/texlive/tags/texlive-$pkgver/Master/te
         73-texlive-updmap.hook
         texlive-updmap.script
         80-mtxrun.hook
-        mtxrun.script)
+        mtxrun.script
+        https://github.com/rrthomas/pdfjam/commit/f9b86dcf.patch
+        newtxtt.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -48,13 +50,17 @@ sha256sums=('SKIP'
             '2141c0842668fb937fd21ca2fae39b642c9665656e404a0d4ee7bdc477bf51fe'
             'ee6e76192a5ad880a2152cd7900b86c8465239fb228045a2f8360b0d7a449f4a'
             'f6bb67db32d37ca15eba88bd15d8b9882c61915f98bc8d7c3c21a66c8cf8f019'
-            '98b730e917281227e29077ba5689ad78baee0af3859b55966b2604c6a85f1305')
+            '98b730e917281227e29077ba5689ad78baee0af3859b55966b2604c6a85f1305'
+            '5f027b8a2492d89a04c2083c0628ff2305b2646412a1e7bdf79a498b98d08d6a'
+            '77d6f116d092447779de27922cb22fd7757254c0c7c2bc871d4943596630d10c')
 options=(!strip) # Nothing to strip, save packaging time
 
 prepare() {
-  mv texmf-dist-$pkgver texmf-dist
-  mv tlpkg-$pkgver tlpkg
-  mv x86_64-linux-$pkgver x86_64-linux
+# Fix --paper option in pdfjam
+  patch -d texmf-dist/scripts/pdfjam -p2 < f9b86dcf.patch
+
+# Fix missing variants in newtxtt font
+  patch -p2 < newtxtt.patch
 
 # Customize configuration
   patch -d texmf-dist/web2c -p0 < texmf.cnf.patch
diff --git a/texlive-texmf/newtxtt.patch b/texlive-texmf/newtxtt.patch
new file mode 100644
index 0000000000..3b4887df29
--- /dev/null
+++ b/texlive-texmf/newtxtt.patch
@@ -0,0 +1,126 @@
+diff --git a/Master/texmf-dist/fonts/map/dvips/newtxtt/newtxtt.map b/Master/texmf-dist/fonts/map/dvips/newtxtt/newtxtt.map
+index 176f3ed11b2..88c5ae337b7 100644
+--- a/Master/texmf-dist/fonts/map/dvips/newtxtt/newtxtt.map
++++ b/Master/texmf-dist/fonts/map/dvips/newtxtt/newtxtt.map
+@@ -2,22 +2,28 @@ newtxtta newtxtt " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxtt.pfb
+ newtxttb newtxtt " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxtt.pfb
+ newtxttc newtxtt " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxtt.pfb
+ newtxttd newtxtt " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxtt.pfb
++newtxtte newtxtt " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxtt.pfb
+ newtxbtta newtxbtt " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxbtt.pfb
+ newtxbttb newtxbtt " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxbtt.pfb
+ newtxbttc newtxbtt " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxbtt.pfb
+ newtxbttd newtxbtt " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxbtt.pfb
++newtxbtte newtxbtt " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxbtt.pfb
+ newtxttsca newtxttsc " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxttsc.pfb
+ newtxttscb newtxttsc " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxttsc.pfb
+ newtxttscc newtxttsc " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxttsc.pfb
+ newtxttscd newtxttsc " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxttsc.pfb
++newtxttsce newtxttsc " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxttsc.pfb
+ newtxbttsca newtxbttsc " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxbttsc.pfb
+ newtxbttscb newtxbttsc " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxbttsc.pfb
+ newtxbttscc newtxbttsc " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxbttsc.pfb
+ newtxbttscd newtxbttsc " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxbttsc.pfb
++newtxbttsce newtxbttsc " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxbttsc.pfb
+ newtxttsla newtxtt " .167 SlantFont txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxtt.pfb
+ newtxttslb newtxtt " .167 SlantFont txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxtt.pfb
+ newtxttslc newtxtt " .167 SlantFont txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxtt.pfb
+ newtxttsld newtxtt " .167 SlantFont txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxtt.pfb
++newtxttsle newtxtt " .167 SlantFont txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxtt.pfb
++newtxbttsle newtxbtt " .167 SlantFont txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxbtt.pfb
+ newtxbttsld newtxbtt " .167 SlantFont txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxbtt.pfb
+ newtxbttslc newtxbtt " .167 SlantFont txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxbtt.pfb
+ newtxbttslb newtxbtt " .167 SlantFont txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxbtt.pfb
+@@ -26,22 +32,28 @@ newtxttza newtxtt " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxtt.pfb
+ newtxttzb newtxtt " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxtt.pfb
+ newtxttzc newtxtt " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxtt.pfb
+ newtxttzd newtxtt " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxtt.pfb
++newtxttze newtxtt " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxtt.pfb
+ newtxbttza newtxbtt " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxbtt.pfb
+ newtxbttzb newtxbtt " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxbtt.pfb
+ newtxbttzc newtxbtt " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxbtt.pfb
+ newtxbttzd newtxbtt " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxbtt.pfb
++newtxbttze newtxbtt " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxbtt.pfb
+ newtxttzsca newtxttsc " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxttsc.pfb
+ newtxttzscb newtxttsc " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxttsc.pfb
+ newtxttzscc newtxttsc " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxttsc.pfb
+ newtxttzscd newtxttsc " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxttsc.pfb
++newtxttzsce newtxttsc " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxttsc.pfb
+ newtxbttzsca newtxbttsc " txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxbttsc.pfb
+ newtxbttzscb newtxbttsc " txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxbttsc.pfb
+ newtxbttzscc newtxbttsc " txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxbttsc.pfb
+ newtxbttzscd newtxbttsc " txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxbttsc.pfb
++newtxbttzsce newtxbttsc " txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxbttsc.pfb
+ newtxttzsla newtxtt " .167 SlantFont txttECEncodingA ReEncodeFont " <[txttAec.enc <newtxtt.pfb
+ newtxttzslb newtxtt " .167 SlantFont txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxtt.pfb
+ newtxttzslc newtxtt " .167 SlantFont txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxtt.pfb
+ newtxttzsld newtxtt " .167 SlantFont txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxtt.pfb
++newtxttzsle newtxtt " .167 SlantFont txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxtt.pfb
++newtxbttzsle newtxbtt " .167 SlantFont txttECEncodingE ReEncodeFont " <[txttEec.enc <newtxbtt.pfb
+ newtxbttzsld newtxbtt " .167 SlantFont txttECEncodingD ReEncodeFont " <[txttDec.enc <newtxbtt.pfb
+ newtxbttzslc newtxbtt " .167 SlantFont txttECEncodingC ReEncodeFont " <[txttCec.enc <newtxbtt.pfb
+ newtxbttzslb newtxbtt " .167 SlantFont txttECEncodingB ReEncodeFont " <[txttBec.enc <newtxbtt.pfb
+@@ -66,4 +78,64 @@ newtcxbslb newtcxbtt " .167 SlantFont tcxBecEnc ReEncodeFont " <[tcxBec.enc <new
+ newtcxbslc newtcxbtt " .167 SlantFont tcxCecEnc ReEncodeFont " <[tcxCec.enc <newtcxbtt.pfb
+ newtcxbsld newtcxbtt " .167 SlantFont tcxDecEnc ReEncodeFont " <[tcxDec.enc <newtcxbtt.pfb
+ newtcxbsle newtcxbtt " .167 SlantFont tcxEecEnc ReEncodeFont " <[tcxEec.enc <newtcxbtt.pfb
++newtxttaq newtxtt " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxtt.pfb
++newtxttbq newtxtt " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxtt.pfb
++newtxttcq newtxtt " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxtt.pfb
++newtxttdq newtxtt " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxtt.pfb
++newtxtteq newtxtt " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxtt.pfb
++newtxbttaq newtxbtt " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxbtt.pfb
++newtxbttbq newtxbtt " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxbtt.pfb
++newtxbttcq newtxbtt " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxbtt.pfb
++newtxbttdq newtxbtt " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxbtt.pfb
++newtxbtteq newtxbtt " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxbtt.pfb
++newtxttscaq newtxttsc " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxttsc.pfb
++newtxttscbq newtxttsc " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxttsc.pfb
++newtxttsccq newtxttsc " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxttsc.pfb
++newtxttscdq newtxttsc " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxttsc.pfb
++newtxttsceq newtxttsc " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxttsc.pfb
++newtxbttscaq newtxbttsc " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxbttsc.pfb
++newtxbttscbq newtxbttsc " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxbttsc.pfb
++newtxbttsccq newtxbttsc " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxbttsc.pfb
++newtxbttscdq newtxbttsc " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxbttsc.pfb
++newtxbttsceq newtxbttsc " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxbttsc.pfb
++newtxttslaq newtxtt " .167 SlantFont txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxtt.pfb
++newtxttslbq newtxtt " .167 SlantFont txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxtt.pfb
++newtxttslcq newtxtt " .167 SlantFont txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxtt.pfb
++newtxttsldq newtxtt " .167 SlantFont txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxtt.pfb
++newtxttsleq newtxtt " .167 SlantFont txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxtt.pfb
++newtxbttslaq newtxbtt " .167 SlantFont txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxbtt.pfb
++newtxbttslbq newtxbtt " .167 SlantFont txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxbtt.pfb
++newtxbttslcq newtxbtt " .167 SlantFont txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxbtt.pfb
++newtxbttsldq newtxbtt " .167 SlantFont txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxbtt.pfb
++newtxbttsleq newtxbtt " .167 SlantFont txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxbtt.pfb
++newtxttzaq newtxtt " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxtt.pfb
++newtxttzbq newtxtt " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxtt.pfb
++newtxttzcq newtxtt " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxtt.pfb
++newtxttzdq newtxtt " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxtt.pfb
++newtxttzeq newtxtt " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxtt.pfb
++newtxbttzaq newtxbtt " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxbtt.pfb
++newtxbttzbq newtxbtt " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxbtt.pfb
++newtxbttzcq newtxbtt " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxbtt.pfb
++newtxbttzdq newtxbtt " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxbtt.pfb
++newtxbttzeq newtxbtt " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxbtt.pfb
++newtxttzscaq newtxttsc " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxttsc.pfb
++newtxttzscbq newtxttsc " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxttsc.pfb
++newtxttzsccq newtxttsc " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxttsc.pfb
++newtxttzscdq newtxttsc " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxttsc.pfb
++newtxttzsceq newtxttsc " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxttsc.pfb
++newtxbttzscaq newtxbttsc " txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxbttsc.pfb
++newtxbttzscbq newtxbttsc " txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxbttsc.pfb
++newtxbttzsccq newtxbttsc " txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxbttsc.pfb
++newtxbttzscdq newtxbttsc " txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxbttsc.pfb
++newtxbttzsceq newtxbttsc " txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxbttsc.pfb
++newtxttzslaq newtxtt " .167 SlantFont txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxtt.pfb
++newtxttzslbq newtxtt " .167 SlantFont txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxtt.pfb
++newtxttzslcq newtxtt " .167 SlantFont txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxtt.pfb
++newtxttzsldq newtxtt " .167 SlantFont txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxtt.pfb
++newtxttzsleq newtxtt " .167 SlantFont txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxtt.pfb
++newtxbttzslaq newtxbtt " .167 SlantFont txttECEncodingAq ReEncodeFont " <[txttAqec.enc <newtxbtt.pfb
++newtxbttzslbq newtxbtt " .167 SlantFont txttECEncodingBq ReEncodeFont " <[txttBqec.enc <newtxbtt.pfb
++newtxbttzslcq newtxbtt " .167 SlantFont txttECEncodingCq ReEncodeFont " <[txttCqec.enc <newtxbtt.pfb
++newtxbttzsldq newtxbtt " .167 SlantFont txttECEncodingDq ReEncodeFont " <[txttDqec.enc <newtxbtt.pfb
++newtxbttzsleq newtxbtt " .167 SlantFont txttECEncodingEq ReEncodeFont " <[txttEqec.enc <newtxbtt.pfb