fxruby 1.6.37-x86-mingw32 → 1.6.38-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f05c2aab33244f32cd1cdc3493a0af8fa558e50b
-  data.tar.gz: 11fdbcc60333a6e8a6acbecd49b335a77ac3f85a
+  metadata.gz: bfda29d23540f77f0a99695ddfc5e32843f5c043
+  data.tar.gz: f8d5059604a3666c1a68f11ae7c36914d6383b44
 SHA512:
-  metadata.gz: 0f19cb7950e3f4a82ab5f46552b8b73c888eb95952cedabbdb2b76884fef8ef3da9b1a03bd5dd9482fe77a9654a8d6e36147c6a771832f84115f38d06b8a6a24
-  data.tar.gz: a3819af1dfed4accb014c9cc1594860c161acc89340900ef49feb792d6f47cf159336dffb2a06ed0e5145df74d0a1d2cfddf4ec6e517f16b3f5a068ea20d5bd1
+  metadata.gz: fd5966edafed96c802567d79675cc82d34e762c6c05fe37eac186235dc74c6e880d6f4a742672d8cc1324ca1fc8807f470137e517b81a50e8c300b000fc85bf6
+  data.tar.gz: d576d4e4a0b48458a948c0284db028aef556742cf724574f333cb0c678e0db49490d81e94dc4216822697d1414aba63710cc02722b85632775f915dd67f6d2d0

data/History.md

@@ -1,3 +1,9 @@
+=== 1.6.38 / 2017-07-27
+
+* Update dependent libraries for Windows binary gem.
+* Replace libjpeg-9b by libjpeg-turbo-1.5.2 on Windows binary gem.
+* Fix build with clang on FreeBSD (and possibly other OS). Fixes #41
+
 === 1.6.37 / 2017-06-24
 
 * Add a 3rd type of FXRbObjects which is used for callbacks. Fixes #39

data/README.rdoc

@@ -3,7 +3,10 @@
 * http://github.com/larskanis/fxruby
 * Full API-description: http://rubydoc.info/gems/fxruby/frames
 * Latest fxruby {<img src="https://badge.fury.io/rb/fxruby.svg" alt="Gem Version" />}[http://badge.fury.io/rb/fxruby]
-* Status (on Linux): {<img src="https://travis-ci.org/larskanis/fxruby.svg?branch=1.6" alt="Build Status" />}[https://travis-ci.org/larskanis/fxruby]
+* Status on Linux: {<img src="https://travis-ci.org/larskanis/fxruby.svg?branch=1.6" alt="Build Status on Linux" />}[https://travis-ci.org/larskanis/fxruby]
+  on Windows: {<img src="https://ci.appveyor.com/api/projects/status/too7sj4gq643ts8w/branch/1.6?svg=true" alt="Build Status on Windows" />}[https://ci.appveyor.com/project/larskanis/fxruby/branch/1.6]
+
+
 
 == DESCRIPTION:
 

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'erb'
+require 'date'
 require 'rake/extensiontask'
 require 'bundler'
 require 'bundler/gem_helper'
@@ -137,7 +138,7 @@ Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
       dlls += [
           "libfxscintilla-20.dll",
           "libFOX-1.6-0.dll",
-          "libjpeg-9.dll",
+          "libjpeg-62.dll",
           "libpng16-16.dll",
           "libtiff-5.dll",
           "zlib1.dll",
@@ -178,7 +179,12 @@ task 'gem:windows' => 'gem' do
 
   sh "bundle package"
   debug = "FXRUBY_MINGW_DEBUG=#{ENV['FXRUBY_MINGW_DEBUG'].inspect}" if ENV['FXRUBY_MINGW_DEBUG']
-  RakeCompilerDock.sh "bundle --local --without=test && rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" #{debug}"
+  RakeCompilerDock.sh <<-EOT
+    sudo apt update &&
+    sudo apt install yasm &&
+    bundle --local --without=test &&
+    rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" #{debug}
+  EOT
 end
 
 # Set environment variable SWIG_LIB to

data/appveyor.yml

@@ -0,0 +1,24 @@
+init:
+  - SET PATH=c:/Ruby%ruby_version%/bin;c:/msys64/%MSYSTEM%/bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+install:
+  - ruby --version
+  - gem --version
+  - ridk version
+  - c:/msys64/usr/bin/bash -lc "pacman -Syu --noconfirm"
+  - 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"
+  - swig -version
+  - bundle install
+build_script:
+  - bundle exec rake compile
+test_script:
+  - bundle exec rake test
+environment:
+  matrix:
+    - ruby_version: "24"
+      MINGW_PACKAGE_PREFIX: "mingw-w64-i686"
+      MSYSTEM: "MINGW32"
+    - ruby_version: "24-x64"
+      MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
+      MSYSTEM: "MINGW64"

data/ext/fox16_c/FXRbObjRegistry.cpp

@@ -20,8 +20,8 @@
  * at "lars@greiz-reinsdorf.de".
  ***********************************************************************/
 
-#include "FXRbObjRegistry.h"
 #include "FXRbCommon.h"
+#include "FXRbObjRegistry.h"
 #include "swigruby.h"
 
 FXRbObjRegistry::FXRbObjRegistry(){

data/ext/fox16_c/extconf.rb

@@ -24,16 +24,19 @@ end
 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.6.26'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.29'
 LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 
-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'] || '9b'
+# LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.7'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '1.5.2'
+LIBJPEG_SOURCE_URI = "https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
+
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.8'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.53'
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.55'
 LIBFOX_SOURCE_URI         = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz"
 
 LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'

data/ext/fox16_c/include/FXRbObjRegistry.h

@@ -23,9 +23,6 @@
 #ifndef FXRBOBJREGISTRY_H
 #define FXRBOBJREGISTRY_H
 
-#include <ruby.h>
-#include "fx.h"
-
 extern "C" {
   // Opaque type declaration for SWIG runtime support
   struct swig_type_info;

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.37"
+    "1.6.38"
   end
 end

data/test/TC_FXApp.rb

@@ -46,6 +46,7 @@ class TC_FXApp2 < Fox::TestCase
   end
 
   def test_addInput_on_pipe
+    pend "addInput on IO.pipe object isn't supported on Windows" if RUBY_PLATFORM=~/mingw|mswin/i
     check_events(*IO.pipe)
   end
 
@@ -75,6 +76,7 @@ class TC_FXApp2 < Fox::TestCase
   end
 
   def test_addInput_on_popen
+    pend "addInput on IO.popen object isn't supported on Windows" if RUBY_PLATFORM=~/mingw|mswin/i
     pipe_rdwr = IO.popen("cat", "r+")
     check_events pipe_rdwr, pipe_rdwr
   end

data/test/TC_FXFileStream.rb

@@ -62,6 +62,8 @@ class TC_FXFileStream < Test::Unit::TestCase
       FXFileStream.open("non_existing_file", FXStreamLoad) { |s| }
     }
 
+    pend "chmod isn't supported on Windows" if RUBY_PLATFORM=~/mingw|mswin/i
+
     # Write-only file (i.e. no read permissions)
     tf = Tempfile.new("write_only_file")
     tf.puts("junk")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.37
+  version: 1.6.38
 platform: x86-mingw32
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -42,6 +42,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
+- appveyor.yml
 - doap.rdf
 - doap.rdf.erb
 - examples/RAA.rb
@@ -463,11 +464,10 @@ files:
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
 - lib/fox16/version.rb
-- patches/libfox/1.6.53/0001-mingw-vsnprintf.diff
 - 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-9.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

data/patches/libfox/1.6.53/0001-mingw-vsnprintf.diff

@@ -1,13 +0,0 @@
-diff --git a/src/FXString.cpp b/src/FXString.cpp
-index fe1120a..b1112dc 100644
---- a/src/FXString.cpp
-+++ b/src/FXString.cpp
-@@ -2365,7 +2365,7 @@ FXString& FXString::vformat(const FXchar* fmt,va_list args){
- #else
-     va_list ag;
- x:  va_copy(ag,args);
--    result=vsnprintf(str,length()+1,fmt,ag);
-+    result=vsnprintf(str,empty() ? 0 : length()+1,fmt,ag);
-     va_end(ag);
-     if(result<0){ length(FXMAX(64,length()*2)); goto x; }
-     if(length()<result){ length(result); goto x; }