CVS commit: pkgsrc/devel/ruby-priority-queue

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Sep  9 13:47:11 UTC 2023

Modified Files:
        pkgsrc/devel/ruby-priority-queue: Makefile distinfo
        pkgsrc/devel/ruby-priority-queue/patches:
            patch-ext_priority__queue_priority__queue.c

Log Message:
devel/ruby-priority-queue: build with ruby3.1 and later

Remove restriction to Ruby 3.0.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ruby-priority-queue/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ruby-priority-queue/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c

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

Modified files:

Index: pkgsrc/devel/ruby-priority-queue/Makefile
diff -u pkgsrc/devel/ruby-priority-queue/Makefile:1.13 pkgsrc/devel/ruby-priority-queue/Makefile:1.14
--- pkgsrc/devel/ruby-priority-queue/Makefile:1.13      Tue May 30 15:35:54 2023
+++ pkgsrc/devel/ruby-priority-queue/Makefile   Sat Sep  9 13:47:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/05/30 15:35:54 taca Exp $
+# $NetBSD: Makefile,v 1.14 2023/09/09 13:47:11 taca Exp $
 
 DISTNAME=      PriorityQueue-0.1.2
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/PriorityQueue/priority-queue/}
@@ -12,9 +12,6 @@ LICENSE=      gnu-gpl-v2 OR ruby-license
 
 OVERRIDE_GEMSPEC=      :files priority_queue.so= priority_queue.o=
 
-# Dose not support newer versions.
-RUBY_VERSIONS_ACCEPTED=        30
-
 pre-configure:
        cd ${WRKSRC} && pwd; ${RM} -f priority_queue.so priority_queue.o
 

Index: pkgsrc/devel/ruby-priority-queue/distinfo
diff -u pkgsrc/devel/ruby-priority-queue/distinfo:1.7 pkgsrc/devel/ruby-priority-queue/distinfo:1.8
--- pkgsrc/devel/ruby-priority-queue/distinfo:1.7       Tue Oct 26 10:19:42 2021
+++ pkgsrc/devel/ruby-priority-queue/distinfo   Sat Sep  9 13:47:11 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:19:42 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/09/09 13:47:11 taca Exp $
 
 BLAKE2s (PriorityQueue-0.1.2.gem) = 1a6195e4ff04994dfbb4584bda50eaf5420a37c98db7c3dbf84e69e159e6bf8a
 SHA512 (PriorityQueue-0.1.2.gem) = 67ae4507882e7635bef387b0df63ac7724b285cda5e23a06572477de71c98fd10b7718d966f2d5dba1f8cad29df112929d6b0ca30c042c843d364e5c8abccf23
 Size (PriorityQueue-0.1.2.gem) = 59392 bytes
-SHA1 (patch-ext_priority__queue_priority__queue.c) = ed8e1e9b248d99911526192eed589e8174025ba7
+SHA1 (patch-ext_priority__queue_priority__queue.c) = 9ee6aaccdd1b62b7cc2cbd3464fe8b466d91c818
 SHA1 (patch-lib_priority__queue_ruby__priority__queue.rb) = d7a94bfa1bb91875748f67ca4c65b63612729358

Index: pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c
diff -u pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c:1.1 pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c:1.2
--- pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c:1.1    Sun Feb 14 14:58:20 2021
+++ pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c        Sat Sep  9 13:47:11 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-ext_priority__queue_priority__queue.c,v 1.1 2021/02/14 14:58:20 taca Exp $
+$NetBSD: patch-ext_priority__queue_priority__queue.c,v 1.2 2023/09/09 13:47:11 taca Exp $
 
 Do not declar/define bool, false, true if already defined.
 
---- ext/priority_queue/priority_queue.c.orig   2021-01-11 07:17:11.301968825 +0000
+--- ext/priority_queue/priority_queue.c.orig   2023-09-09 13:39:21.027954251 +0000
 +++ ext/priority_queue/priority_queue.c
 @@ -24,10 +24,16 @@
  #include "ruby.h"
@@ -21,3 +21,52 @@ Do not declar/define bool, false, true i
  
  // Node Structure
  typedef struct struct_priority_node {
+@@ -285,7 +291,7 @@ priority_node* priority_queue_delete_min
+       n = n->right;
+       } while (n!=min->child);
+ 
+-      // Kinder einf�gen
++      // Kinder einfügen
+       if (q->rootlist) {
+       priority_node* const l1 = q->rootlist->left;
+       priority_node* const l2 = n->left;
+@@ -299,10 +305,10 @@ priority_node* priority_queue_delete_min
+       }
+     }
+ 
+-    // Gr��e anpassen
++    // Größe anpassen
+     q->length = length-1;
+ 
+-    // Wieder aufh�bschen
++    // Wieder aufhübschen
+     consolidate_queue(q);
+   }
+ 
+@@ -817,7 +823,7 @@ void pq_node2dot(VALUE result_string, pr
+       pq_node2dot(result_string, n1, level + 1);
+       for (i=0; i<level; i++) rb_str_cat2(result_string, "  ");  
+       rb_str_concat(result_string,
+-        rb_funcall(Qnil, id_format, 4, rb_str_new2("NODE%i -> NODE%i;\n"), 
++        rb_funcall(Qnil, id_format, 3, rb_str_new2("NODE%i -> NODE%i;\n"), 
+           ULONG2NUM((unsigned long) n), ULONG2NUM((unsigned long) n1)));
+       n1 = n1->right;
+     } while(n1 != n->child);
+@@ -874,7 +880,7 @@ VALUE pq_each(VALUE self) {
+ }
+ 
+ static
+-VALUE pq_insert_node(VALUE node, VALUE queue) {
++VALUE pq_insert_node(VALUE node, VALUE queue, int _argc, const VALUE *_argv, VALUE _blockarg) {
+   return pq_push(queue, rb_ary_entry(node, 0), rb_ary_entry(node, 1));
+ }
+ 
+@@ -883,7 +889,7 @@ VALUE pq_initialize_copy(VALUE copy, VAL
+   if (copy == orig)
+     return copy;
+ 
+-  rb_iterate(rb_each, orig, pq_insert_node, copy);
++  rb_block_call(orig, rb_intern("each"), 0, NULL, pq_insert_node, copy);
+   
+   return copy;
+ }