# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344600927 -7200 # Node ID ed99728b62ade7c9859072fb594ebc1dbc10e784 # Parent 0838649dd3251c35ec86cd09ba7e6dd660fd62d4 Correct strange redefinitions of getline(3) error and use parallel make. The redefinition patch code solves "error: conflicting types for 'getline'." diff -r 0838649dd325 -r ed99728b62ad tetex/tetex.patch --- a/tetex/tetex.patch Fri Aug 10 14:12:46 2012 +0200 +++ b/tetex/tetex.patch Fri Aug 10 14:15:27 2012 +0200 @@ -1,5 +1,4 @@ Index: texk/gsftopk/gsftopk.c -diff -Nau texk/gsftopk/gsftopk.c.orig texk/gsftopk/gsftopk.c --- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100 +++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100 @@ -417,7 +417,7 @@ @@ -114,3 +113,30 @@ fprintf (stderr, "\nThumbnail not a png file! Skipping\n"); return NULL; } +Index: texk/dvipsk/afm2tfm.c +--- texk/dvipsk/afm2tfm.c.orig 2005-01-30 14:17:09.000000000 +0100 ++++ texk/dvipsk/afm2tfm.c 2012-08-10 13:51:16.204770293 +0200 +@@ -40,6 +40,9 @@ + #endif + #endif /* KPATHSEA */ + ++/* Definitions to accommodate flawed or defective code. */ ++#define getline local_getline ++ + /* JLH: added these to make the code easier to read and remove some + ascii<->ebcdic dependencies */ + #define ASCII_A 65 +Index: texk/web2c/cpascal.h +--- texk/web2c/cpascal.h.orig 2004-08-28 22:49:59.000000000 +0200 ++++ texk/web2c/cpascal.h 2012-08-10 13:50:28.634075696 +0200 +@@ -241,6 +241,10 @@ + #define getname vms_getname + #endif + ++/* Definitions to accommodate flawed or defective code. */ ++ ++#define getline local_getline ++ + /* Declarations for the routines we provide ourselves in lib/. */ + + extern string basenamechangesuffix P3H(const_string,const_string,const_string); diff -r 0838649dd325 -r ed99728b62ad tetex/tetex.spec --- a/tetex/tetex.spec Fri Aug 10 14:12:46 2012 +0200 +++ b/tetex/tetex.spec Fri Aug 10 14:15:27 2012 +0200 @@ -39,7 +39,7 @@ Group: Typesetting License: GPL Version: %{V_src} -Release: 20120623 +Release: 20120800 # list of sources Source0: ftp://tug.ctan.org/tex-archive/systems/unix/teTeX/%{V_base}/distrib/tetex-src-%{V_src}.tar.gz @@ -147,6 +147,7 @@ Makefile.in %build + smpcpu=`echo %{l_mflags -O} | %{l_shtool} subst -e 's;.*\(\-j[1-9][0-9]*\).*;\1'` # configure the system by using the (wrong) paths to the temporary # installation area, followed by by a step for fixing the paths # (to the correct values) inside the kpathsea library (which @@ -183,14 +184,14 @@ %{l_shtool} subst -v \ -e "s;$RPM_BUILD_ROOT%{l_prefix};%{l_prefix};" \ `find . -type f -print` - eval "make all" + eval "make $smpcpu all" ) || exit $? # build the sources # (we cannot use %{l_make}, because teTeX dislikes absolute paths # for make. Instead we work-around via $PATH. The redundant # "eval" around the call is just to shut-up speclint) - eval "make all" + eval "make $smpcpu all" %install # reinstall teTeX texmf stuff