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

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Feb 14 14:58:20 UTC 2021

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

Log Message:
devel/ruby-priority-queue: fix build problem with Ruby 3.0


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ruby-priority-queue/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c \
    pkgsrc/devel/ruby-priority-queue/patches/patch-lib_priority__queue_ruby__priority__queue.rb

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/distinfo
diff -u pkgsrc/devel/ruby-priority-queue/distinfo:1.4 pkgsrc/devel/ruby-priority-queue/distinfo:1.5
--- pkgsrc/devel/ruby-priority-queue/distinfo:1.4       Tue Nov  3 03:29:26 2015
+++ pkgsrc/devel/ruby-priority-queue/distinfo   Sun Feb 14 14:58:20 2021
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:29:26 agc Exp $
+$NetBSD: distinfo,v 1.5 2021/02/14 14:58:20 taca Exp $
 
 SHA1 (PriorityQueue-0.1.2.gem) = 37b3eb7424b056a9ebb94d882f9ce0059303dc3e
 RMD160 (PriorityQueue-0.1.2.gem) = db7e836b0f22b923c374045417e97ad78ab53888
 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-lib_priority__queue_ruby__priority__queue.rb) = d7a94bfa1bb91875748f67ca4c65b63612729358

Added files:

Index: pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c
diff -u /dev/null pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c:1.1
--- /dev/null   Sun Feb 14 14:58:20 2021
+++ pkgsrc/devel/ruby-priority-queue/patches/patch-ext_priority__queue_priority__queue.c        Sun Feb 14 14:58:20 2021
@@ -0,0 +1,23 @@
+$NetBSD: patch-ext_priority__queue_priority__queue.c,v 1.1 2021/02/14 14:58:20 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
+@@ -24,10 +24,16 @@
+ #include "ruby.h"
+ #include <math.h>
+ 
++#ifndef bool
+ typedef _Bool bool;
++#endif
+ 
++#ifndef false
+ #define false 0;
++#endif
++#ifndef true
+ #define true 1;
++#endif
+ 
+ // Node Structure
+ typedef struct struct_priority_node {
Index: pkgsrc/devel/ruby-priority-queue/patches/patch-lib_priority__queue_ruby__priority__queue.rb
diff -u /dev/null pkgsrc/devel/ruby-priority-queue/patches/patch-lib_priority__queue_ruby__priority__queue.rb:1.1
--- /dev/null   Sun Feb 14 14:58:20 2021
+++ pkgsrc/devel/ruby-priority-queue/patches/patch-lib_priority__queue_ruby__priority__queue.rb Sun Feb 14 14:58:20 2021
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_priority__queue_ruby__priority__queue.rb,v 1.1 2021/02/14 14:58:20 taca Exp $
+
+Convert to UTF-8.
+
+--- lib/priority_queue/ruby_priority_queue.rb.orig     2021-01-11 07:17:11.306557525 +0000
++++ lib/priority_queue/ruby_priority_queue.rb
+@@ -458,7 +458,7 @@ class RubyPriorityQueue
+         n = n.right;
+       end while n != min.child
+ 
+-      # Kinder einf�gen
++      # Kinder einfügen
+       if @rootlist
+         l1 = @rootlist.left
+         l2 = n.left
+@@ -472,10 +472,10 @@ class RubyPriorityQueue
+       end
+       end
+ 
+-      # Gr��e anpassen
++      # Größe anpassen
+       @length -= 1
+ 
+-      # Wieder aufh�bschen
++      # Wieder aufhübschen
+       consolidate
+     end
+