Merge branch 'debian/sid' into debian/experimental

diff --git a/debian/changelog b/debian/changelog
index be1fd23047d84e23e8d0261f79e6c3f5911d0937..5f10987a69d927535bfec1f70392a2060d948031 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ rustc (1.19.0+dfsg2-1) UNRELEASED; urgency=medium
 
  -- Ximin Luo <infinity0@debian.org>  Mon, 24 Jul 2017 11:55:53 +0200
 
+rustc (1.18.0+dfsg1-4) unstable; urgency=medium
+
+  * Support gperf 3.1. (Closes: #869610)
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 25 Jul 2017 23:19:47 +0200
+
 rustc (1.18.0+dfsg1-3) unstable; urgency=medium
 
   * Upload to unstable.

diff --git a/debian/patches/series b/debian/patches/series
index 30fb133f00fbc1ed5ea690768cc4b8180a3aa8a7..ffb1308957152aeff09c193ba41e5e6c0889597b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@ u-ignoretest-armhf_06.patch
 u-ignoretest-arm64.patch
 u-ignoretest-ppc64el.patch
 u-allow-disable-debuginfo-only-std.patch
+u-gperf-3.1.patch
 
 # not forwarded, or forwarded but unlikely to be merged
 u-exception-traceback.patch

diff --git a/debian/patches/u-gperf-3.1.patch b/debian/patches/u-gperf-3.1.patch
new file mode 100644 (file)
index 0000000..5e48214
--- /dev/null
+++ b/debian/patches/u-gperf-3.1.patch
@@ -0,0 +1,20 @@
+Description: Support gperf 3.1
+ gperf 3.1 will output `register size_t n` instead of `register unsigned int n`
+ like [here](https://github.com/hoedown/hoedown/blob/2508c4b/src/html_blocks.c#L62).
+ This requires `stddef.h`; giving `-I` to the `gperf` invocation will include
+ `string.h` which includes `stddef.h`.
+Author: Ximin Luo <infinity0@debian.org>
+Bug: https://github.com/hoedown/hoedown/pull/215
+diff --git a/src/rt/hoedown/Makefile b/src/rt/hoedown/Makefile
+index 2b16b887b..378682768 100644
+--- a/src/rt/hoedown/Makefile
++++ b/src/rt/hoedown/Makefile
+@@ -51,7 +51,7 @@ smartypants: bin/smartypants.o $(HOEDOWN_SRC)
+ # Perfect hashing
+ 
+ src/html_blocks.c: html_block_names.gperf
+-      gperf -L ANSI-C -N hoedown_find_block_tag -c -C -E -S 1 --ignore-case -m100 $^ > $@
++      gperf -I -L ANSI-C -N hoedown_find_block_tag -c -C -E -S 1 --ignore-case -m100 $^ > $@
+ 
+ # Testing
+