diff options
| author | Frank Terbeck <ft@bewatermyfriend.org> | 2011-02-21 21:53:39 +0100 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2011-03-02 18:55:25 +0100 |
| commit | 6ced6e2c734b0f6921cee8bc06580409573636f4 (patch) | |
| tree | 4ea8123f5bcb62acf9ea9864a2fd0ad5bc94a756 | |
| parent | 983b6365fcf672434eb1054896495f5c5a062ba6 (diff) | |
| download | zsh-6ced6e2c734b0f6921cee8bc06580409573636f4.tar.gz zsh-6ced6e2c734b0f6921cee8bc06580409573636f4.zip | |
Adding patch to support yodl3
This requires the autotools patches to updated.
| -rw-r--r-- | debian/patches/0004-support-yodl3.diff | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches/0004-support-yodl3.diff b/debian/patches/0004-support-yodl3.diff new file mode 100644 index 000000000..85e41294b --- /dev/null +++ b/debian/patches/0004-support-yodl3.diff @@ -0,0 +1,40 @@ +This patch is included upstream. + <http://www.zsh.org/mla/workers/2011/msg00074.html> + +Index: pkg-zsh/Config/defs.mk.in +=================================================================== +--- pkg-zsh.orig/Config/defs.mk.in 2011-02-21 21:50:36.000000000 +0100 ++++ pkg-zsh/Config/defs.mk.in 2011-02-21 21:51:33.000000000 +0100 +@@ -73,9 +73,9 @@ + # utilities + AWK = @AWK@ + ANSI2KNR = @ANSI2KNR@ +-YODL = @YODL@ +-YODL2TXT = $(YODL)2txt +-YODL2HTML = $(YODL)2html ++YODL = @YODL@ @YODL_OPTIONS@ ++YODL2TXT = @YODL@2txt ++YODL2HTML = @YODL@2html + PDFETEX = @PDFETEX@ + TEXI2PDF = @TEXI2PDF@ + +Index: pkg-zsh/configure.ac +=================================================================== +--- pkg-zsh.orig/configure.ac 2011-02-21 21:50:42.000000000 +0100 ++++ pkg-zsh/configure.ac 2011-02-21 21:51:33.000000000 +0100 +@@ -539,6 +539,15 @@ + AC_PROG_LN dnl Check for working ln, for "make install" + AC_PROG_EGREP dnl sets $EGREP to grep -E or egrep + AC_CHECK_PROGS([YODL], [yodl], [: yodl]) ++ ++YODL_OPTIONS='' ++if test "x$ac_cv_prog_YODL" = xyodl; then ++ case `yodl --version` in ++ *"version 3."*) YODL_OPTIONS='-L' ;; ++ esac ++fi ++AC_SUBST(YODL_OPTIONS) ++ + AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex]) + AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], []) + AC_CHECK_PROGS([TEXI2HTML], [texi2html], []) diff --git a/debian/patches/series b/debian/patches/series index 66f2d48eb..1dfab8e2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0001-colors-with-ksharrays.diff 0002-vcs_info-svn-detection.diff 0003-regex-match-crash-fix.diff +0004-support-yodl3.diff |