From fb5e21309841da9ba0c6a83e4a8965b7bc1770ac Mon Sep 17 00:00:00 2001
From: "Andrew O. Shadoura" <bugzilla@tut.by>
Date: Mon, 18 Apr 2011 14:42:39 +0300
Subject: our users don't need to have mowgli.h; hide include from them (plus
 fix the example)

---
 debian/patches/07-fix-libguess.h.diff | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 src/examples/guessconv/guessconv.c    |  1 +
 src/libguess/libguess.h               |  3 ++-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/07-fix-libguess.h.diff

diff --git a/debian/patches/07-fix-libguess.h.diff b/debian/patches/07-fix-libguess.h.diff
new file mode 100644
index 0000000..6f14463
--- /dev/null
+++ b/debian/patches/07-fix-libguess.h.diff
@@ -0,0 +1,34 @@
+Description: our users don't need to depend on mowgli.h
+    move the #include <mowgli.h> under LIBGUESS_CORE;
+    also, that revealed a bug in guessconv.c, which implicitly
+    depended on unistd.h
+Author: Andrew O. Shadoura <bugzilla@tut.by>
+Bug: http://jira.atheme.org/browse/LG-5
+diff --git a/src/libguess/libguess.h b/src/libguess/libguess.h
+--- a/src/libguess/libguess.h
++++ b/src/libguess/libguess.h
+@@ -40,11 +40,12 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-#include <mowgli.h>
+ 
+ /* prototypes */
+ #ifdef LIBGUESS_CORE
+ 
++#include <mowgli.h>
++
+ #include "autoconf.h"
+ 
+ const char *guess_jp(const char *buf, int buflen);
+diff --git a/src/examples/guessconv/guessconv.c b/src/examples/guessconv/guessconv.c
+--- a/src/examples/guessconv/guessconv.c
++++ b/src/examples/guessconv/guessconv.c
+@@ -34,6 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <libguess.h>
+ #include <iconv.h>
+ #include <errno.h>
diff --git a/debian/patches/series b/debian/patches/series
index 07c756e..2ce2722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 03-use-format.diff
 05-fix-dfa.hg57d6709f5ff5.diff
 06-run-tests.diff
+07-fix-libguess.h.diff
diff --git a/src/examples/guessconv/guessconv.c b/src/examples/guessconv/guessconv.c
index 6777b92..7c42875 100644
--- a/src/examples/guessconv/guessconv.c
+++ b/src/examples/guessconv/guessconv.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <libguess.h>
 #include <iconv.h>
 #include <errno.h>
diff --git a/src/libguess/libguess.h b/src/libguess/libguess.h
index 7ffcb9f..0d49477 100644
--- a/src/libguess/libguess.h
+++ b/src/libguess/libguess.h
@@ -40,11 +40,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <mowgli.h>
 
 /* prototypes */
 #ifdef LIBGUESS_CORE
 
+#include <mowgli.h>
+
 #include "autoconf.h"
 
 const char *guess_jp(const char *buf, int buflen);
-- 
cgit v1.2.3