commit:     463620e36d890f28e5fead4d32d0276daf401908
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 14:20:50 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 14:20:50 2024 +0000
URL:        https://gitweb.gentoo.org/proj/tex-overlay.git/commit/?id=463620e3

app-text/texlive-core: sync with ::gentoo

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-text/texlive-core/Manifest                     |  1 +
 app-text/texlive-core/texlive-core-2023-r10.ebuild | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 1dfdf14..dda6c0f 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -32,6 +32,7 @@ DIST pmx.r65926.tar.xz 10184 BLAKE2B 
550140955d4033c258c7793c56846d8a0d235fcb2de
 DIST texdoctk.doc.r62186.tar.xz 30728 BLAKE2B 
4878654c60e2fb3a1415f492894a3d956d86cdd6f8ebc337e4ec928a55ccd2b8c202a3c06b3c8687530a505f45e740eb33005e2cd4c2f65aa68ec77e3990ed31
 SHA512 
fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba
 DIST texdoctk.r62186.tar.xz 26712 BLAKE2B 
4076b8b227dc08762cd7880165fd4b1780f3ed34e0ba68b1b04ce542efd47aefc3f893d71da7dbc8122ebb45107480974da0631f16f849d2990a14cd2db74ce6
 SHA512 
f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe
 DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 
6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035
 SHA512 
93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
+DIST texlive-core-2023-mplib-h.patch 1059 BLAKE2B 
24443c8983c01821a15fad709e8421a98a1983ceb19e330ff13591a99cbfb57aec55c707066eba4cce088c2d523e91c13657c482f21878e369622b6845e232c7
 SHA512 
f5c2df4d435b3d8a80c3f25f3f8b1ed393ad55f82137345fb05cecf96b36834e98c9b1094a2afbdf4956a7a7eeed11d49d26d1182908ca0a5b08832ccde6ada3
 DIST texlive-core-2023-pdflatex-big-endian-fix.patch 1162 BLAKE2B 
a440115cb804a9a9e48c068853fd38ab87d50ab23177283ea20304ea4c7a9f3ee3a4ae35ae2c95dd2a0c339352aeed91cb436bc461db2983d6911d6417c48bb6
 SHA512 
b17b209b09884f78fe47f2a5e5afd09bc7c7ca8a67a5b67c0ac0e9977ac352b7867ed8e35ff97925ff2af1c67f2c716f513ecd9389fb99c3ad9bf5d3bdebc570
 DIST texlive-scripts-extra.doc.r62517.tar.xz 197196 BLAKE2B 
80d2fd7b53ffbe21f975156cf0d5f52826faebc422d3e66c342c8237d7da27ba58b1ffc56f83a040ae4b4e870c8063c0d53392f9cc7e3bb3da30ebe5a258a40a
 SHA512 
22cf59bf4dafc7ad9425086bc0aaedb2bf5f7d8aa6ea9c65abde2d523be37665b9c9bee4acb399857eae03613e7241ca1d6099f43cab77a95c10eced8813ad80
 DIST texlive-scripts-extra.r62517.tar.xz 23540 BLAKE2B 
85762b7a74f5132ec550033e08caef5f6fd145ef367475a1b3ebaccfefdcfb426f2e12e647e45a35daa2a44cf0c2fba8d6ed8afec88ed6fccee0cf7eb52c2c50
 SHA512 
46ac37826d3c60de6c9260bf83d6275d49a35cbde88fb03481a050f92e87b698e9a94b2e520a74edc0417419f5a2dee53000a529b9c81ea6f6244a83480e56e7

diff --git a/app-text/texlive-core/texlive-core-2023-r10.ebuild 
b/app-text/texlive-core/texlive-core-2023-r10.ebuild
index 9e3d1e7..d3b5e07 100644
--- a/app-text/texlive-core/texlive-core-2023-r10.ebuild
+++ b/app-text/texlive-core/texlive-core-2023-r10.ebuild
@@ -17,6 +17,8 @@ SRC_URI="
                -> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
        
https://raw.githubusercontent.com/debian-tex/texlive-bin/58a00e704a15ec3dd8abbf3826f28207eb095251/debian/patches/1054218.patch
                -> ${PN}-2023-pdflatex-big-endian-fix.patch
+       https://bugs.gentoo.org/attachment.cgi?id=908573
+               -> ${PN}-2023-mplib-h.patch
 "
 
 # Macros that are not a part of texlive-sources or or pulled in from 
collection-binextra
@@ -127,7 +129,7 @@ SRC_URI+=" )"
 S="${WORKDIR}/${MY_P}"
 LICENSE="BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -224,13 +226,17 @@ src_prepare() {
        # 
https://git.texlive.info/texlive/commit/?id=c45afdc843154fcb09b583f54a2f802c6069b50e
        eapply "${DISTDIR}"/texlive-core-2023-pdflatex-big-endian-fix.patch
 
+       # bug #837875
+       eapply "${DISTDIR}"/texlive-core-2023-mplib-h.patch
+
        default
 
        elibtoolize
 
-       # Drop this once cairo's autoconf patches are gone. See
-       # https://bugs.gentoo.org/927714#c4 and https://bugs.gentoo.org/853121.
-       "${S}"/reautoconf libs/cairo || die
+       # Drop this once cairo's and mplibdir's 
(texlive-core-2023-mplib-h.patch)
+       # autoconf patches are gone. See bug #927714#c4, bug #853121 for cairo,
+       # and bug #837875 for mplibdir (in web2c).
+       "${S}"/reautoconf libs/cairo texk/web2c || die
 }
 
 src_configure() {
@@ -239,6 +245,13 @@ src_configure() {
        append-flags -fno-strict-aliasing
        filter-lto
 
+       # Needed for 32bit architectures, bug 928096
+       # This is upstream recommendation for the moment, see also
+       # https://www.tug.org/texlive/build.html
+       # I'm fairly sure it just hides a real bug in pdftex, keeping 928096
+       # thus open, but hey, at least it's not a regression...
+       append-cflags -Wno-incompatible-pointer-types
+
        # It fails on alpha without this
        use alpha && append-ldflags "-Wl,--no-relax"
 

Reply via email to