Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_167508713269890"
MIME-Version: 1.0
Date: Mon, 30 Jan 2023 13:58:52 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/ruby-nokogumbo
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20230130135852.A6AA2FA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_167508713269890
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Mon Jan 30 13:58:52 UTC 2023

Modified Files:
	pkgsrc/textproc/ruby-nokogumbo: Makefile distinfo
Added Files:
	pkgsrc/textproc/ruby-nokogumbo/patches: patch-ext_nokogumbo_nokogumbo.c

Log Message:
textproc/ruby-nokogumbo: fix build with Ruby 3.2


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ruby-nokogumbo/Makefile \
    pkgsrc/textproc/ruby-nokogumbo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/ruby-nokogumbo/patches/patch-ext_nokogumbo_nokogumbo.c

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


--_----------=_167508713269890
Content-Disposition: inline
Content-Length: 2577
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/ruby-nokogumbo/Makefile
diff -u pkgsrc/textproc/ruby-nokogumbo/Makefile:1.4 pkgsrc/textproc/ruby-nokogumbo/Makefile:1.5
--- pkgsrc/textproc/ruby-nokogumbo/Makefile:1.4	Wed Jan 25 11:07:40 2023
+++ pkgsrc/textproc/ruby-nokogumbo/Makefile	Mon Jan 30 13:58:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/01/25 11:07:40 taca Exp $
+# $NetBSD: Makefile,v 1.5 2023/01/30 13:58:52 taca Exp $
 
 DISTNAME=	nokogumbo-2.0.5
 CATEGORIES=	textproc
@@ -11,9 +11,6 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri>=1.10:../../textproc/ruby-nokogiri
 
-# dose not support ruby32
-RUBY_VERSIONS_ACCEPTED=	27 30 31
-
 .include "../../lang/ruby/gem.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/ruby-nokogumbo/distinfo
diff -u pkgsrc/textproc/ruby-nokogumbo/distinfo:1.4 pkgsrc/textproc/ruby-nokogumbo/distinfo:1.5
--- pkgsrc/textproc/ruby-nokogumbo/distinfo:1.4	Tue Oct 26 11:23:25 2021
+++ pkgsrc/textproc/ruby-nokogumbo/distinfo	Mon Jan 30 13:58:52 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:23:25 nia Exp $
+$NetBSD: distinfo,v 1.5 2023/01/30 13:58:52 taca Exp $
 
 BLAKE2s (nokogumbo-2.0.5.gem) = f5c00698aaa25c05c21b592fff6da1b1f8aacc1d153403428f7b6f307ccb0d20
 SHA512 (nokogumbo-2.0.5.gem) = 67a25b2bc0bec819feb7f0cc6bae587a8104d2973ba19d516e07b60da75ae8a34be8c3c121e26a6ddc7c07aede711469b73eba311fa2377c6a22a77ae1687fff
 Size (nokogumbo-2.0.5.gem) = 221696 bytes
+SHA1 (patch-ext_nokogumbo_nokogumbo.c) = 6c907004370e22344ad74a7caa17693061d818b6

Added files:

Index: pkgsrc/textproc/ruby-nokogumbo/patches/patch-ext_nokogumbo_nokogumbo.c
diff -u /dev/null pkgsrc/textproc/ruby-nokogumbo/patches/patch-ext_nokogumbo_nokogumbo.c:1.1
--- /dev/null	Mon Jan 30 13:58:52 2023
+++ pkgsrc/textproc/ruby-nokogumbo/patches/patch-ext_nokogumbo_nokogumbo.c	Mon Jan 30 13:58:52 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_nokogumbo_nokogumbo.c,v 1.1 2023/01/30 13:58:52 taca Exp $
+
+* Stop using rb_cData for Ruby 3.2.
+
+--- ext/nokogumbo/nokogumbo.c.orig	2023-01-30 13:55:48.687307066 +0000
++++ ext/nokogumbo/nokogumbo.c
+@@ -489,7 +489,7 @@ static void parse_args_mark(void *parse_
+ // Wrap a ParseArgs pointer. The underlying ParseArgs must outlive the
+ // wrapper.
+ static VALUE wrap_parse_args(ParseArgs *args) {
+-  return Data_Wrap_Struct(rb_cData, parse_args_mark, RUBY_NEVER_FREE, args);
++  return Data_Wrap_Struct(rb_cObject, parse_args_mark, RUBY_NEVER_FREE, args);
+ }
+ 
+ // Returnsd the underlying ParseArgs wrapped by wrap_parse_args.


--_----------=_167508713269890--