CVS commit: pkgsrc/textproc/xapian

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Aug 29 13:41:15 UTC 2019

Modified Files:
        pkgsrc/textproc/xapian: distinfo-bindings
Added Files:
        pkgsrc/textproc/xapian/patches-bindings: patch-php_php5_xapian__wrap.cc

Log Message:
Apply previous fix to PHP5 as well.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/xapian/distinfo-bindings
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/xapian/patches-bindings/patch-php_php5_xapian__wrap.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/xapian/distinfo-bindings
diff -u pkgsrc/textproc/xapian/distinfo-bindings:1.13 pkgsrc/textproc/xapian/distinfo-bindings:1.14
--- pkgsrc/textproc/xapian/distinfo-bindings:1.13       Wed Aug 28 19:23:38 2019
+++ pkgsrc/textproc/xapian/distinfo-bindings    Thu Aug 29 13:41:15 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo-bindings,v 1.13 2019/08/28 19:23:38 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.14 2019/08/29 13:41:15 schmonz Exp $
 
 SHA1 (xapian-bindings-1.4.12.tar.xz) = ce70a047516fdea3106b92e235f3ca038faba7f2
 RMD160 (xapian-bindings-1.4.12.tar.xz) = b1743d1c67ae32af4074eb40b3eea90493bcbe1d
@@ -8,4 +8,5 @@ SHA1 (patch-configure) = d1c3edf1efcd105
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578
 SHA1 (patch-php7_php7_xapian__wrap.cc) = aa5ca15ef04bbd5038e23f4d1d01d1029243c68e
+SHA1 (patch-php_php5_xapian__wrap.cc) = dc4b225a8db836a32f23fd7545a70c0b2fa412ac
 SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b

Added files:

Index: pkgsrc/textproc/xapian/patches-bindings/patch-php_php5_xapian__wrap.cc
diff -u /dev/null pkgsrc/textproc/xapian/patches-bindings/patch-php_php5_xapian__wrap.cc:1.1
--- /dev/null   Thu Aug 29 13:41:15 2019
+++ pkgsrc/textproc/xapian/patches-bindings/patch-php_php5_xapian__wrap.cc      Thu Aug 29 13:41:15 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-php_php5_xapian__wrap.cc,v 1.1 2019/08/29 13:41:15 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>
+
+--- php/php5/xapian_wrap.cc.orig       2019-07-24 03:37:23.000000000 +0000
++++ php/php5/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 {