From c19dac2150bf78a625d69fc2bf75f0f743119bf901ddcac1694208b9f9e4a436 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 16 Aug 2024 11:41:45 +0000 Subject: [PATCH 1/2] Add real fix for boo#1228342 OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=481 --- source-pdftex-gcc14.patch | 38 ++++++++++++++++++++++++++++++++++++++ texlive.changes | 8 ++++++++ texlive.spec | 6 +++--- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 source-pdftex-gcc14.patch diff --git a/source-pdftex-gcc14.patch b/source-pdftex-gcc14.patch new file mode 100644 index 0000000..9814092 --- /dev/null +++ b/source-pdftex-gcc14.patch @@ -0,0 +1,38 @@ +Revision 71901 - (view) (download) (annotate) - [selected] +Modified Fri Jul 26 09:55:07 2024 UTC (3 weeks ago) by ascherer +File length: 15439 byte(s) +Diff to previous 65870 + +[PDFTEX] Prepare for compilation with gcc-14. + +There's a type mismatch (probably copy-paste-error) for +'pdf_font_has_space_char', defined as '^boolean' in section 821, +in sections 1502 and 1518. + +See https://tug.org/pipermail/tex-live/2024-July/050773.html for the +initial bug report. + +--- + texk/web2c/pdftexdir/pdftex.ch | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- texk/web2c/pdftexdir/pdftex.ch ++++ texk/web2c/pdftexdir/pdftex.ch 2024-08-16 11:29:11.854819548 +0000 +@@ -179,7 +179,7 @@ pdf_font_type:=xmalloc_array(eight_bits, + pdf_font_attr:=xmalloc_array(str_number, font_max); + pdf_font_blink:=xmalloc_array(internal_font_number, font_max); + pdf_font_elink:=xmalloc_array(internal_font_number, font_max); +-pdf_font_has_space_char:=xmalloc_array(internal_font_number, font_max); ++pdf_font_has_space_char:=xmalloc_array(boolean, font_max); + pdf_font_stretch:=xmalloc_array(integer, font_max); + pdf_font_shrink:=xmalloc_array(integer, font_max); + pdf_font_step:=xmalloc_array(integer, font_max); +@@ -298,7 +298,7 @@ pdf_font_type:=xmalloc_array(eight_bits, + pdf_font_attr:=xmalloc_array(str_number,font_max); + pdf_font_blink:=xmalloc_array(internal_font_number,font_max); + pdf_font_elink:=xmalloc_array(internal_font_number,font_max); +-pdf_font_has_space_char:=xmalloc_array(internal_font_number,font_max); ++pdf_font_has_space_char:=xmalloc_array(boolean,font_max); + pdf_font_stretch:=xmalloc_array(integer,font_max); + pdf_font_shrink:=xmalloc_array(integer,font_max); + pdf_font_step:=xmalloc_array(integer,font_max); diff --git a/texlive.changes b/texlive.changes index 63e9e42..71bebf4 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 16 11:34:24 UTC 2024 - Dr. Werner Fink + +- Add patch source-pdftex-gcc14.patch + * Add fic in change file pdftex.ch to really fix boo#1228342 + (Thanks goes to Andreas Scherer) +- Remove former work around + ------------------------------------------------------------------- Fri Jul 26 14:15:55 UTC 2024 - Martin Jambor diff --git a/texlive.spec b/texlive.spec index f352df7..5791911 100644 --- a/texlive.spec +++ b/texlive.spec @@ -266,6 +266,8 @@ Patch19: source-dvipng.dif Patch21: source-ppc64.dif # PATCH-FIX-UPSTREAM Patch22: source-dvipdfm-x.dif +# PATCH-FIX-UPSTREAM +Patch23: source-pdftex-gcc14.patch # PATCH-FIX-SUSE Make biber work with our perl Patch42: biblatex-encoding.dif Patch43: biblatex-ms-encoding.dif @@ -4246,6 +4248,7 @@ This package is required by the package texlive-biber-bin. %patch -P19 -p0 -b .dvipng %patch -P21 -p0 -b .ppcelf %patch -P22 -p0 -b .sameimg +%patch -P23 -p0 -b .gcc14 pushd libs/luajit/LuaJIT-src/ #Missed patch ppc and risc %patch -P106 -p1 -b .arm64 @@ -4288,9 +4291,6 @@ popd cp -vf %{S:4} $paths %build - # Work around boo#1228342 - %global optflags %{optflags} -Wno-error=incompatible-pointer-types - # Extend the options file echo "world=${PWD}/world" >> %{options} echo "prefix=${PWD}/prefix" >> %{options} From 7c55c2830c374a752f4d657d0e5e76e886d4081bee5062294290c966bd98fa34 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 16 Aug 2024 12:03:08 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=482 --- texlive.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texlive.changes b/texlive.changes index 71bebf4..d6ad174 100644 --- a/texlive.changes +++ b/texlive.changes @@ -2,7 +2,7 @@ Fri Aug 16 11:34:24 UTC 2024 - Dr. Werner Fink - Add patch source-pdftex-gcc14.patch - * Add fic in change file pdftex.ch to really fix boo#1228342 + * Add fix in change file pdftex.ch to really fix boo#1228342 (Thanks goes to Andreas Scherer) - Remove former work around