summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-07-07 22:50:30 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-07-07 22:50:30 +0000
commit7a82b4a9bef2fd41fc6f7fbbd41b8492b2ae3f17 (patch)
treedb36d3a557419c948964390394600d1e550f7b80 /Build
parentc05b8e5fb2284d06f5351dede5150809dddea6d5 (diff)
Forgot to update xindy-PATCHES
git-svn-id: svn://tug.org/texlive/trunk@41657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/xindy/xindy-PATCHES/ChangeLog5
-rw-r--r--Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-needs-language13
-rw-r--r--Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-script (renamed from Build/source/utils/xindy/xindy-PATCHES/patch-02-win32-paths-with-spaces)39
3 files changed, 37 insertions, 20 deletions
diff --git a/Build/source/utils/xindy/xindy-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-PATCHES/ChangeLog
index 519f6d7825a..996a8430c27 100644
--- a/Build/source/utils/xindy/xindy-PATCHES/ChangeLog
+++ b/Build/source/utils/xindy/xindy-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-01-xindy-needs-language, patch-02-win32-paths-with-spaces:
+ Unify into patch-01-xindy-script.
+
2015-08-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-02-win32-paths-with-spaces: Fix from Joachim Schrod.
diff --git a/Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-needs-language b/Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-needs-language
deleted file mode 100644
index 8ce59c764a0..00000000000
--- a/Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-needs-language
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.in xindy-2.5.1/user-commands/xindy.in
---- xindy-2.5.1.orig/user-commands/xindy.in 2014-05-11 15:45:44.000000000 +0200
-+++ xindy-2.5.1/user-commands/xindy.in 2014-10-24 10:38:47.000000000 +0200
-@@ -732,6 +732,9 @@
- #
- # FIXME: I didn't see all languages. What's on with gypsy and
- # hausa?
-+ if ( !$language ) {
-+ $language = "general";
-+ }
- if ( $language ) {
- # If there is no language directory, this might be a variant.
- # Language names and variants are separated by hyphens. The
diff --git a/Build/source/utils/xindy/xindy-PATCHES/patch-02-win32-paths-with-spaces b/Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-script
index a4cd9fc61ca..3a82b5269e8 100644
--- a/Build/source/utils/xindy/xindy-PATCHES/patch-02-win32-paths-with-spaces
+++ b/Build/source/utils/xindy/xindy-PATCHES/patch-01-xindy-script
@@ -1,6 +1,6 @@
-diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.1 xindy-2.5.1/user-commands/xindy.1
---- xindy-2.5.1.orig/user-commands/xindy.1 2014-05-29 22:26:05.000000000 +0200
-+++ xindy-2.5.1/user-commands/xindy.1 2015-08-15 11:59:42.000000000 +0200
+diff -ur xindy-2.5.1.orig/user-commands/xindy.1 xindy-src/user-commands/xindy.1
+--- xindy-2.5.1.orig/user-commands/xindy.1 Fri May 30 05:26:05 2014
++++ xindy-src/user-commands/xindy.1 Tue Feb 23 00:06:15 2016
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
@@ -16,9 +16,9 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
-diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.in xindy-2.5.1/user-commands/xindy.in
---- xindy-2.5.1.orig/user-commands/xindy.in 2014-10-24 10:38:47.000000000 +0200
-+++ xindy-2.5.1/user-commands/xindy.in 2015-08-15 11:59:17.000000000 +0200
+diff -ur xindy-2.5.1.orig/user-commands/xindy.in xindy-src/user-commands/xindy.in
+--- xindy-2.5.1.orig/user-commands/xindy.in Sun May 11 22:45:44 2014
++++ xindy-src/user-commands/xindy.in Wed Jun 08 09:30:20 2016
@@ -353,6 +353,7 @@
use Cwd;
@@ -71,7 +71,17 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind
print "Running filter: $filter <$input >$output\n" if $verbose;
system "$filter <$input >$output";
print "filtered xindy input file: $output\n" if $debug{script};
-@@ -765,7 +775,7 @@
+@@ -732,6 +742,9 @@
+ #
+ # FIXME: I didn't see all languages. What's on with gypsy and
+ # hausa?
++ if ( !$language ) {
++ $language = "general";
++ }
+ if ( $language ) {
+ # If there is no language directory, this might be a variant.
+ # Language names and variants are separated by hyphens. The
+@@ -762,7 +775,7 @@
@codepages = qw(latin cp iso8859 ascii utf8) unless @codepages;
my @styles;
foreach my $cp ( @codepages ) {
@@ -80,3 +90,18 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind
last if @styles;
}
unless ( @styles ) {
+@@ -790,7 +803,13 @@
+ push (@temp_files, $style_file);
+ $style_file=quotify($style_file);
+ foreach my $module ( @modules ) {
+- print $sf "(require \"$module\")\n";
++ my $fnmodule=`kpsewhich -progname=xindy -format=othertext $module`;
++ if ($fnmodule) {
++ chomp($fnmodule);
++ print $sf "(require \"$fnmodule\")\n";
++ } else {
++ print $sf "(require \"$module\")\n";
++ }
+ }
+ close ($sf);
+ }