Followup-For: Bug #960371
Control: tag -1 patch
Hi,
since I had to fix the same bug in libexplain, I'm quickly did a patch for
fhist as well.
Andreas
diff -Nru fhist-1.18/debian/changelog fhist-1.18/debian/changelog
--- fhist-1.18/debian/changelog 2015-07-01 09:41:29.000000000 +0200
+++ fhist-1.18/debian/changelog 2020-05-18 19:06:01.000000000 +0200
@@ -1,3 +1,11 @@
+fhist (1.18-3) UNRELEASED; urgency=medium
+
+ * Get rid of crude sed manipulation on bison output (breaking with bison
+ 3.6.1) and define api.prefix instead, thanks to Akim Demaille.
+ (Closes: #960371)
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 18 May 2020 19:06:01 +0200
+
fhist (1.18-2) unstable; urgency=medium
* pass -fgnu89-inline to gcc to fix "FTBFS with GCC-5" (Closes: #777849)
diff -Nru fhist-1.18/debian/patches/sanitize-bison.patch
fhist-1.18/debian/patches/sanitize-bison.patch
--- fhist-1.18/debian/patches/sanitize-bison.patch 1970-01-01
01:00:00.000000000 +0100
+++ fhist-1.18/debian/patches/sanitize-bison.patch 2020-05-18
19:06:01.000000000 +0200
@@ -0,0 +1,36 @@
+Author: Andreas Beckmann <a...@debian.org>
+Description: sanitize bison usage
+ use
+ %define api.prefix {...}
+ instead of crude
+ sed -e 's/[yY][yY]/.../g'
+
+ Thanks to Akim Demaille for the hint! (#960608)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -567,11 +567,11 @@ common/sub/expr_gram.gen.c common/sub/ex
+ common/sub/expr_gram.y
+ @echo Expect no conflicts:
+ $(YACC) -d common/sub/expr_gram.y
+- sed -e 's/[yY][yY]/sub_expr_gram_/g' -e '/#include.<stdio.h>/d' \
++ sed -e '/#include.<stdio.h>/d' \
+ -e '/#include.<stdlib.h>/d' -e '/#include.<stddef.h>/d' \
+ -e '/#include.<libintl.h>/d' y.tab.c > \
+ common/sub/expr_gram.gen.c
+- sed -e 's/[yY][yY]/sub_expr_gram_/g' y.tab.h > \
++ sed -e '' y.tab.h > \
+ common/sub/expr_gram.gen.h
+ rm y.tab.c y.tab.h
+
+--- a/common/sub/expr_gram.y
++++ b/common/sub/expr_gram.y
+@@ -17,6 +17,8 @@
+ * <http://www.gnu.org/licenses/>.
+ */
+
++%define api.prefix {sub_expr_gram_}
++
+ %{
+
+ #include <ac/stdarg.h>
diff -Nru fhist-1.18/debian/patches/series fhist-1.18/debian/patches/series
--- fhist-1.18/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ fhist-1.18/debian/patches/series 2020-05-18 19:03:11.000000000 +0200
@@ -0,0 +1 @@
+sanitize-bison.patch
