From 0eec51fc7b429e34dd7dcb50aaa7073b780c34d7 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 4 Sep 2011 09:24:57 -0500 Subject: office/texlive: Included some patches from branch2011 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- office/texlive/texlive.SlackBuild | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'office/texlive/texlive.SlackBuild') 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 \ -- cgit v1.2.3-65-gdbad