diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2014-08-24 13:26:43 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-08-30 14:21:27 +0700 |
| commit | 168defcd3925bcb8e451eeaef3d0f4851db2c2ed (patch) | |
| tree | 1819207d5b4e0e449edaffee360a382731062d2d /office/texlive/patches | |
| parent | 7800a4e6fd948acdd35d3f55e583f9e6f93f4834 (diff) | |
| download | slackbuilds-168defcd3925bcb8e451eeaef3d0f4851db2c2ed.tar.gz | |
office/texlive: Updated for version 20140525.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'office/texlive/patches')
4 files changed, 35 insertions, 23 deletions
diff --git a/office/texlive/patches/fix-xaw3d-linkage-in-xdvik.diff b/office/texlive/patches/fix-xaw3d-linkage-in-xdvik.diff new file mode 100644 index 0000000000..d7297334e8 --- /dev/null +++ b/office/texlive/patches/fix-xaw3d-linkage-in-xdvik.diff @@ -0,0 +1,21 @@ +diff -Nur texlive-20140525-source.orig/texk/xdvik/events.c texlive-20140525-source/texk/xdvik/events.c +--- texlive-20140525-source.orig/texk/xdvik/events.c 2014-04-14 03:35:50.000000000 -0500 ++++ texlive-20140525-source/texk/xdvik/events.c 2014-06-15 13:18:40.762860567 -0500 +@@ -5306,7 +5306,7 @@ + } + + if (actp->proc == Act_wheel) { +-# if XAW ++# if !MOTIF + if (globals.widgets.y_bar != NULL) + XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc, + cast_int_to_XtPointer(dist)); +@@ -5317,7 +5317,7 @@ + # endif /* MOTIF */ + } + else { /* Act_hwheel */ +-# if XAW ++# if !MOTIF + if (globals.widgets.x_bar != NULL) + XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc, + cast_int_to_XtPointer(dist)); diff --git a/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff index ed2a7daa93..0dd2427361 100644 --- a/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff +++ b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff @@ -1,5 +1,6 @@ ---- bad/texk/kpathsea/texmf.cnf 2012-05-12 18:34:52.000000000 -0500 -+++ good/texk/kpathsea/texmf.cnf 2012-07-22 19:26:15.150854012 -0500 +diff -Nur texlive-20140525-source.orig/texk/kpathsea/texmf.cnf texlive-20140525-source/texk/kpathsea/texmf.cnf +--- texlive-20140525-source.orig/texk/kpathsea/texmf.cnf 2014-04-22 16:07:54.000000000 -0500 ++++ texlive-20140525-source/texk/kpathsea/texmf.cnf 2014-06-15 11:42:32.949359812 -0500 @@ -51,7 +51,7 @@ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. % Kpathsea sets SELFAUTOLOC (the directory with the binary), @@ -7,13 +8,13 @@ -TEXMFROOT = $SELFAUTOPARENT +TEXMFROOT = $SELFAUTODIR/share - % The tree containing runtime files related to the specific - % distribution and version. -@@ -61,7 +61,7 @@ + % The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +@@ -61,7 +61,7 @@ + TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. --TEXMFLOCAL = $TEXMFROOT/../texmf-local +-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local +TEXMFLOCAL = $TEXMFROOT/texmf-local % TEXMFSYSVAR, where *-sys store cached runtime data. diff --git a/office/texlive/patches/texcount-scalar-fixup.diff b/office/texlive/patches/texcount-scalar-fixup.diff deleted file mode 100644 index bdd166b81a..0000000000 --- a/office/texlive/patches/texcount-scalar-fixup.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- share/texmf-dist/scripts/texcount/texcount.pl.orig 2013-11-11 18:16:18.388313783 +0000 -+++ share/texmf-dist/scripts/texcount/texcount.pl 2013-11-11 18:16:32.407314117 +0000 -@@ -2218,7 +2218,7 @@ - } - $template=~s/\{VER\}/$versionnumber/gi; - # TODO: Should base warnings and errors on TeXcode or Main object -- $template=__process_template($template,"W|WARN|WARNING|WARNINGS",length(%warnings)); -+ $template=__process_template($template,"W|WARN|WARNING|WARNINGS",scalar(keys %warnings)); - $template=__process_template($template,"E|ERR|ERROR|ERRORS",$errorcount); - $template=__process_template($template,"S|SUM",get_sum_count($count)); - $template=__process_template($template,"T|TITLE",$count->{'title'}||""); diff --git a/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff index 8b76100f6d..7b44f5c0a6 100644 --- a/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff +++ b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff @@ -1,5 +1,6 @@ ---- texlive-20120701-texmf/texmf-dist/web2c/texmf.cnf.orig 2013-06-22 04:30:50.766408343 -0500 -+++ texlive-20120701-texmf/texmf-dist/web2c/texmf.cnf 2013-06-22 04:31:13.717121421 -0500 +diff -Nur texlive-20140525-texmf.orig/texmf-dist/web2c/texmf.cnf texlive-20140525-texmf/texmf-dist/web2c/texmf.cnf +--- texlive-20140525-texmf.orig/texmf-dist/web2c/texmf.cnf 2014-04-22 16:07:54.000000000 -0500 ++++ texlive-20140525-texmf/texmf-dist/web2c/texmf.cnf 2014-06-15 11:42:32.949359812 -0500 @@ -51,7 +51,7 @@ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. % Kpathsea sets SELFAUTOLOC (the directory with the binary), @@ -7,13 +8,13 @@ -TEXMFROOT = $SELFAUTOPARENT +TEXMFROOT = $SELFAUTODIR/share - % The tree containing runtime files related to the specific - % distribution and version. -@@ -61,7 +61,7 @@ + % The main tree of distributed packages and programs: TEXMFDIST = $TEXMFROOT/texmf-dist +@@ -61,7 +61,7 @@ + TEXMFMAIN = $TEXMFDIST % Local additions to the distribution trees. --TEXMFLOCAL = $TEXMFROOT/../texmf-local +-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local +TEXMFLOCAL = $TEXMFROOT/texmf-local % TEXMFSYSVAR, where *-sys store cached runtime data. |