Received: by mail.netbsd.org (Postfix, from userid 605) id 302FC84D83; Wed, 28 Aug 2019 19:23:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AB11E84D6C for ; Wed, 28 Aug 2019 19:23:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pJse_3eJJyE1 for ; Wed, 28 Aug 2019 19:23:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2F47B84D4B for ; Wed, 28 Aug 2019 19:23:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 264A0FBF4; Wed, 28 Aug 2019 19:23:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156702021984900" MIME-Version: 1.0 Date: Wed, 28 Aug 2019 19:23:39 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc/xapian To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20190828192339.264A0FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156702021984900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Wed Aug 28 19:23:39 UTC 2019 Modified Files: pkgsrc/textproc/xapian: distinfo-bindings Added Files: pkgsrc/textproc/xapian/patches-bindings: patch-php7_php7_xapian__wrap.cc Log Message: 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" To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/xapian/distinfo-bindings cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156702021984900 Content-Disposition: inline Content-Length: 1984 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/xapian/distinfo-bindings diff -u pkgsrc/textproc/xapian/distinfo-bindings:1.12 pkgsrc/textproc/xapian/distinfo-bindings:1.13 --- pkgsrc/textproc/xapian/distinfo-bindings:1.12 Fri Aug 2 21:28:12 2019 +++ pkgsrc/textproc/xapian/distinfo-bindings Wed Aug 28 19:23:38 2019 @@ -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 @@ Size (xapian-bindings-1.4.12.tar.xz) = 1 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 Added files: Index: pkgsrc/textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc diff -u /dev/null pkgsrc/textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc:1.1 --- /dev/null Wed Aug 28 19:23:39 2019 +++ pkgsrc/textproc/xapian/patches-bindings/patch-php7_php7_xapian__wrap.cc Wed Aug 28 19:23:38 2019 @@ -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" + + +--- 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 ++ + #ifdef __cplusplus + /* SwigValueWrapper is described in swig.swg */ + template class SwigValueWrapper { --_----------=_156702021984900--