office/texlive: Included some patches from branch2011

Thanks to Karl Berry and the other TeXLive contributors for their
willingness to actively maintain a -stable branch of TeXLive with
only critical patches - this makes things much easier for distro
packagers and such.

This commit also includes some miscellaneous script fixes wrt
configure flags; thanks to Martin Ivanov for the tips.

Thanks also to Daniil Bratashov for making me aware of the build
problems that were fixed by the branch2011 patches (and to be
fair, he also attached split versions of those patches).

Finally, thanks also to Eduardo Sánchez for reporting the build
problems and testing the patches before I had a chance to do so.
Without feedback like this from our users, I'd be up a creek  :)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 119 insertions, 7 deletions

diff --git a/office/texlive/branch2011/README b/office/texlive/branch2011/README
new file mode 100644
index 0000000000..810c29a236
--- /dev/null
+++ b/office/texlive/branch2011/README
@@ -0,0 +1,5 @@
+This directory should contain only patches from the stable branch of 
+TeXLive 2011 <http://tug.org/svn/texlive/branches/branch2011>
+
+Thanks to Karl Berry and the other TeXLive contributors for agreeing
+to maintain this and for linking it at http://tug.org/texlive/distro.html
diff --git a/office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch b/office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch
new file mode 100644
index 0000000000..e629dd3962
--- /dev/null
+++ b/office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch
@@ -0,0 +1,30 @@
+r23740 | karl | 2011-08-29 00:14:50 +0000 (Mon, 29 Aug 2011) | 1 line
+
+branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html)
+
+Index: Build/source/texk/web2c/xetexdir/xetex.ch
+===================================================================
+--- Build/source/texk/web2c/xetexdir/xetex.ch	(revision 23739)
++++ Build/source/texk/web2c/xetexdir/xetex.ch	(revision 23740)
+@@ -328,7 +328,7 @@
+ {Initialize enc\TeX\ data.}
+ for i:=0 to 255 do mubyte_read[i]:=null;
+ for i:=0 to 255 do mubyte_write[i]:=0;
+-for i:=0 to 128 do mubyte_cswrite[i]:=null;
++for i:=0 to 127 do mubyte_cswrite[i]:=null;
+ mubyte_keep := 0; mubyte_start := false;
+ write_noexpanding := false; cs_converting := false;
+ special_printing := false; message_printing := false;
+Index: Build/source/texk/web2c/enctex.ch
+===================================================================
+--- Build/source/texk/web2c/enctex.ch	(revision 23739)
++++ Build/source/texk/web2c/enctex.ch	(revision 23740)
+@@ -42,7 +42,7 @@
+ {Initialize enc\TeX\ data.}
+ for i:=0 to 255 do mubyte_read[i]:=null;
+ for i:=0 to 255 do mubyte_write[i]:=0;
+-for i:=0 to 128 do mubyte_cswrite[i]:=null;
++for i:=0 to 127 do mubyte_cswrite[i]:=null;
+ mubyte_keep := 0; mubyte_start := false;
+ write_noexpanding := false; cs_converting := false;
+ special_printing := false; message_printing := false;
diff --git a/office/texlive/branch2011/synctex-coordinate-fix.patch b/office/texlive/branch2011/synctex-coordinate-fix.patch
new file mode 100644
index 0000000000..873175896a
--- /dev/null
+++ b/office/texlive/branch2011/synctex-coordinate-fix.patch
@@ -0,0 +1,70 @@
+r23716 | karl | 2011-08-26 23:29:30 +0000 (Fri, 26 Aug 2011) | 1 line
+
+branch2011: import synctex coordinate fix from trunk r23644
+
+Index: Build/source/texk/web2c/synctexdir/synctex-luatex.h
+===================================================================
+--- Build/source/texk/web2c/synctexdir/synctex-luatex.h	(revision 23715)
++++ Build/source/texk/web2c/synctexdir/synctex-luatex.h	(revision 23716)
+@@ -1,6 +1,6 @@
+ /* synctex-luatex.h
+ 
+-   Copyright (c) 2010 Taco Hoekwater <taco@luatex.org>
++   Copyright (c) 2010, 2011 Taco Hoekwater <taco@luatex.org>
+ 
+    This file is part of LuaTeX.
+ 
+@@ -50,9 +50,12 @@
+ #define SYNCTEX_HEIGHT(NODE) height(NODE)
+ #define SYNCTEX_VALUE int_par(synctex_code)
+ 
+-#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
+-#define SYNCTEX_CURH static_pdf->posstruct->pos.h
++#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
++#define SYNCTEX_CURHH static_pdf->posstruct->pos.h
+ 
++#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287)
++#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287)
++
+ #define SYNCTEX_GET_JOB_NAME() makecstring(job_name)
+ #define SYNCTEX_GET_LOG_NAME() get_full_log_name()
+ 
+Index: Build/source/texk/web2c/synctexdir/ChangeLog
+===================================================================
+--- Build/source/texk/web2c/synctexdir/ChangeLog	(revision 23715)
++++ Build/source/texk/web2c/synctexdir/ChangeLog	(revision 23716)
+@@ -1,3 +1,8 @@
++2011-08-22  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
++
++	* synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and
++	SYNCTEX_CURH to yield correct coordinates in dvi and pdf mode.
++
+ 2011-06-11  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+ 
+ 	* synctex_parser_utils.c: fix a typo.
+Index: Build/source/texk/web2c/synctexdir/synctex-xetex.h
+===================================================================
+--- Build/source/texk/web2c/synctexdir/synctex-xetex.h	(revision 23715)
++++ Build/source/texk/web2c/synctexdir/synctex-xetex.h	(revision 23716)
+@@ -1,9 +1,9 @@
+ /* 
+-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
++Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
+ 
+ This file is part of the SyncTeX package.
+ 
+-Latest Revision: Wed Jul  1 11:16:29 UTC 2009
++Latest Revision: Wed Aug 22 07:20:29 UTC 2011
+ 
+ License:
+ --------
+@@ -57,6 +57,9 @@
+ #  define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0)
+ #  define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf")
+ 
++#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh)
++#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv)
++
+ /*  WARNING:
+     The definition below must be in sync with their eponym declarations in synctex-xetex.ch1
+ */
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index 0a803f7304..73f13598a7 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -23,11 +23,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# URL: ftp://tug.org/historic/systems/texlive/2010/
+# URL: ftp://tug.org/historic/systems/texlive/2011/
 
 PRGNAM=texlive
 VERSION=20110705
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION
@@ -79,31 +79,38 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Thanks to Karl Berry and the other TeXLive devs for agreeing to the extra
+# work required to maintain a -stable branch of each release
+# http://tug.org/svn/texlive/branches/branch2011
+patch -p2 < $CWD/branch2011/off-by-one-fix-for-enctex-xetex.patch
+patch -p2 < $CWD/branch2011/synctex-coordinate-fix.patch
+
 # Thanks to Peter Berntsen for the problem report and fix
 patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
 
-# etex is something for eclipse
-# Building with --disable-xindy as it requires libffcall
 # "kpsewhich -var-value=SELFAUTOPARENT" strips two trailing directories 
 #   from the location of the binaries, and this value is used by many
 #   things in TeXLive (including tlmgr); therefore, it seems best to just
 #   "go with the flow" and use "--enable-multiplatform" so the symlinks
 #   that are automatically created will be correct...
+
+# Building with --without-etex as it is something for eclipse
+# Building with --disable-xindy as it requires shared libsigsegv
 # Building with "--without-system-xpdf" because poppler API changes too often
+
 TL_BUILD_ENV="CFLAGS=\"$SLKCFLAGS\" CXXFLAGS=\"$SLKCFLAGS\"" \
 TL_CONFIGURE_ARGS="\
   --enable-multiplatform \
-  --with-tex-banner='TeX Live 2011/Slackware (SBo)' \
+  --with-banner-add='TeX Live 2011/Slackware (SBo)' \
   --disable-native-texlive-build \
   --disable-static \
-  --enable-ipc \
   --with-x \
   --without-etex \
   --disable-xindy \
   --without-system-xpdf \
   --with-system-ncurses \
   --with-system-zlib \
-  --with-system-pnglib \
+  --with-system-libpng \
   --with-system-t1lib \
   --with-system-gd \
   --with-system-freetype2 \