curses 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d2078ada136fc3603a23e253c9342efe47cc62daad3db6459c57d1822b740a
-  data.tar.gz: 27ee0f6320474baacbe459dc52f40500240d55ce7656663cf8c8074774643fdf
+  metadata.gz: e01aab88579c53f7ae662c5df89c10280832e35c629688aef762da4664ae07ea
+  data.tar.gz: 64e74cfb2a024e1be5543893a8e4c22b13db65ec8ee78a4a8cd9b5b1dd58bc14
 SHA512:
-  metadata.gz: dd21a812ca31bc59dc6e4377a61fc1b19d57779c95b5da48b358b28eb69f29686273de212527744038e508e0a42aed87ead357fe91f85d075eee30eed2aa1a68
-  data.tar.gz: e378f6977737d7871074d3fd08436b447823ef347fc67cfe4d367fc245bb7238c2d7514799a2a6324c2ec5cebb544c94f5fabaacfe66adc753ecc6c372970648
+  metadata.gz: bde0d0f8f8a93810e881c000b2058b8edbcde64d81ebfe899799fa166ed87be60a8dcf8f758af8732082da82f4071ff44dcb715fb550cd45ca56acd8aa42a0e2
+  data.tar.gz: 58ae3617bd9227587cbe06e3d77b36c118cf0fdf45e501011debe117cf5d3b45cefcf0689835e822e567d21aee15a9cf510932dcee0410923161447f14a3e14f

data/History.md

@@ -1,3 +1,10 @@
+### 1.3.1 / 2019-04-21
+
+Bug fixes:
+
+* Check whether sizeof(WINDOW) is available to avoid build failures on macOS.
+  Issue #48 reported by chdiza.
+
 ### 1.3.0 / 2019-04-16
 
 New features:

data/curses.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
   s.author = ["Shugo Maeda", 'Eric Hodel']
   s.email = ["shugo@ruby-lang.org", 'drbrain@segment7.net']
   s.homepage = "https://github.com/ruby/curses"

data/ext/curses/curses.c

@@ -213,6 +213,7 @@ static VALUE window_attroff(VALUE obj, VALUE attrs);
 static VALUE window_attron(VALUE obj, VALUE attrs);
 static VALUE window_attrset(VALUE obj, VALUE attrs);
 
+NORETURN(static void no_window(void));
 static void
 no_window(void)
 {
@@ -241,7 +242,7 @@ window_memsize(const void *p)
     const struct windata *winp = p;
     size_t size = sizeof(*winp);
     if (!winp) return 0;
-    if (winp->window && winp->window != stdscr) size += sizeof(*winp->window);
+    if (winp->window && winp->window != stdscr) size += CURSES_SIZEOF_WINDOW;
     return size;
 }
 
@@ -1439,6 +1440,7 @@ struct mousedata {
     MEVENT *mevent;
 };
 
+NORETURN(static void no_mevent(void));
 static void
 no_mevent(void)
 {
@@ -1466,7 +1468,7 @@ curses_mousedata_memsize(const void *p)
     const struct mousedata *mdata = p;
     size_t size = sizeof(*mdata);
     if (!mdata) return 0;
-    if (mdata->mevent) size += sizeof(*mdata->mevent);
+    if (mdata->mevent) size += CURSES_SIZEOF_MEVENT;
     return size;
 }
 
@@ -3063,7 +3065,7 @@ item_memsize(const void *p)
     const struct itemdata *itemp = p;
     size_t size = sizeof(*itemp);
     if (!itemp) return 0;
-    if (itemp->item) size += sizeof(*itemp->item);
+    if (itemp->item) size += CURSES_SIZEOF_ITEM;
     return size;
 }
 
@@ -3274,7 +3276,7 @@ menu_memsize(const void *p)
     const struct menudata *menup = p;
     size_t size = sizeof(*menup);
     if (!menup) return 0;
-    if (menup->menu) size += sizeof(*menup->menu);
+    if (menup->menu) size += CURSES_SIZEOF_MENU;
     return size;
 }
 
@@ -3706,6 +3708,7 @@ struct fielddata {
     FIELD *field;
 };
 
+NORETURN(static void no_field(void));
 static void
 no_field(void)
 {
@@ -3734,7 +3737,7 @@ field_memsize(const void *p)
     const struct fielddata *fieldp = p;
     size_t size = sizeof(*fieldp);
     if (!fieldp) return 0;
-    if (fieldp->field) size += sizeof(*fieldp->field);
+    if (fieldp->field) size += CURSES_SIZEOF_FIELD;
     return size;
 }
 
@@ -4152,6 +4155,7 @@ struct formdata {
     VALUE fields;
 };
 
+NORETURN(static void no_form(void));
 static void
 no_form(void)
 {
@@ -4191,7 +4195,7 @@ form_memsize(const void *p)
     const struct formdata *formp = p;
     size_t size = sizeof(*formp);
     if (!formp) return 0;
-    if (formp->form) size += sizeof(*formp->form);
+    if (formp->form) size += CURSES_SIZEOF_FORM;
     return size;
 }
 

data/ext/curses/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+require 'shellwords'
 
 def have_all(*args)
   old_libs = $libs.dup
@@ -160,6 +161,57 @@ if header_library
     have_func("form_driver_w")
   end
 
+  ["WINDOW", "MEVENT", "ITEM", "MENU", "FIELD", "FORM"].each do |type|
+    checking_for("sizeof(#{type}) is available") {
+      if try_compile(<<EOF, Shellwords.join($defs))
+#if defined(HAVE_NCURSESW_CURSES_H)
+# include <ncursesw/curses.h>
+#elif defined(HAVE_NCURSES_CURSES_H)
+# include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
+#elif defined(HAVE_CURSES_COLR_CURSES_H)
+# ifdef HAVE_STDARG_PROTOTYPES
+#  include <stdarg.h>
+# else
+#  include <varargs.h>
+# endif
+# include <curses_colr/curses.h>
+#else
+# include <curses.h>
+#endif
+
+#if defined(HAVE_NCURSESW_MENU_H)
+# include <ncursesw/menu.h>
+#elif defined(HAVE_NCURSES_MENU_H)
+# include <ncurses/menu.h>
+#elif defined(HAVE_CURSES_MENU_H)
+# include <curses/menu.h>
+#elif defined(HAVE_MENU_H)
+# include <menu.h>
+#endif
+
+#if defined(HAVE_NCURSESW_FORM_H)
+# include <ncursesw/form.h>
+#elif defined(HAVE_NCURSES_FORM_H)
+# include <ncurses/form.h>
+#elif defined(HAVE_CURSES_FORM_H)
+# include <curses/form.h>
+#elif defined(HAVE_FORM_H)
+# include <form.h>
+#endif
+
+const int sizeof_#{type} = (int) sizeof(#{type});
+EOF
+        $defs << "-DCURSES_SIZEOF_#{type}=sizeof(#{type})"
+        true
+      else
+        $defs << "-DCURSES_SIZEOF_#{type}=0"
+        false
+      end
+    }
+  end
+
   if RUBY_VERSION >= '2.1'
     create_header
     create_makefile("curses")

data/sample/menu.rb

@@ -9,9 +9,9 @@ at_exit do
 end
 
 menu = Curses::Menu.new([
-  ["Apple", "Red fruit"],
-  ["Orange", "Orange fruit"],
-  ["Banana", "Yellow fruit"]
+  Curses::Item.new("Apple", "Red fruit"),
+  Curses::Item.new("Orange", "Orange fruit"),
+  Curses::Item.new("Banana", "Yellow fruit")
 ])
 menu.post
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby binding for curses, ncurses, and PDCurses. curses is an extension