Fri, 10 Aug 2012 14:15:27 +0200
Correct strange redefinitions of getline(3) error and use parallel make. The
redefinition patch code solves "error: conflicting types for 'getline'."
tetex/tetex.patch | file | annotate | diff | comparison | revisions | |
tetex/tetex.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/tetex/tetex.patch Fri Aug 10 14:12:46 2012 +0200 1.2 +++ b/tetex/tetex.patch Fri Aug 10 14:15:27 2012 +0200 1.3 @@ -1,5 +1,4 @@ 1.4 Index: texk/gsftopk/gsftopk.c 1.5 -diff -Nau texk/gsftopk/gsftopk.c.orig texk/gsftopk/gsftopk.c 1.6 --- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100 1.7 +++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100 1.8 @@ -417,7 +417,7 @@ 1.9 @@ -114,3 +113,30 @@ 1.10 fprintf (stderr, "\nThumbnail not a png file! Skipping\n"); 1.11 return NULL; 1.12 } 1.13 +Index: texk/dvipsk/afm2tfm.c 1.14 +--- texk/dvipsk/afm2tfm.c.orig 2005-01-30 14:17:09.000000000 +0100 1.15 ++++ texk/dvipsk/afm2tfm.c 2012-08-10 13:51:16.204770293 +0200 1.16 +@@ -40,6 +40,9 @@ 1.17 + #endif 1.18 + #endif /* KPATHSEA */ 1.19 + 1.20 ++/* Definitions to accommodate flawed or defective code. */ 1.21 ++#define getline local_getline 1.22 ++ 1.23 + /* JLH: added these to make the code easier to read and remove some 1.24 + ascii<->ebcdic dependencies */ 1.25 + #define ASCII_A 65 1.26 +Index: texk/web2c/cpascal.h 1.27 +--- texk/web2c/cpascal.h.orig 2004-08-28 22:49:59.000000000 +0200 1.28 ++++ texk/web2c/cpascal.h 2012-08-10 13:50:28.634075696 +0200 1.29 +@@ -241,6 +241,10 @@ 1.30 + #define getname vms_getname 1.31 + #endif 1.32 + 1.33 ++/* Definitions to accommodate flawed or defective code. */ 1.34 ++ 1.35 ++#define getline local_getline 1.36 ++ 1.37 + /* Declarations for the routines we provide ourselves in lib/. */ 1.38 + 1.39 + extern string basenamechangesuffix P3H(const_string,const_string,const_string);
2.1 --- a/tetex/tetex.spec Fri Aug 10 14:12:46 2012 +0200 2.2 +++ b/tetex/tetex.spec Fri Aug 10 14:15:27 2012 +0200 2.3 @@ -39,7 +39,7 @@ 2.4 Group: Typesetting 2.5 License: GPL 2.6 Version: %{V_src} 2.7 -Release: 20120623 2.8 +Release: 20120800 2.9 2.10 # list of sources 2.11 Source0: ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-src-%{V_src}.tar.gz 2.12 @@ -147,6 +147,7 @@ 2.13 Makefile.in 2.14 2.15 %build 2.16 + smpcpu=`echo %{l_mflags -O} | %{l_shtool} subst -e 's;.*\(\-j[1-9][0-9]*\).*;\1'` 2.17 # configure the system by using the (wrong) paths to the temporary 2.18 # installation area, followed by by a step for fixing the paths 2.19 # (to the correct values) inside the kpathsea library (which 2.20 @@ -183,14 +184,14 @@ 2.21 %{l_shtool} subst -v \ 2.22 -e "s;$RPM_BUILD_ROOT%{l_prefix};%{l_prefix};" \ 2.23 `find . -type f -print` 2.24 - eval "make all" 2.25 + eval "make $smpcpu all" 2.26 ) || exit $? 2.27 2.28 # build the sources 2.29 # (we cannot use %{l_make}, because teTeX dislikes absolute paths 2.30 # for make. Instead we work-around via $PATH. The redundant 2.31 # "eval" around the call is just to shut-up speclint) 2.32 - eval "make all" 2.33 + eval "make $smpcpu all" 2.34 2.35 %install 2.36 # reinstall teTeX texmf stuff