fxruby 1.6.33-x86-mingw32 → 1.6.34-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ffb1bf31368b4ec60a58c908d8b2944a16c6fc
-  data.tar.gz: c39dc0c3130aec21545875fcf86d7e4e986bdb18
+  metadata.gz: 10f2f1d9c7fa5a7d0c4cbaad196dd98d9281bd2b
+  data.tar.gz: 4b7d753dbe990bd344aa0ea52e4663b8713f7c10
 SHA512:
-  metadata.gz: 0b3ab472ca46648a64d74b5099806b568fc0739f14bb3ec37581fef1543f7c44896120b0b02c331e7d35a824ba935016efb425ce800707ee129622bb34b54ea4
-  data.tar.gz: 9ab7eb8aed3589aabe7e340b3faceb4c5b7da01f8f6280fc1a5459bc76c577fa27582a3f8029c85ca85f53b78bbfac766a06029319e70533b339ce1ca25bd391
+  metadata.gz: 968a8c3936da24ffc502fa97effaaae2fa5d013f3d7d625eb32695c1880d7e9c8f95add34d965937fcf19c890ed1ced761e698d8056a29aaa01c1bb51801ee05
+  data.tar.gz: 63075b7564a44c96e262c0fbd429bcfd170d9564e9b6f23153c3775296e68e8fc58aaaa511a11891aeac55defb3e4dec8353474b70a9b86e315795f92f550754

data/History.txt

@@ -1,6 +1,14 @@
+=== 1.6.34 / 2016-04-26
+
+* Add support for RubyInstaller-2.3
+* Avoid RARRAY_PTR() which broke fxruby on ruby-2.3.0.
+* Make use of StringValueCStr() where it is suitable.
+* Fix initialisation of runOnUiThread event handler, when FXApp is called with a block.
+* Disable GVL on RubyInstaller-1.9.3. Fixes #24
+
 === 1.6.33 / 2015-08-20
 
-* Avoid calls that are prohibited while GC phases during GC. Fixes #23
+* Avoid rb_* calls that are prohibited during GC. Fixes #23
 * Use copy'ing getters for FXVec members in FXMat*, FXMaterial and FXLight.
   This fixes the TC_FXMaterial#test_bug test case.
 * Fix test suite, so that all tests pass.

data/Rakefile

@@ -70,7 +70,7 @@ hoe = Hoe.spec "fxruby" do
   self.extra_rdoc_files << self.readme_file
   self.extra_deps << ['mini_portile', '~> 0.6']
   self.extra_dev_deps << ['rake-compiler', '~> 0.9']
-  self.extra_dev_deps << ['rake-compiler-dock', '~> 0.4.3']
+  self.extra_dev_deps << ['rake-compiler-dock', '~> 0.5.2']
   self.extra_dev_deps << ['opengl', '~> 0.8']
   self.extra_dev_deps << ['glu', '~> 8.0']
   self.extra_dev_deps << ['test-unit', '~> 3.1']
@@ -157,7 +157,7 @@ end
 desc "Build the windows binary gems"
 task 'gem:windows' => 'gem' do
   require 'rake_compiler_dock'
-  RakeCompilerDock.sh "rake cross native gem RUBYOPT=--disable-rubygems MAKE=\"nice make V=1 -j `nproc`\" "
+  RakeCompilerDock.sh "rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" "
 end
 
 # Set environment variable SWIG_LIB to

data/examples/thread.rb

@@ -10,8 +10,8 @@ class ThreadedWindow < Fox::FXMainWindow
     super(app, "Threaded Widget Test", :opts => DECOR_ALL, width: 200, height: 500)
 
     @vframe = FXVerticalFrame.new(self,
-      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0) do |frame|
-      FXButton.new(frame, "Klick to add", opts: FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X) do |button|
+      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL, :padding => 0) do |frame|
+      FXButton.new(frame, "Click to add", opts: FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X) do |button|
         button.connect(SEL_COMMAND, method(:on_button_clicked))
       end
     end
@@ -19,7 +19,7 @@ class ThreadedWindow < Fox::FXMainWindow
 
   def on_button_clicked(sender, sel, ptr)
     FXHorizontalFrame.new(@vframe,
-      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 10) do |frame|
+      FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL, :padding => 10) do |frame|
 
       label = FXLabel.new frame, "..."
 

data/ext/fox16_c/FXRuby.cpp

@@ -1347,14 +1347,16 @@ static ID id_backtrace;
 static VALUE handle_rescue(VALUE args,VALUE error){
   VALUE info=rb_gv_get("$!");
   VALUE errat=rb_funcall(info,id_backtrace,0);
-  VALUE mesg=RARRAY_PTR(errat)[0];
+  VALUE mesg=rb_ary_entry(errat, 0);
+  VALUE info_str=rb_obj_as_string(info);
   fprintf(stderr,"%s: %s (%s)\n",
-    StringValuePtr(mesg),
-    RSTRING_PTR(rb_obj_as_string(info)),
+    StringValueCStr(mesg),
+    StringValueCStr(info_str),
     rb_class2name(CLASS_OF(info)));
   for(int i=1;i<RARRAY_LEN(errat);i++){
-    if(TYPE(RARRAY_PTR(errat)[i])==T_STRING){
-      fprintf(stderr,"\tfrom %s\n",StringValuePtr(RARRAY_PTR(errat)[i]));
+    VALUE entry = rb_ary_entry(errat, i);
+    if(TYPE(entry)==T_STRING){
+      fprintf(stderr,"\tfrom %s\n",StringValueCStr(entry));
       }
     }
   return Qnil;

data/ext/fox16_c/extconf.rb

@@ -313,7 +313,15 @@ def do_rake_compiler_setup
   end
 
   checking_for("thread local variables") do
-    $defs.push( "-DHAVE___THREAD" ) if try_compile('__thread int x=1;')
+    $defs.push( "-DHAVE___THREAD" ) if try_compile(<<-EOT)
+      __thread int x=1;
+      #if defined(__MINGW32__)
+        #include <windows.h>
+        #if !defined(__MINGW64_VERSION_MAJOR)
+          #error "Old mingw32 compiler doesn't implement thread local variables properly."
+        #endif
+      #endif
+    EOT
   end &&
       have_func('rb_thread_call_without_gvl') &&
       have_func('rb_thread_call_with_gvl')

data/ext/fox16_c/gvl_wrappers.cpp

@@ -5,7 +5,9 @@
 
 #include "FXRbCommon.h"
 
-__thread int g_fxrb_thread_has_gvl = 1;
+#ifdef HAVE___THREAD
+  __thread int g_fxrb_thread_has_gvl = 1;
+#endif
 
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_WRAPPER_STRUCT );
 FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_SKELETON );

data/ext/fox16_c/include/FXRuby.h

@@ -27,20 +27,6 @@
 #ifndef FXRUBY_H
 #define FXRUBY_H
 
-// RARRAY_LEN, RARRAY_PTR, RSTRING_LEN and RSTRING_PTR macros not defined before Ruby 1.8.6
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(a) RARRAY((a))->len
-#endif
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(a) RARRAY((a))->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) RSTRING((s))->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) RSTRING((s))->ptr
-#endif
-
 #ifndef NUM2SIZET
 #define NUM2SIZET(s) NUM2ULONG(s)
 #endif

data/ext/fox16_c/include/gvl_wrappers.h

@@ -55,19 +55,21 @@ void fxrb_wakeup_fox(void *);
     when_non_void( rettype retval; ) \
   };
 
-extern __thread int g_fxrb_thread_has_gvl;
-
-#define DEFINE_GVL_SKELETON(klass, name, baseclass, when_non_void, rettype, firstparamtype, firstparamname) \
-  static void * gvl_##klass##_##name##_skeleton( void *data ){ \
-    struct gvl_wrapper_##klass##_##name##_params *p = (struct gvl_wrapper_##klass##_##name##_params*)data; \
-    g_fxrb_thread_has_gvl = 0; \
-    when_non_void( p->retval = ) \
-      klass##_##name##_gvl( p->params.firstparamname FOR_EACH_PARAM_OF_##baseclass##_##name(DEFINE_PARAM_LIST2) ); \
-    g_fxrb_thread_has_gvl = 1; \
-    return NULL; \
-  }
+#ifdef HAVE___THREAD
+  extern __thread int g_fxrb_thread_has_gvl;
+#endif
 
 #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+  #define DEFINE_GVL_SKELETON(klass, name, baseclass, when_non_void, rettype, firstparamtype, firstparamname) \
+    static void * gvl_##klass##_##name##_skeleton( void *data ){ \
+      struct gvl_wrapper_##klass##_##name##_params *p = (struct gvl_wrapper_##klass##_##name##_params*)data; \
+      g_fxrb_thread_has_gvl = 0; \
+      when_non_void( p->retval = ) \
+        klass##_##name##_gvl( p->params.firstparamname FOR_EACH_PARAM_OF_##baseclass##_##name(DEFINE_PARAM_LIST2) ); \
+      g_fxrb_thread_has_gvl = 1; \
+      return NULL; \
+    }
+
   #define DEFINE_GVL_STUB(klass, name, baseclass, when_non_void, rettype, firstparamtype, firstparamname) \
     rettype klass##_##name(firstparamtype firstparamname FOR_EACH_PARAM_OF_##baseclass##_##name(DEFINE_PARAM_LIST3)){ \
       struct gvl_wrapper_##klass##_##name##_params params = { \
@@ -77,6 +79,8 @@ extern __thread int g_fxrb_thread_has_gvl;
       when_non_void( return params.retval; ) \
     }
 #else
+  #define DEFINE_GVL_SKELETON(klass, name, baseclass, when_non_void, rettype, firstparamtype, firstparamname)
+
   #define DEFINE_GVL_STUB(klass, name, baseclass, when_non_void, rettype, firstparamtype, firstparamname) \
     rettype klass##_##name(firstparamtype firstparamname FOR_EACH_PARAM_OF_##baseclass##_##name(DEFINE_PARAM_LIST3)){ \
       return klass##_##name##_gvl(firstparamname FOR_EACH_PARAM_OF_##baseclass##_##name(DEFINE_PARAM_LIST1)); \

data/lib/fox16/thread.rb

@@ -7,8 +7,9 @@ module Fox
     alias initialize_before_thread initialize # :nodoc:
 
     def initialize(*args, &block)
-      initialize_before_thread(*args, &block)
+      initialize_before_thread(*args)
       event_handler_setup
+      block.call(self) if block_given?
     end
 
     def runOnUiThread(&block)

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.33"
+    "1.6.34"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.33
+  version: 1.6.34
 platform: x86-mingw32
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: opengl
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: FXRuby is the Ruby binding to the FOX GUI toolkit.
 email:
 - lyle@lylejohnson.name
@@ -528,6 +528,7 @@ files:
 - lib/2.0/fox16_c.so
 - lib/2.1/fox16_c.so
 - lib/2.2/fox16_c.so
+- lib/2.3/fox16_c.so
 - lib/fox16.rb
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
@@ -1119,7 +1120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.