[texlive-nonbin] 03/06: backport fix for infinite loop in glossaries-extra
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit cc26a1ce6ef3873f6a310d532981908092adb041
Author: Norbert Preining <preining@debian.org>
Date: Sun Feb 12 15:38:05 2017 +0900
backport fix for infinite loop in glossaries-extra
---
texlive-extra/debian/changelog | 3 +-
texlive-extra/debian/patches/series | 1 +
.../upstream-glossaries-extra-infinite-loop | 32 ++++++++++++++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 23071e5..f836a4b 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,8 +1,9 @@
texlive-extra (2016.20170123-3) UNRELEASED; urgency=medium
* fix location of contracard.sty (Closes: #854800)
+ * backport fix for infinite loop in glossaries-extra (Closes: #854931)
- -- Norbert Preining <preining@debian.org> Sun, 12 Feb 2017 15:23:11 +0900
+ -- Norbert Preining <preining@debian.org> Sun, 12 Feb 2017 15:50:18 +0900
texlive-extra (2016.20170123-2) unstable; urgency=medium
diff --git a/texlive-extra/debian/patches/series b/texlive-extra/debian/patches/series
index 89d6823..ece01b5 100644
--- a/texlive-extra/debian/patches/series
+++ b/texlive-extra/debian/patches/series
@@ -9,3 +9,4 @@ fix-algorithm2e
sympytex-path
fix-gbrief-multiple
upstream-fix-contracard
+upstream-glossaries-extra-infinite-loop
diff --git a/texlive-extra/debian/patches/upstream-glossaries-extra-infinite-loop b/texlive-extra/debian/patches/upstream-glossaries-extra-infinite-loop
new file mode 100644
index 0000000..a3fb180
--- /dev/null
+++ b/texlive-extra/debian/patches/upstream-glossaries-extra-infinite-loop
@@ -0,0 +1,32 @@
+---
+ texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty | 17 +++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+--- texlive-extra-2016.20170123.orig/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
++++ texlive-extra-2016.20170123/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+@@ -948,10 +948,23 @@
+ \@glsxtr@record{#1}{#2}%
+ \@glsxtr@org@GLSpl@{#1}{#2}%
+ }%
+-\let\@glsxtr@org@glsdisp\@glsdisp
+ \renewcommand*{\@glsdisp}[3][]{%
+ \@glsxtr@record{#1}{#2}%
+- \@glsxtr@org@glsdisp[#1]{#2}{#3}%
++ \glsdoifexists{#2}{%
++ \let\do@gls@link@checkfirsthyper\@gls@link@checkfirsthyper
++ \let\glsifplural\@secondoftwo
++ \let\glscapscase\@firstofthree
++ \def\glscustomtext{#3}%
++ \def\glsinsert{}%
++ \def\@glo@text{\csname gls@\glstype @entryfmt\endcsname}%
++ \@gls@link[#1]{#2}{\@glo@text}%
++ \ifKV@glslink@local
++ \glslocalunset{#2}%
++ \else
++ \glsunset{#2}%
++ \fi
++ }%
++ \glspostlinkhook
+ }
+ \renewcommand*{\@gls@@link}[3][]{%
+ \@glsxtr@record{#1}{#2}%
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: