[pkgsrc/trunk]: pkgsrc/textproc/xapian Reorder includes in PHP bindings to fi...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad3de8b3f2e0
branches:  trunk
changeset: 338698:ad3de8b3f2e0
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Aug 28 19:23:38 2019 +0000

description:
Reorder includes in PHP bindings to fix SmartOS bulk build error:
"/usr/include/locale.h:53:12: error: 'lconv' is already declared in this scope"
<https://trac.xapian.org/ticket/793>

diffstat:

 textproc/xapian/distinfo-bindings                                |   3 +-
 textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc |  17 ++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 36629ae841ea -r ad3de8b3f2e0 textproc/xapian/distinfo-bindings
--- a/textproc/xapian/distinfo-bindings Wed Aug 28 14:38:42 2019 +0000
+++ b/textproc/xapian/distinfo-bindings Wed Aug 28 19:23:38 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo-bindings,v 1.12 2019/08/02 21:28:12 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.13 2019/08/28 19:23:38 schmonz Exp $
 
 SHA1 (xapian-bindings-1.4.12.tar.xz) = ce70a047516fdea3106b92e235f3ca038faba7f2
 RMD160 (xapian-bindings-1.4.12.tar.xz) = b1743d1c67ae32af4074eb40b3eea90493bcbe1d
@@ -7,4 +7,5 @@
 SHA1 (patch-configure) = d1c3edf1efcd105aef23bf9245650971f8df6ced
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578
+SHA1 (patch-php7_php7_xapian__wrap.cc) = aa5ca15ef04bbd5038e23f4d1d01d1029243c68e
 SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b
diff -r 36629ae841ea -r ad3de8b3f2e0 textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc  Wed Aug 28 19:23:38 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-php7_php7_xapian__wrap.cc,v 1.1 2019/08/28 19:23:38 schmonz Exp $
+
+Reorder includes to fix SmartOS bulk build error:
+"/usr/include/locale.h:53:12: error: 'lconv' is already declared in this scope"
+<https://trac.xapian.org/ticket/793>
+
+--- php7/php7/xapian_wrap.cc.orig      2019-07-24 03:37:42.000000000 +0000
++++ php7/php7/xapian_wrap.cc
+@@ -17,6 +17,8 @@
+ #define SWIG_PREFIX "Xapian"
+ #define SWIG_PREFIX_LEN 6
+ 
++#include <string>
++
+ #ifdef __cplusplus
+ /* SwigValueWrapper is described in swig.swg */
+ template<typename T> class SwigValueWrapper {