~ubuntu-branches/ubuntu/vivid/hyphen/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/02_fix_hyphen_h_for_FILE.dpatch

  • Committer: Package Import Robot
  • Author(s): Rene Engelhard
  • Date: 2014-09-18 21:40:22 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20140918214022-sb8l8lk9ob42x41b
Tags: 2.8.8-1
* New upstream release

* fix second build in a row by removing Makefile.in hunk from patch.
  regen'ed anyway using dh-autoreconf 
* move from dpatch to 3.0 (quilt)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 02_fix_hyphen_h_for_FILE.dpatch by  <rene@frodo>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: fix hyphen.h to #include <stdio.h> as otherwise FILE* is not defined and:
6
 
## DP: configure:32138: checking for hyphen.h
7
 
## DP: configure:32138: result: yes
8
 
## DP: configure:32146: checking for struct _HyphenDict.cset
9
 
## 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
10
 
## DP: In file included from conftest.c:101:0:
11
 
## DP: /usr/include/hyphen.h:97:35: error: unknown type name 'FILE'
12
 
## DP:  HyphenDict *hnj_hyphen_load_file (FILE *f);
13
 
## DP:                                    ^
14
 
## DP: configure:32146: $? = 1
15
 
## DP: configure: failed program was:
16
 
 
17
 
@DPATCH@
18
 
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
19
 
--- hyphen-2.8.7~/hyphen.h      2014-06-28 12:26:29.000000000 +0200
20
 
+++ hyphen-2.8.7/hyphen.h       2014-06-28 12:27:47.469187586 +0200
21
 
@@ -55,6 +55,8 @@
22
 
 extern "C" {
23
 
 #endif /* __cplusplus */
24
 
 
25
 
+#include <stdio.h>
26
 
+
27
 
 typedef struct _HyphenDict HyphenDict;
28
 
 typedef struct _HyphenState HyphenState;
29
 
 typedef struct _HyphenTrans HyphenTrans;