fxruby 1.6.35-x64-mingw32 → 1.6.36-x64-mingw32

data/lib/fox16.rb

@@ -8,8 +8,8 @@ rescue LoadError
 
     add_dll_path = proc do |path, &block|
       begin
-        require 'ruby_installer'
-        RubyInstaller.add_dll_directory(path, &block)
+        require 'ruby_installer/runtime'
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
       rescue LoadError
         old_path = ENV['PATH']
         ENV['PATH'] = "#{path};#{old_path}"
@@ -18,7 +18,7 @@ rescue LoadError
       end
     end
 
-    # Temporary add this directory for DLL search, so that libpq.dll can be found.
+    # 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

data/lib/fox16/version.rb

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

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

@@ -0,0 +1,13 @@
+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; }

data/test/TS_All.rb

@@ -2,8 +2,11 @@ require 'fox16'
 require 'test/unit'
 
 if __FILE__ == $0
-  $: << File.dirname(__FILE__)
-  Dir.glob("TC_*.rb").each do |testcase|
-    require "#{testcase}"
+  testdir = File.expand_path("..", __FILE__)
+  $: << testdir
+  Dir.chdir(testdir) do
+    Dir.glob("TC_*.rb").each do |testcase|
+      require "#{testcase}"
+    end
   end
 end

data/test/dummy.xorg.conf

@@ -0,0 +1,140 @@
+# This file is used to setup a dummy X server for testing on http://travis-ci.org
+# See config file ".travis.yml"
+
+##Xdummy:##
+Section "ServerFlags"
+  Option "DontVTSwitch" "true"
+  Option "AllowMouseOpenFail" "true"
+  Option "PciForceNone" "true"
+  Option "AutoEnableDevices" "false"
+  Option "AutoAddDevices" "false"
+EndSection
+
+Section "Module"
+  Load "/usr/lib/xorg/modules/extensions/libglx.so"
+EndSection
+
+Section "Extensions"
+  Option "GLX" "Enable"
+  Option "NV-GLX" "Disable"
+EndSection
+
+
+##Xdummy:##
+Section "InputDevice"
+  Identifier "NoMouse"
+  Option "CorePointer" "true"
+  Driver "void"
+EndSection
+
+Section "InputDevice"
+  Identifier "NoKeyboard"
+  Option "CoreKeyboard" "true"
+  Driver "void"
+EndSection
+
+##Xdummy:##
+Section "Device"
+  Identifier "Videocard0"
+  Driver "dummy"
+  #VideoRam 4096000
+  VideoRam 256000
+EndSection
+
+##Xdummy:##
+Section "Monitor"
+  Identifier "Monitor0"
+  HorizSync   10.0 - 300.0
+  VertRefresh 10.0 - 200.0
+  DisplaySize 4335 1084
+  #The following modeline is invalid (calculator overflowed):
+  #Modeline "32000x32000@0" -38917.43 32000 32032 -115848 -115816 32000 32775 32826 33601
+  Modeline "16384x8192@10" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
+  Modeline "8192x4096@10" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
+  Modeline "5120x3200@10" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
+  Modeline "3840x2880@10" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
+  Modeline "3840x2560@10" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
+  Modeline "3840x2048@10" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
+  Modeline "2048x2048@10" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
+  Modeline "2560x1600@10" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
+  Modeline "1920x1200@10" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
+  Modeline "1920x1080@10" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
+  Modeline "1680x1050@10" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
+  Modeline "1600x900@20" 33.92 1600 1632 1760 1792 900 921 924 946
+  Modeline "1440x900@20" 30.66 1440 1472 1584 1616 900 921 924 946
+  Modeline "1360x768@20" 24.49 1360 1392 1480 1512 768 786 789 807
+  #common resolutions for android devices (both orientations):
+  Modeline "800x1280@20" 25.89 800 832 928 960 1280 1310 1315 1345
+  Modeline "1280x800@20" 24.15 1280 1312 1400 1432 800 819 822 841
+  Modeline "720x1280@25" 30.22 720 752 864 896 1280 1309 1315 1345
+  Modeline "1280x720@25" 27.41 1280 1312 1416 1448 720 737 740 757
+  Modeline "768x1024@25" 24.93 768 800 888 920 1024 1047 1052 1076
+  Modeline "1024x768@25" 23.77 1024 1056 1144 1176 768 785 789 807
+  Modeline "600x1024@25" 19.90 600 632 704 736 1024 1047 1052 1076
+  Modeline "1024x600@25" 18.26 1024 1056 1120 1152 600 614 617 631
+  Modeline "536x960@25" 16.74 536 568 624 656 960 982 986 1009
+  Modeline "960x536@25" 15.23 960 992 1048 1080 536 548 551 563
+  Modeline "600x800@25" 15.17 600 632 688 720 800 818 822 841
+  Modeline "800x600@25" 14.50 800 832 880 912 600 614 617 631
+  Modeline "480x854@25" 13.34 480 512 560 592 854 873 877 897
+  Modeline "848x480@25" 12.09 848 880 920 952 480 491 493 505
+  Modeline "480x800@25" 12.43 480 512 552 584 800 818 822 841
+  Modeline "800x480@25" 11.46 800 832 872 904 480 491 493 505
+  Modeline "320x480@50" 10.73 320 352 392 424 480 490 494 505
+  Modeline "480x320@50" 9.79 480 512 544 576 320 327 330 337
+  Modeline "240x400@50" 6.96 240 272 296 328 400 408 412 421
+  Modeline "400x240@50" 6.17 400 432 448 480 240 245 247 253
+  Modeline "240x320@50" 5.47 240 272 288 320 320 327 330 337
+  Modeline "320x240@50" 5.10 320 352 368 400 240 245 247 253
+  #resolutions for android devices (both orientations)
+  #minus the status bar
+  #38px status bar (and width rounded up)
+  Modeline "800x1242@20" 25.03 800 832 920 952 1242 1271 1275 1305
+  Modeline "1280x762@20" 22.93 1280 1312 1392 1424 762 780 783 801
+  Modeline "720x1242@25" 29.20 720 752 856 888 1242 1271 1276 1305
+  Modeline "1280x682@25" 25.85 1280 1312 1408 1440 682 698 701 717
+  Modeline "768x986@25" 23.90 768 800 888 920 986 1009 1013 1036
+  Modeline "1024x730@25" 22.50 1024 1056 1136 1168 730 747 750 767
+  Modeline "600x986@25" 19.07 600 632 704 736 986 1009 1013 1036
+  Modeline "1024x562@25" 17.03 1024 1056 1120 1152 562 575 578 591
+  Modeline "536x922@25" 16.01 536 568 624 656 922 943 947 969
+  Modeline "960x498@25" 14.09 960 992 1040 1072 498 509 511 523
+  Modeline "600x762@25" 14.39 600 632 680 712 762 779 783 801
+  Modeline "800x562@25" 13.52 800 832 880 912 562 575 578 591
+  Modeline "480x810@25" 12.59 480 512 552 584 810 828 832 851
+  Modeline "848x442@25" 11.09 848 880 920 952 442 452 454 465
+  Modeline "480x762@25" 11.79 480 512 552 584 762 779 783 801
+  Modeline "800x442@25" 10.51 800 832 864 896 442 452 454 465
+  #32px status bar (no need for rounding):
+  Modeline "320x448@50" 9.93 320 352 384 416 448 457 461 471
+  Modeline "480x288@50" 8.75 480 512 544 576 288 294 297 303
+  #24px status bar:
+  Modeline "240x376@50" 6.49 240 272 296 328 376 384 387 395
+  Modeline "400x216@50" 5.50 400 432 448 480 216 220 222 227
+  Modeline "240x296@50" 5.02 240 272 288 320 296 302 305 311
+  Modeline "320x216@50" 4.55 320 352 368 400 216 220 222 227
+EndSection
+
+##Xdummy:##
+Section "Screen"
+  Identifier "Screen0"
+  Device "Videocard0"
+  Monitor "Monitor0"
+  DefaultDepth 24
+  SubSection "Display"
+    Viewport 0 0
+    Depth 24
+    Modes "32000x32000" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    #Virtual 32000 32000
+    #Virtual 16384 8192
+    #Virtual 8192 4096
+    Virtual 1920 1440
+  EndSubSection
+EndSection
+
+Section "ServerLayout"
+  Identifier   "dummy_layout"
+  Screen       "screen0"
+  InputDevice  "NoMouse"
+  InputDevice  "NoKeyboard"
+EndSection

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.35
+  version: 1.6.36
 platform: x64-mingw32
 authors:
 - Lyle Johnson
 - Lars Kanis
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -25,149 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: opengl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  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:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: hoe-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.16'
-description: FXRuby is the Ruby binding to the FOX GUI toolkit.
+description: 
 email:
 - lyle@lylejohnson.name
-- kanis@comcard.de
+- lars@greiz-reinsdorf.de
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.rdoc
-- rdoc-sources/README.rdoc
+extra_rdoc_files: []
 files:
 - ".gemtest"
 - ".gitignore"
+- ".travis.yml"
 - ".yardopts"
-- History.txt
-- Manifest.txt
+- Gemfile
+- History.md
 - README.rdoc
 - Rakefile
 - TODO
@@ -299,6 +170,7 @@ files:
 - ext/fox16_c/FXRbApp.cpp
 - ext/fox16_c/FXRbDataTarget.cpp
 - ext/fox16_c/FXRbGLViewer.cpp
+- ext/fox16_c/FXRbObjRegistry.cpp
 - ext/fox16_c/FXRuby.cpp
 - ext/fox16_c/MANIFEST
 - ext/fox16_c/core_wrap.cpp
@@ -441,6 +313,7 @@ files:
 - ext/fox16_c/include/FXRbMenuSeparator.h
 - ext/fox16_c/include/FXRbMenuTitle.h
 - ext/fox16_c/include/FXRbMessageBox.h
+- ext/fox16_c/include/FXRbObjRegistry.h
 - ext/fox16_c/include/FXRbObject.h
 - ext/fox16_c/include/FXRbObjectVirtuals.h
 - ext/fox16_c/include/FXRbOptionMenu.h
@@ -550,6 +423,7 @@ files:
 - ext/fox16_c/treelist_wrap.cpp
 - ext/fox16_c/ui_wrap.cpp
 - ext/fox16_c/unregisterOwnedObjects.cpp
+- fxruby.gemspec
 - index.html
 - lib/2.0/fox16_c.so
 - lib/2.1/fox16_c.so
@@ -589,10 +463,11 @@ files:
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
 - lib/fox16/version.rb
+- patches/libfox/1.6.53/0001-mingw-vsnprintf.diff
 - ports/x86_64-w64-mingw32/bin/libFOX-1.6-0.dll
 - ports/x86_64-w64-mingw32/bin/libfxscintilla-20.dll
 - ports/x86_64-w64-mingw32/bin/libgcc_s_seh-1.dll
-- ports/x86_64-w64-mingw32/bin/libjpeg-8.dll
+- ports/x86_64-w64-mingw32/bin/libjpeg-9.dll
 - ports/x86_64-w64-mingw32/bin/libpng16-16.dll
 - ports/x86_64-w64-mingw32/bin/libstdc++-6.dll
 - ports/x86_64-w64-mingw32/bin/libtiff-5.dll
@@ -1110,23 +985,18 @@ files:
 - test/TC_downcast.rb
 - test/TS_All.rb
 - test/blankpage.ps
+- test/dummy.xorg.conf
 - test/howdypage.ps
 - test/stress1.rb
 - test/stress2.rb
 - test/stress3.rb
 - test/testcase.rb
-homepage: http://github.com/larskanis/fxruby
+homepage: http://fxruby.org/
 licenses:
-- LGPL
+- LGPL-2.1
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- rdoc-sources/README.rdoc
-- "--exclude"
-- ext/fox16_c
-- "--exclude"
-- "/aliases|kwargs|missingdep|responder/"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -1144,7 +1014,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.