[hyphen] 26/29: Imported Debian patch 2.8.7-2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit 2fa7edca7c201048ce4275ea4b91e92a14898a25
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 28 12:24:46 2014 +0200
Imported Debian patch 2.8.7-2
---
debian/changelog | 8 +++++++
libhyphen0.symbols => debian/libhyphen0.symbols | 0
debian/patches/00list | 1 +
debian/patches/02_fix_hyphen_h_for_FILE.dpatch | 29 +++++++++++++++++++++++++
4 files changed, 38 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c11a28e..01d2f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hyphen (2.8.7-2) unstable; urgency=low
+
+ * make hyphen.h #include <stdio.h> so that FILE* is defined..
+
+ * fix .symbols
+
+ -- Rene Engelhard <rene@debian.org> Sat, 28 Jun 2014 12:24:46 +0200
+
hyphen (2.8.7-1) unstable; urgency=low
* New upstream release
diff --git a/libhyphen0.symbols b/debian/libhyphen0.symbols
similarity index 100%
rename from libhyphen0.symbols
rename to debian/libhyphen0.symbols
diff --git a/debian/patches/00list b/debian/patches/00list
index ef553c8..f244c46 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
01_hyphen_tex_from_TeXLive
+02_fix_hyphen_h_for_FILE
diff --git a/debian/patches/02_fix_hyphen_h_for_FILE.dpatch b/debian/patches/02_fix_hyphen_h_for_FILE.dpatch
new file mode 100644
index 0000000..28a061d
--- /dev/null
+++ b/debian/patches/02_fix_hyphen_h_for_FILE.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_hyphen_h_for_FILE.dpatch by <rene@frodo>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix hyphen.h to #include <stdio.h> as otherwise FILE* is not defined and:
+## DP: configure:32138: checking for hyphen.h
+## DP: configure:32138: result: yes
+## DP: configure:32146: checking for struct _HyphenDict.cset
+## DP: configure:32146: x86_64-linux-gnu-gcc -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 conftest.c >&5
+## DP: In file included from conftest.c:101:0:
+## DP: /usr/include/hyphen.h:97:35: error: unknown type name 'FILE'
+## DP: HyphenDict *hnj_hyphen_load_file (FILE *f);
+## DP: ^
+## DP: configure:32146: $? = 1
+## DP: configure: failed program was:
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hyphen-2.8.7~/hyphen.h hyphen-2.8.7/hyphen.h
+--- hyphen-2.8.7~/hyphen.h 2014-06-28 12:26:29.000000000 +0200
++++ hyphen-2.8.7/hyphen.h 2014-06-28 12:27:47.469187586 +0200
+@@ -55,6 +55,8 @@
+ extern "C" {
+ #endif /* __cplusplus */
+
++#include <stdio.h>
++
+ typedef struct _HyphenDict HyphenDict;
+ typedef struct _HyphenState HyphenState;
+ typedef struct _HyphenTrans HyphenTrans;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: