fxruby 1.6.44-x86-mingw32 → 1.6.45-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092f81732f1f004f66337e251e6b85b1efd3aa435fd1b3e9eb2fa448225d145a'
-  data.tar.gz: 56dbe1aab1b1e5cf81ac3bbcc40865f740a7360e3a0239ceb66dc6a4538111b1
+  metadata.gz: 1bda5bd84eacd3aeee1118db919f342dd52dfdf4667ed36422b9ed3631cd8245
+  data.tar.gz: 4ccf49cca908e5bbd90ec8165f0a693a7ad2a738f97e3c7cecdd498488aaf844
 SHA512:
-  metadata.gz: 85d57d8b0e793ba18addbc75831e98d3f0234a250cd3053a42d49b88a3ed74c1addb2a51cf6ae60aebb31b4ba35bd0253fdf8b19262797f5db36664ca837a6ce
-  data.tar.gz: f41cdc6cd8a79e0dae3701683d230cd4992d72073719fc1222c56617a2b275ed39cf8cc79777df76286d92b650bf7d494cc884a8c47c1e4495fe9d063b00bcda
+  metadata.gz: ed8e02cf1588f378d189153aa7179819ddce86e66542898f1997a19645bbe15108c271e4d27261dfb5c0398393e6401ffade7ba16ab2ce59e18df1f924dbe002
+  data.tar.gz: b92f516c4f28b905eaaa35b27a90162ff80f09434242770026ac48a4ca64d9d0d23d40ada21ffceccb21e167e250c04a0ddd304977b25c272b5dc3f978db0647

data/History.md

@@ -1,3 +1,8 @@
+## 1.6.45 / 2022-01-14
+
+* Add binary gem support for ruby-3.1 on platform x64-mingw-ucrt and drop ruby-2.3.
+* Update to libz-1.2.11, libjpeg-turbo-2.1.2, libtiff-4.3.0 for Windows binary gems.
+
 ## 1.6.44 / 2020-12-31
 
 * Add binary gem support for ruby-3.0. #66

data/README.rdoc

@@ -34,12 +34,17 @@ FXRuby supportes everything of FOX, that is useful in Ruby:
 FXRuby runs on Linux, Windows and OS-X with Ruby-2.2 or newer. Installation on Unix requires
 FOX development headers and libraries installed:
 * on Debian/Ubuntu: <tt>sudo apt-get install g++ libxrandr-dev libfox-1.6-dev</tt>
+* on Mac: <tt>sudo port install rb-fxruby</tt> OR <tt>brew install fox && brew install xquartz</tt>
+* on Windows: the binary fxruby gems already contain all required libraries
 * see also detailed installation instructions in the {Wiki}[https://github.com/lylejohnson/fxruby/wiki]
-* on Windows: the binary fxruby gems already contain all required libararies
 
 Then, install the gem:
 * gem install fxruby
 
+On Mac, before running applications, you must also run: <tt>open -a /Applications/Utilities/XQuartz.app</tt>
+
+(otherwise, you end up getting this message when running applications on Mac: <tt>FXRbApp::openDisplay: unable to open display :0.0</tt>)
+
 == DIRECTORIES
 The directory structure is:
 

data/Rakefile

@@ -92,7 +92,7 @@ gem_spec = Bundler.load_gemspec('fxruby.gemspec')
 
 ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
   ext.cross_compile = true
-  ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
+  ext.cross_platform = ['x86-mingw32', 'x64-mingw-ucrt', 'x64-mingw32']
   # Enable FXTRACE and FXASSERT for 'rake compile'
   ext.config_options << "--enable-debug"
 
@@ -109,6 +109,7 @@ ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
 
     platform_host_map =  {
       'x86-mingw32' => ['i686-w64-mingw32'],
+      'x64-mingw-ucrt' => ['x86_64-w64-mingw32'],
       'x64-mingw32' => ['x86_64-w64-mingw32'],
     }
 
@@ -117,7 +118,7 @@ ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
 
       gcc_shared_dlls = %w[libwinpthread-1.dll libgcc_s_dw2-1.dll libgcc_s_sjlj-1.dll libgcc_s_seh-1.dll libstdc++-6.dll]
 
-      dlls = gcc_shared_dlls.select{|dll| File.exist?("ports/#{host}/bin/#{dll}") }
+      dlls = gcc_shared_dlls.select{|dll| File.exist?("ports/#{gemplat}/bin/#{dll}") }
       dlls += [
           "libfxscintilla-20.dll",
           "libFOX-1.6-0.dll",
@@ -127,11 +128,11 @@ ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
           "zlib1.dll",
       ]
 
-      spec.files += dlls.map{|dll| "ports/#{host}/bin/#{dll}" }
+      spec.files += dlls.map{|dll| "ports/#{gemplat}/bin/#{dll}" }
 
       unless ENV['FXRUBY_MINGW_DEBUG']
         dlls.each do |dll|
-          task "ports/#{host}/bin/#{dll}" do |t|
+          task "ports/#{gemplat}/bin/#{dll}" do |t|
             sh "#{host}-strip", t.name
           end
         end

data/appveyor.yml

@@ -3,8 +3,7 @@ image: Visual Studio 2019
 clone_depth: 1
 
 init:
-  - SET PATH=c:/Ruby%ruby_version%/bin;c:/msys64/%MSYSTEM%/bin;%PATH%
-  - SET RAKEOPT=-rdevkit
+  - SET PATH=c:/Ruby%ruby_version%/bin;%PATH%
 install:
   - ps: |
       if ($env:ruby_version -like "*head*") {
@@ -14,11 +13,13 @@ install:
   - ruby --version
   - gem --version
   - ridk version
+  - ridk enable
   # Remove gcc-ada and gcc-objc, since they are no longer supported by msys2 and therefore cause a dependency issue
   - c:/msys64/usr/bin/bash -lc "pacman --noconfirm --remove mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc"
   - c:/msys64/usr/bin/bash -lc "pacman -Syu --noconfirm --ask 20"
   - c:/msys64/usr/bin/bash -lc "pacman -Su --noconfirm"
-  - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm --needed ${MINGW_PACKAGE_PREFIX}-fox ${MINGW_PACKAGE_PREFIX}-swig"
+  - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm --needed ${MINGW_PACKAGE_PREFIX}-fox ${MINGW_PACKAGE_PREFIX}-swig ${MINGW_PACKAGE_PREFIX}-gcc"
+  - gcc -v
   - swig -version
   - gem install bundler --conservative
   - bundle config set force_ruby_platform true
@@ -30,8 +31,4 @@ test_script:
 environment:
   matrix:
     - ruby_version: "head-x64"
-      MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
-      MSYSTEM: "MINGW64"
     - ruby_version: "24"
-      MINGW_PACKAGE_PREFIX: "mingw-w64-i686"
-      MSYSTEM: "MINGW32"

data/ext/fox16_c/core_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1946,7 +1948,7 @@ VALUE mFox;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/dc_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1910,7 +1912,7 @@ static swig_module_info swig_module = {swig_types, 36, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/dialogs_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -2002,7 +2004,7 @@ static swig_module_info swig_module = {swig_types, 128, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/extconf.rb

@@ -20,8 +20,7 @@ def fxscintilla_support_suppressed?
   !with_config("fxscintilla", true)
 end
 
-# Stick at zlib-1.2.7 for compatibility to MSYS1 based RubyInstaller.
-LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7.3'
+LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.11'
 LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
 LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.37'
@@ -30,10 +29,10 @@ LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_V
 # LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
 # LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
-LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '2.0.6'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '2.1.2'
 LIBJPEG_SOURCE_URI = "https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.1.0'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.3.0'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
 LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.57'
@@ -55,7 +54,7 @@ module BuildRecipeCommons
   end
 
   def port_path
-    "#{target}/#{host}"
+    "#{target}/#{RUBY_PLATFORM}"
   end
 
   # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
@@ -69,7 +68,7 @@ module BuildRecipeCommons
   end
 
   def cook_and_activate
-    checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{RUBY_PLATFORM}.installed")
     unless File.exist?(checkpoint)
       chdir_for_build do
         self.cook
@@ -178,7 +177,7 @@ def do_rake_compiler_setup
         "--without-xft",
         "--without-x",
         debug ? "--enable-debug" : "--enable-release",
-        "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""}",
+        "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""} -D__USE_MINGW_ANSI_STDIO=1 -DHAVE_VSSCANF",
         "LDFLAGS=-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib #{debug ? "-ggdb" : ""}",
       ]
       recipe.cook_and_activate
@@ -191,11 +190,12 @@ def do_rake_compiler_setup
           "#{ENV['MAKE'] || "make"}"
         end
 
-#         # This can be uncommented when fxscintilla is used from the source repository.
-#         def configure
-#           execute "bootstrap", "./bootstrap.sh"
-#           super
-#         end
+        def configure
+          # This can be uncommented when fxscintilla is used from the source repository.
+          #execute "bootstrap", "./bootstrap.sh"
+          execute "rm custom pkg-config", "sudo rm -f /usr/bin/x86_64-w64-mingw32-pkg-config"
+          super
+        end
 
         def compile
           execute "compile_lexers", "cd lexers && #{mk}"

data/ext/fox16_c/frames_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1946,7 +1948,7 @@ static swig_module_info swig_module = {swig_types, 72, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/fx3d_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -2012,7 +2014,7 @@ static swig_module_info swig_module = {swig_types, 138, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/iconlist_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1942,7 +1944,7 @@ static swig_module_info swig_module = {swig_types, 68, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/icons_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -2011,7 +2013,7 @@ static swig_module_info swig_module = {swig_types, 137, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/image_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1998,7 +2000,7 @@ static swig_module_info swig_module = {swig_types, 124, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/label_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1955,7 +1957,7 @@ static swig_module_info swig_module = {swig_types, 81, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/layout_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1941,7 +1943,7 @@ static swig_module_info swig_module = {swig_types, 67, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/list_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1940,7 +1942,7 @@ static swig_module_info swig_module = {swig_types, 66, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/mdi_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -2014,7 +2016,7 @@ static swig_module_info swig_module = {swig_types, 140, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/menu_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1995,7 +1997,7 @@ static swig_module_info swig_module = {swig_types, 121, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/scintilla_wrap.cpp

@@ -1,7 +1,7 @@
 #ifdef WITH_FXSCINTILLA
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1626,6 +1626,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1990,7 +1992,7 @@ static swig_module_info swig_module = {swig_types, 115, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/swigruby.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1464,6 +1464,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 

data/ext/fox16_c/table_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1993,7 +1995,7 @@ static swig_module_info swig_module = {swig_types, 119, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/text_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1989,7 +1991,7 @@ static swig_module_info swig_module = {swig_types, 115, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/treelist_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1992,7 +1994,7 @@ static swig_module_info swig_module = {swig_types, 118, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/ext/fox16_c/ui_wrap.cpp

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 4.0.1
+ * Version 4.0.2
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -1625,6 +1625,8 @@ SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
   VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  if (NIL_P(stype))
+    return NULL;
   return StringValuePtr(stype);
 }
 
@@ -1990,7 +1992,7 @@ static swig_module_info swig_module = {swig_types, 116, 0, 0, 0, 0};
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x040001 
+#define SWIGVERSION 0x040002 
 #define SWIG_VERSION SWIGVERSION
 
 

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.44"
+    "1.6.45"
   end
 end

data/lib/fox16.rb

@@ -18,11 +18,9 @@ rescue LoadError
       end
     end
 
+    ruby_plat = RUBY_PLATFORM.gsub("i386", "x86")
     # Temporary add this directory for DLL search, so that bundled DLLs can be found.
-    ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32') do
-      major_minor < '2.0' ? 'i586-mingw32msvc' : 'i686-w64-mingw32'
-    end
-    ports_bin = File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)
+    ports_bin = File.expand_path("../../ports/#{ruby_plat}/bin", __FILE__)
     add_dll_path.call(ports_bin) do
       require "#{major_minor}/fox16_c"
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.44
+  version: 1.6.45
 platform: x86-mingw32
 authors:
 - Lyle Johnson
 - Lars Kanis
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -25,7 +25,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description: 
+description:
 email:
 - lyle@lylejohnson.name
 - lars@greiz-reinsdorf.de
@@ -717,12 +717,12 @@ files:
 - ext/fox16_c/unregisterOwnedObjects.cpp
 - fxruby.gemspec
 - index.html
-- lib/2.3/fox16_c.so
 - lib/2.4/fox16_c.so
 - lib/2.5/fox16_c.so
 - lib/2.6/fox16_c.so
 - lib/2.7/fox16_c.so
 - lib/3.0/fox16_c.so
+- lib/3.1/fox16_c.so
 - lib/fox16.rb
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
@@ -756,15 +756,15 @@ files:
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
 - lib/fox16/version.rb
-- ports/i686-w64-mingw32/bin/libFOX-1.6-0.dll
-- ports/i686-w64-mingw32/bin/libfxscintilla-20.dll
-- ports/i686-w64-mingw32/bin/libgcc_s_sjlj-1.dll
-- ports/i686-w64-mingw32/bin/libjpeg-62.dll
-- ports/i686-w64-mingw32/bin/libpng16-16.dll
-- ports/i686-w64-mingw32/bin/libstdc++-6.dll
-- ports/i686-w64-mingw32/bin/libtiff-5.dll
-- ports/i686-w64-mingw32/bin/libwinpthread-1.dll
-- ports/i686-w64-mingw32/bin/zlib1.dll
+- ports/x86-mingw32/bin/libFOX-1.6-0.dll
+- ports/x86-mingw32/bin/libfxscintilla-20.dll
+- ports/x86-mingw32/bin/libgcc_s_sjlj-1.dll
+- ports/x86-mingw32/bin/libjpeg-62.dll
+- ports/x86-mingw32/bin/libpng16-16.dll
+- ports/x86-mingw32/bin/libstdc++-6.dll
+- ports/x86-mingw32/bin/libtiff-5.dll
+- ports/x86-mingw32/bin/libwinpthread-1.dll
+- ports/x86-mingw32/bin/zlib1.dll
 - rdoc-sources/FX4Splitter.rb
 - rdoc-sources/FX7Segment.rb
 - rdoc-sources/FXAccelTable.rb
@@ -1287,7 +1287,7 @@ homepage: https://github.com/larskanis/fxruby
 licenses:
 - LGPL-2.1
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1295,18 +1295,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.1.dev
+      version: 3.2.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 test_files: []