rpms
/
texlive-base
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix header order for xpdf dependent bits to ensure off_t is set properly on i686

This commit is contained in:
Tom Callaway 2023-01-31 13:24:59 -05:00
parent b6798c0517
commit c313c6c621
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
texlive-base-20220321-pdf-header-order-fix.patch Normal file
View File

@ -0,0 +1,47 @@
diff -up texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc.header-order-fix texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc
--- texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc.header-order-fix 2023-01-31 12:53:39.214112015 -0500
+++ texlive-base-20220321/source/texk/web2c/pdftexdir/pdftoepdf.cc 2023-01-31 12:54:07.175413160 -0500
@@ -17,6 +17,11 @@ You should have received a copy of the G
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/*
+Load aconf.h first to ensure _FILE_OFFSET_BITS is factored in.
+*/
+#include <aconf.h>
+
/* Do this early in order to avoid a conflict between
MINGW32 <rpcndr.h> defining 'boolean' as 'unsigned char' and
<kpathsea/types.h> defining Pascal's boolean as 'int'.
@@ -31,7 +36,6 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
-#include <aconf.h>
#include <GString.h>
#include <gmem.h>
#include <gfile.h>
diff -up texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc.header-order-fix texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc
--- texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc.header-order-fix 2023-01-31 12:41:21.483166562 -0500
+++ texlive-base-20220321/source/texk/web2c/pdftexdir/pdftosrc.cc 2023-01-31 12:53:15.185853229 -0500
@@ -16,6 +16,12 @@ GNU General Public License for more deta
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/*
+Load aconf.h first to ensure _FILE_OFFSET_BITS is factored in.
+*/
+#include <aconf.h>
+
#include <w2c/config.h>
#include <stdlib.h>
@@ -24,7 +30,6 @@ with this program. If not, see <http://
#include <string.h>
#include <ctype.h>
-#include <aconf.h>
#include <GString.h>
#include <gmem.h>
#include <gfile.h>

10
texlive-base.spec
View File

@ -23,7 +23,7 @@
Name: %{shortname}-base
Version: %{source_date}
Release: 67%{?dist}
Release: 68%{?dist}
Epoch: 10
Summary: TeX formatting system
# The only files in the base package are directories, cache, and license texts
@ -511,6 +511,9 @@ Patch41: texlive-base-c99-2.patch
Patch42: texlive-base-c99-3.patch
Patch43: texlive-base-c99-4.patch
# Fix issue where off_t could be set incorrectly on i686 due to order of header load
Patch44: texlive-base-20220321-pdf-header-order-fix.patch
# Can't do this because it causes everything else to be noarch
# BuildArch: noarch
BuildRequires: make
@ -7458,6 +7461,8 @@ done
%patch42 -p1 -b .c99-3
%patch43 -p1 -b .c99-4
%patch44 -p1 -b .pdf-header-order-fix
# Value here is "16" not "15" because we have a source0 at index 1.
# Source15 at index 16 is our first "normal" noarch source file.
# Also, this macro has to be here, not at the top, or it will not evaluate properly. :P
@ -10189,6 +10194,9 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
%doc %{_texdir}/texmf-dist/doc/latex/yplan/
%changelog
* Tue Jan 31 2023 Tom Callaway <spot@fedoraproject.org> - 10:20220321-68
- fix header order for xpdf dependent bits to ensure off_t is set properly on i686
* Tue Jan 31 2023 Florian Weimer <fweimer@redhat.com> - 10:20220321-67
- Various C99 compatibility fixes