summaryrefslogtreecommitdiffstats
path: root/office
diff options
context:
space:
mode:
author David Woodfall <dave@dawoodfall.net>2013-11-11 13:46:07 -0600
committer Robby Workman <rworkman@slackbuilds.org>2013-11-11 14:22:47 -0600
commit8600bd8bf39b42c54db4ee3566f3e3168a0aee5e (patch)
tree503ee4ebb271e8b3583fb34e761c355b286c53fb /office
parent09a0bede5044ae4ddd961366cb19351ecf0c22f9 (diff)
downloadslackbuilds-8600bd8bf39b42c54db4ee3566f3e3168a0aee5e.tar.gz
slackbuilds-8600bd8bf39b42c54db4ee3566f3e3168a0aee5e.tar.xz
office/texlive: Patched to fix texcount.pl
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/texlive/patches/texcount-scalar-fixup.diff11
-rw-r--r--office/texlive/texlive.SlackBuild3
2 files changed, 14 insertions, 0 deletions
diff --git a/office/texlive/patches/texcount-scalar-fixup.diff b/office/texlive/patches/texcount-scalar-fixup.diff
new file mode 100644
index 0000000000..bdd166b81a
--- /dev/null
+++ b/office/texlive/patches/texcount-scalar-fixup.diff
@@ -0,0 +1,11 @@
+--- 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/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index 69d2109f9b..c566daff0d 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -164,6 +164,9 @@ find . \
# Fix up some paths
patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
+# Thanks to David Woodfall for this patch
+patch -p1 < $CWD/patches/texcount-scalar-fixup.diff
+
# Move manual pages to the correct place
# There's some duplicates of stuff that's already present in /usr/man
# from the texlive source we just compiled above, but I'm going to