fxruby 1.6.34 → 1.6.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb64100c3c660af155b0cc354ca36d84c0625b2
-  data.tar.gz: a0e65e9075cb681ca3cce792ebe4415523820002
+  metadata.gz: '09493b9c0988db72cc281d64a7713de5d9c1b806'
+  data.tar.gz: a3a7428a6a00aee41a5a457ef9507c5d6d33c89f
 SHA512:
-  metadata.gz: 4bf5beea53bda6442aa96da25167fb1d1e9c056688522d5a6de94aee2017a0436e5cd61f4774e7643a8261134651acb787a7765869ce4b78be864761fc02cd58
-  data.tar.gz: fcdf7ccb8bdb6002256d7700010aa2c92423c869f24108b3d996183c4d06bf26533538dfd9dd8b482c3b71f595bf211bed5a8cf7f3dff0443b22036e0996631d
+  metadata.gz: e6004b3f167631f32b43a4846157397dd8a06bdbf8b1e30e0afc4df9afb846682bf033372e8bfc63401a90d51754ab21a6b0ccd3cbbbfe643889e83b5e9ade2a
+  data.tar.gz: f20030cefee54cd62dad5ba39146ff5744e4fc675a7a54f1b2763de04c8ebdfc67ac217150e4732387eb2d98f97779f0363ab9323e1d54517b6edba5d24346bb

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.6.35 / 2017-02-15
+
+* Adjust for Ruby-2.4 with unified Integers
+* Add support for RubyInstaller-2.4
+* Drop support for Ruby-1.8 and 1.9. It may work with them, but is no longer tested.
+* Add compat with SWIG-3.0
+* Fix an issue with FXApp#removeInput introduced in fxruby-1.6.30.
+* Work around missing /usr/lib/libfxscintilla.so file in Ubuntu
+* Update dependent gems.
+* Update libraries for Windows build.
+
 === 1.6.34 / 2016-04-26
 
 * Add support for RubyInstaller-2.3

data/Rakefile

@@ -51,7 +51,7 @@ SWIG_MODULES = {
 hoe = Hoe.spec "fxruby" do
   # ... project specific data ...
   self.blog_categories = %w{FXRuby}
-  self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/include/swigrubyrun.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp", "tmp", "ports/*.installed", "ports/*mingw32*"]
+  self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/swigruby.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp", "tmp", "ports/*.installed", "ports/*mingw32*"]
   developer("Lyle Johnson", "lyle@lylejohnson.name")
   developer("Lars Kanis", "kanis@comcard.de")
   self.extra_rdoc_files = ["rdoc-sources", File.join("rdoc-sources", "README.rdoc")]
@@ -68,12 +68,14 @@ hoe = Hoe.spec "fxruby" do
   self.version = PKG_VERSION
   self.readme_file = 'README.rdoc'
   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.5.2']
+  self.extra_deps << ['mini_portile2', '~> 2.1']
+  self.extra_dev_deps << ['rake-compiler', '~> 1.0']
+  self.extra_dev_deps << ['rake-compiler-dock', '~> 0.6.0']
   self.extra_dev_deps << ['opengl', '~> 0.8']
   self.extra_dev_deps << ['glu', '~> 8.0']
   self.extra_dev_deps << ['test-unit', '~> 3.1']
+  self.extra_dev_deps << ['yard', '~> 0.8']
+  self.extra_dev_deps << ['hoe-bundler', '~> 1.1']
   self.license 'LGPL'
 
   spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/).reject{|f| f=~/^fox-includes|^web/ }
@@ -113,7 +115,7 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
   # Add dependent DLLs to the cross gems
   ext.cross_compiling do |spec|
     platform_host_map =  {
-      'x86-mingw32' => ['i586-mingw32msvc', 'i686-w64-mingw32'],
+      'x86-mingw32' => ['i686-w64-mingw32'],
       'x64-mingw32' => ['x86_64-w64-mingw32'],
     }
 
@@ -127,7 +129,7 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
           "libfxscintilla-20.dll",
           "libFOX-1.6-0.dll",
           "libjpeg-8.dll",
-          "libpng15-15.dll",
+          "libpng16-16.dll",
           "libtiff-5.dll",
           "zlib1.dll",
       ]
@@ -157,7 +159,12 @@ end
 desc "Build the windows binary gems"
 task 'gem:windows' => 'gem' do
   require 'rake_compiler_dock'
-  RakeCompilerDock.sh "rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" "
+
+  gf = "tmp/Gemfile-rcd"
+  File.write(gf, File.read("Gemfile").gsub(/.*"(glu|opengl)".*/, ""))
+
+  sh "BUNDLE_GEMFILE=#{gf} bundle package"
+  RakeCompilerDock.sh "BUNDLE_GEMFILE=#{gf} bundle --local --without=norcd && rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" "
 end
 
 # Set environment variable SWIG_LIB to

data/ext/fox16_c/FXRuby.cpp

@@ -60,6 +60,11 @@ extern "C" {
 // Opaque type declaration from SWIG runtime
 struct swig_type_info;
 
+static int FXSWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags){
+  return SWIG_ConvertPtr(obj, ptr, ty, flags);
+}
+
+
 // Wrapper around SWIG_TypeQuery() that caches results for performance
 swig_type_info *FXRbTypeQuery(const char *desc){
   FXASSERT(desc!=0);

data/ext/fox16_c/extconf.rb

@@ -2,7 +2,9 @@
 
 require 'fileutils'
 require 'mkmf'
-require 'mini_portile'
+
+gem 'mini_portile2', '~>2.1'
+require 'mini_portile2'
 
 def find_installed_fox_version
   stddirs = ["/usr/include/fox-1.6",
@@ -86,19 +88,19 @@ def with_env(hash)
   end
 end
 
-LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7'
-LIBZ_SOURCE_URI = "http://downloads.sourceforge.net/project/libpng/zlib/#{LIBZ_VERSION}/zlib-#{LIBZ_VERSION}.tar.bz2"
+LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7.3'
+LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
-LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.5.13'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.26'
 LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 
 LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '8d'
 LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.3'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.7'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.49'
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.53'
 LIBFOX_SOURCE_URI         = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz"
 
 LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
@@ -157,8 +159,6 @@ end
 
 def do_rake_compiler_setup
   if enable_config("win32-cross")
-    require 'mini_portile'
-
     dir_config("installed")
 
     libz_recipe = BuildRecipe.new("libz", LIBZ_VERSION, [LIBZ_SOURCE_URI]).tap do |recipe|
@@ -307,7 +307,7 @@ def do_rake_compiler_setup
   if is_fxscintilla_build?
     FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
     $CPPFLAGS = $CPPFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
-    $libs = append_library($libs, "fxscintilla")
+    find_library("fxscintilla", nil) || find_library(":libfxscintilla.so.19", nil) || ($libs = append_library($libs, "fxscintilla"))
   else
     FileUtils.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exist?('scintilla_wrap.cpp')
   end

data/ext/fox16_c/include/FXRuby.h

@@ -41,16 +41,14 @@ struct swig_type_info;
 extern "C" {
 static const char * SWIG_TypeName(const swig_type_info *ty);
 static VALUE SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int own);
-#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
-typedef void (*ruby_owntype)(void*);
-static int SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own);
+static int FXSWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags);
 }
 
 // Helper for overloaded show() functions
 template <class TYPE>
 VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typeinfo) {
   TYPE *win;
-  SWIG_ConvertPtr(self,(void**)&win,typeinfo,1);
+  FXSWIG_ConvertPtr(self,(void**)&win,typeinfo,1);
   if (argc == 0) {
     win->_show();
     }

data/lib/fox16.rb

@@ -6,16 +6,25 @@ rescue LoadError
     major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
       raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
 
-    # Set the PATH environment variable, so that the DLLs can be found.
-    old_path = ENV['PATH']
-    begin
-      ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32') do
-        major_minor < '2.0' ? 'i586-mingw32msvc' : 'i686-w64-mingw32'
+    add_dll_path = proc do |path, &block|
+      begin
+        require 'ruby_installer'
+        RubyInstaller.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV['PATH']
+        ENV['PATH'] = "#{path};#{old_path}"
+        block.call
+        ENV['PATH'] = old_path
       end
-      ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
+    end
+
+    # Temporary add this directory for DLL search, so that libpq.dll 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__)
+    add_dll_path.call(ports_bin) do
       require "#{major_minor}/fox16_c"
-    ensure
-      ENV['PATH'] = old_path
     end
   else
     raise

data/lib/fox16/version.rb

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

data/swig-interfaces/FXApp.i

@@ -374,7 +374,7 @@ public:
     */
     bool removeInput(VALUE obj,FXuint mode){
       FXInputHandle fd;
-      if(mode&INPUT_READ|INPUT_EXCEPT){
+      if(mode&(INPUT_READ|INPUT_EXCEPT)){
         fd=FXRbGetReadFileHandle(obj, mode);
         self->removeInput(fd,mode);
         FXRbRemoveReadFileHandle(obj, mode);

data/swig-interfaces/ruby-typemaps.i

@@ -715,7 +715,7 @@ inline void* to_FXEvent(VALUE obj){
     $2 = RSTRING_LEN($input);
 }
 
-// Extract a C array (dashpattern) and its length (dashlength) from a Ruby array of Fixnums
+// Extract a C array (dashpattern) and its length (dashlength) from a Ruby array of Integers
 %typemap(in) (const FXchar* dashpattern, FXuint dashlength) {
     Check_Type($input, T_ARRAY);
     $1 = new FXchar[RARRAY_LEN($input)];
@@ -763,7 +763,7 @@ inline void* to_FXEvent(VALUE obj){
  */
 
 %typemap(in) FXWindow* TOOLBAR_DOCK_AFTER {
-    if (TYPE($input) == T_FIXNUM) {
+    if (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM)) {
         $1 = reinterpret_cast<FXWindow *>(static_cast<long>(NUM2INT($input)));
     } else {
         SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXWindow, 1);

data/test/TC_FXButton.rb

@@ -26,7 +26,7 @@ class TC_FXButton < Fox::TestCase
 
   def testStyle
     assert(@button.buttonStyle)
-    assert_instance_of(Fixnum, @button.buttonStyle)
+    assert_kind_of(Integer, @button.buttonStyle)
 
     @button.buttonStyle |= BUTTON_AUTOGRAY
     assert((@button.buttonStyle & BUTTON_AUTOGRAY) != 0)
@@ -56,7 +56,7 @@ class TC_FXButton < Fox::TestCase
 
   def testState
     assert(@button.state)
-    assert_kind_of(Fixnum, @button.state)
+    assert_kind_of(Integer, @button.state)
 
     @button.state = STATE_UP
     assert_equal(STATE_UP, @button.state)

data/test/TC_FXHeader.rb

@@ -22,7 +22,7 @@ class TC_FXHeader < Fox::TestCase
 
   def test_getArrowDir
     @header.appendItem("")
-    assert_instance_of(Fixnum, @header.getArrowDir(0))
+    assert_kind_of(Integer, @header.getArrowDir(0))
   end
 
   def test_arrowUp?

data/test/TC_FXWindow.rb

@@ -12,7 +12,7 @@ class TC_FXWindow < Fox::TestCase
 
   def test_width_accessor
     pos = @window.width
-    assert_instance_of(Fixnum, pos)
+    assert_kind_of(Integer, pos)
     @window.width = pos + 1
     assert_equal(pos + 1, @window.width)
     @window.width = pos + 2.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.34
+  version: 1.6.35
 platform: ruby
 authors:
 - Lyle Johnson
@@ -9,66 +9,94 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mini_portile
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
+  name: opengl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: opengl
+  name: glu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -82,47 +110,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: glu
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
 description: FXRuby is the Ruby binding to the FOX GUI toolkit.
 email:
 - lyle@lylejohnson.name
@@ -1100,7 +1128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.