Received: by mail.netbsd.org (Postfix, from userid 605) id 5C20384DA2; Sun, 14 Feb 2021 15:06:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9658884D9B for ; Sun, 14 Feb 2021 15:06:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id nIRA9gVTB0ym for ; Sun, 14 Feb 2021 15:06:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CE16C84CED for ; Sun, 14 Feb 2021 15:06:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C1B41FA95; Sun, 14 Feb 2021 15:06:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1613315203175970" MIME-Version: 1.0 Date: Sun, 14 Feb 2021 15:06:43 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/textproc/ruby-ferret To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20210214150643.C1B41FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1613315203175970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sun Feb 14 15:06:43 UTC 2021 Modified Files: pkgsrc/textproc/ruby-ferret: Makefile distinfo Added Files: pkgsrc/textproc/ruby-ferret/patches: patch-ext_config.h patch-ext_ferret.h patch-ext_index.h patch-ext_q__boolean.c patch-ext_q__span.c Log Message: textproc/ruby-ferret: build fixes for Ruby 3.0 and more * Fix build problem with Ruby 3.0. * Really compare two objects in two cases. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/ruby-ferret/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/ruby-ferret/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/ruby-ferret/patches/patch-ext_config.h \ pkgsrc/textproc/ruby-ferret/patches/patch-ext_ferret.h \ pkgsrc/textproc/ruby-ferret/patches/patch-ext_index.h \ pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__boolean.c \ pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__span.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1613315203175970 Content-Disposition: inline Content-Length: 5854 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/ruby-ferret/Makefile diff -u pkgsrc/textproc/ruby-ferret/Makefile:1.13 pkgsrc/textproc/ruby-ferret/Makefile:1.14 --- pkgsrc/textproc/ruby-ferret/Makefile:1.13 Tue Oct 23 12:39:25 2018 +++ pkgsrc/textproc/ruby-ferret/Makefile Sun Feb 14 15:06:43 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2018/10/23 12:39:25 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2021/02/14 15:06:43 taca Exp $ DISTNAME= ferret-0.11.8.7 +PKGREVISION= 1 CATEGORIES= textproc MAINTAINER= minskim@NetBSD.org Index: pkgsrc/textproc/ruby-ferret/distinfo diff -u pkgsrc/textproc/ruby-ferret/distinfo:1.9 pkgsrc/textproc/ruby-ferret/distinfo:1.10 --- pkgsrc/textproc/ruby-ferret/distinfo:1.9 Mon Jun 5 15:21:20 2017 +++ pkgsrc/textproc/ruby-ferret/distinfo Sun Feb 14 15:06:43 2021 @@ -1,6 +1,11 @@ -$NetBSD: distinfo,v 1.9 2017/06/05 15:21:20 taca Exp $ +$NetBSD: distinfo,v 1.10 2021/02/14 15:06:43 taca Exp $ SHA1 (ferret-0.11.8.7.gem) = f4e1d8bb38f4d33460a14f640653ce2ae37b9522 RMD160 (ferret-0.11.8.7.gem) = cd7ed8539dd4ab06700816d90f0408db081575de SHA512 (ferret-0.11.8.7.gem) = ac7cafa25ade9741e0eb95d7372f6dd7ce4ea82368c69ace536b852fd5cc435d05764041ba1bddcc6098665c6e1aa7a12ac9739e45362007f726f3e7a8124df1 Size (ferret-0.11.8.7.gem) = 608768 bytes +SHA1 (patch-ext_config.h) = ec58ab6e60abccd10bc7d10b65b7b5c369873800 +SHA1 (patch-ext_ferret.h) = 856a11685bcf961ac43f2ff0b453c1a154e5b3f3 +SHA1 (patch-ext_index.h) = 14f8f62bb9af1c17922d4ed02922aaac8b3f94d3 +SHA1 (patch-ext_q__boolean.c) = 5d3c1fb89faf0d6e1fb4f9f2e29b785c45a3108b +SHA1 (patch-ext_q__span.c) = 0de4b4b689267ed540c002f26bb1ae6116e54b07 Added files: Index: pkgsrc/textproc/ruby-ferret/patches/patch-ext_config.h diff -u /dev/null pkgsrc/textproc/ruby-ferret/patches/patch-ext_config.h:1.1 --- /dev/null Sun Feb 14 15:06:43 2021 +++ pkgsrc/textproc/ruby-ferret/patches/patch-ext_config.h Sun Feb 14 15:06:43 2021 @@ -0,0 +1,17 @@ +$NetBSD: patch-ext_config.h,v 1.1 2021/02/14 15:06:43 taca Exp $ + +* Do not typedef bool unconditionally. + +--- ext/config.h.orig 2021-01-11 06:26:19.797199031 +0000 ++++ ext/config.h +@@ -17,8 +17,10 @@ extern "C" { + #endif + + #ifndef __cplusplus ++#ifndef bool + typedef unsigned int bool; + #endif ++#endif + typedef unsigned char frt_uchar; + + typedef posh_u16_t frt_u16; Index: pkgsrc/textproc/ruby-ferret/patches/patch-ext_ferret.h diff -u /dev/null pkgsrc/textproc/ruby-ferret/patches/patch-ext_ferret.h:1.1 --- /dev/null Sun Feb 14 15:06:43 2021 +++ pkgsrc/textproc/ruby-ferret/patches/patch-ext_ferret.h Sun Feb 14 15:06:43 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_ferret.h,v 1.1 2021/02/14 15:06:43 taca Exp $ + +Use modern API. + +--- ext/ferret.h.orig 2021-01-11 06:15:38.540000961 +0000 ++++ ext/ferret.h +@@ -72,7 +72,7 @@ extern char *rs2s(VALUE rstr); + extern char *rstrdup(VALUE rstr); + extern Symbol rintern(VALUE rstr); + #define Frt_Make_Struct(klass)\ +- rb_data_object_alloc(klass,NULL,(RUBY_DATA_FUNC)NULL,(RUBY_DATA_FUNC)NULL) ++ rb_data_object_wrap(klass,NULL,(RUBY_DATA_FUNC)NULL,(RUBY_DATA_FUNC)NULL) + + #define Frt_Wrap_Struct(self,mmark,mfree,mdata)\ + do {\ Index: pkgsrc/textproc/ruby-ferret/patches/patch-ext_index.h diff -u /dev/null pkgsrc/textproc/ruby-ferret/patches/patch-ext_index.h:1.1 --- /dev/null Sun Feb 14 15:06:43 2021 +++ pkgsrc/textproc/ruby-ferret/patches/patch-ext_index.h Sun Feb 14 15:06:43 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_index.h,v 1.1 2021/02/14 15:06:43 taca Exp $ + +* Avoid to use bool. + +--- ext/index.h.orig 2021-01-11 06:20:40.416664005 +0000 ++++ ext/index.h +@@ -592,7 +592,7 @@ typedef struct FrtLazyDocField + FrtLazyDoc *doc; + int size; /* number of data elements */ + int len; /* length of data elements concatenated */ +- bool is_compressed : 2; /* set to 2 after all data is loaded */ ++ int is_compressed : 2; /* set to 2 after all data is loaded */ + } FrtLazyDocField; + + extern char *frt_lazy_df_get_data(FrtLazyDocField *self, int i); Index: pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__boolean.c diff -u /dev/null pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__boolean.c:1.1 --- /dev/null Sun Feb 14 15:06:43 2021 +++ pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__boolean.c Sun Feb 14 15:06:43 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_q__boolean.c,v 1.1 2021/02/14 15:06:43 taca Exp $ + +Really compare two objects. + +--- ext/q_boolean.c.orig 2021-01-11 06:15:38.573963936 +0000 ++++ ext/q_boolean.c +@@ -1528,7 +1528,7 @@ static int bq_eq(Query *self, Query *o) + BooleanQuery *bq1 = BQ(self); + BooleanQuery *bq2 = BQ(o); + if ((bq1->coord_disabled != bq2->coord_disabled) +- || (bq1->max_clause_cnt != bq1->max_clause_cnt) ++ || (bq1->max_clause_cnt != bq2->max_clause_cnt) + || (bq1->clause_cnt != bq2->clause_cnt)) { + return false; + } Index: pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__span.c diff -u /dev/null pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__span.c:1.1 --- /dev/null Sun Feb 14 15:06:43 2021 +++ pkgsrc/textproc/ruby-ferret/patches/patch-ext_q__span.c Sun Feb 14 15:06:43 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_q__span.c,v 1.1 2021/02/14 15:06:43 taca Exp $ + +Really compare two objects. + +--- ext/q_span.c.orig 2021-01-11 06:15:38.585794380 +0000 ++++ ext/q_span.c +@@ -2254,7 +2254,7 @@ static int spanxq_eq(Query *self, Query + Query *spanxq_new_nr(Query *inc, Query *exc) + { + Query *self; +- if (SpQ(inc)->field != SpQ(inc)->field) { ++ if (SpQ(inc)->field != SpQ(exc)->field) { + RAISE(ARG_ERROR, "All clauses in a SpanQuery must have the same field. " + "Attempted to add a SpanQuery with field \"%s\" along with a " + "SpanQuery with field \"%s\" to an SpanNotQuery", --_----------=_1613315203175970--