fxruby 1.6.23-x86-mingw32 → 1.6.24-x86-mingw32

data/.yardopts

@@ -1,8 +1,12 @@
+--readme          README.rdoc
+--title           "FXRuby API Documentation"
 --exclude '/aliases|kwargs|missingdep|responder/'
 --protected
 --no-private
+--charset utf-8
 rdoc-sources/*.rb
 lib/fox16/*.rb
 -
 History.txt
 rdoc-sources/*.rdoc
+README.rdoc

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.6.24 / 2012-06-06
+
+* Update libraries for win32 build: libz-1.2.7 libpng-1.5.10 libjpeg-8d libtiff-4.0.1 libfox-1.6.45
+* Avoid Segfauls in lots of methods when called with nil instead of FXApp, FXComposite or FXWindow objects
 
 === 1.6.23 / 2012-03-08
 

data/Manifest.txt

@@ -3,7 +3,6 @@
 .yardopts
 History.txt
 Manifest.txt
-README.git
 README.rdoc
 Rakefile
 Rakefile.cross

data/README.rdoc

@@ -27,7 +27,7 @@ FXRuby supportes everything of FOX, that is useful in Ruby:
 
 FXRuby runs on Linux, Windows and OS-X. Installation on *nix requires
 FOX development headers and libraries installed:
-* on Debian/Ubuntu: <tt>sudo apt-get install libfox-1.6-dev</tt>
+* on Debian/Ubuntu: <tt>sudo apt-get install g++ libxrandr-dev libfox-1.6-dev</tt>
 * see also detailed installation instructions in the {https://github.com/lylejohnson/fxruby/wiki Wiki}
 * no preparation needed on Windows - the binary gem can be used
 

data/Rakefile

@@ -7,10 +7,10 @@ load 'Rakefile.cross'
 
 # Use forked process for chdir'ed environment, to allow parallel execution with drake
 module FileUtils
-  alias old_fileutils_cd cd
+  alias unforked_fileutils_cd cd
   def cd(dir, options={}, &block)
-    raise "forked_chdir called without block" unless block_given?
-    Process.waitpid(fork{ old_fileutils_cd(dir, options, &block) })
+    raise "chdir called without block" unless block_given?
+    Process.waitpid(fork{ unforked_fileutils_cd(dir, options, &block) })
   end
   module_function :cd
   alias chdir cd

data/Rakefile.cross

@@ -34,7 +34,7 @@ end
 
 
 # Fetch zlib tarball
-LIBZ_VERSION            = ENV['LIBZ_VERSION'] || '1.2.5'
+LIBZ_VERSION            = ENV['LIBZ_VERSION'] || '1.2.7'
 LIBZ_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/libpng/zlib/#{LIBZ_VERSION}/zlib-#{LIBZ_VERSION}.tar.bz2" )
 LIBZ_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBZ_SOURCE_URI.path )
 STATIC_LIBZ_BUILDDIR    = STATIC_BUILDDIR + LIBZ_TARBALL.basename(".tar.bz2")
@@ -42,7 +42,7 @@ LIBZ_MAKEFILE           = STATIC_LIBZ_BUILDDIR + 'Makefile'
 LIBZ_A                  = STATIC_INSTALLDIR + 'lib' + 'libz.a'
 
 # Fetch libpng tarball
-LIBPNG_VERSION            = ENV['LIBPNG_VERSION'] || '1.5.4'
+LIBPNG_VERSION            = ENV['LIBPNG_VERSION'] || '1.5.10'
 LIBPNG_SOURCE_URI         = URI( "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz?download" )
 LIBPNG_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBPNG_SOURCE_URI.path )
 STATIC_LIBPNG_BUILDDIR    = STATIC_BUILDDIR + LIBPNG_TARBALL.basename(".tar.gz")
@@ -51,7 +51,7 @@ LIBPNG_A                  = STATIC_INSTALLDIR + 'lib' + 'libpng.a'
 
 
 # Fetch libjpeg tarball
-LIBJPEG_VERSION            = ENV['LIBJPEG_VERSION'] || '8c'
+LIBJPEG_VERSION            = ENV['LIBJPEG_VERSION'] || '8d'
 LIBJPEG_SOURCE_URI         = URI( "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz" )
 LIBJPEG_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBJPEG_SOURCE_URI.path )
 STATIC_LIBJPEG_BUILDDIR    = STATIC_BUILDDIR + "jpeg-#{LIBJPEG_VERSION}"
@@ -60,7 +60,7 @@ LIBJPEG_A                  = STATIC_INSTALLDIR + 'lib' + 'libjpeg.a'
 
 
 # Fetch libtiff tarball
-LIBTIFF_VERSION            = ENV['LIBTIFF_VERSION'] || '3.9.5'
+LIBTIFF_VERSION            = ENV['LIBTIFF_VERSION'] || '4.0.1'
 LIBTIFF_SOURCE_URI         = URI( "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz" )
 LIBTIFF_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBTIFF_SOURCE_URI.path )
 STATIC_LIBTIFF_BUILDDIR    = STATIC_BUILDDIR + LIBTIFF_TARBALL.basename(".tar.gz")
@@ -69,7 +69,7 @@ LIBTIFF_A                  = STATIC_INSTALLDIR + 'lib' + 'libtiff.a'
 
 
 # Fetch libfox tarball
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.44'
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.45'
 LIBFOX_SOURCE_URI         = URI( "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz" )
 LIBFOX_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBFOX_SOURCE_URI.path )
 STATIC_LIBFOX_BUILDDIR    = STATIC_BUILDDIR + LIBFOX_TARBALL.basename(".tar.gz")

data/ext/fox16/FXRuby.cpp

@@ -269,6 +269,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
   if(foxObj!=0){
     FXRubyObjDesc* desc;
     if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
+      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%d,foxObj=%p)\n",static_cast<int>(desc->obj),foxObj));
       DATA_PTR(desc->obj)=0;
       FXFREE(&desc);
       st_delete(FXRuby_Objects,reinterpret_cast<st_data_t *>(const_cast<void**>(&foxObj)),reinterpret_cast<st_data_t *>(0));

data/ext/fox16/extconf.rb

@@ -80,7 +80,8 @@ def do_rake_compiler_setup
     have_library( 'winspool', 'EnumPrintersA') && append_library( $libs, 'winspool' )
 
     CONFIG['CC'] += "\nCXX=#{ENV['CROSS_PREFIX']}-g++" # Hack CXX into Makefile for cross compilation
-    $CFLAGS += " -D_SYS_TIME_H_" # fix incompatible types for gettimeofday()
+    CONFIG['LDSHARED'].gsub!('gcc', 'g++') # ensure C++ linker is used, so that libstdc++ is linked static
+    $LDFLAGS += " -static-libgcc -static-libstdc++" # mingw-w64 v4.7 defaults to dynamic linking
   elsif RUBY_PLATFORM =~ /mingw/
     $CFLAGS = $CFLAGS + " -I/usr/local/include"
     $LDFLAGS = $LDFLAGS + " -I/usr/local/lib"
@@ -92,8 +93,8 @@ def do_rake_compiler_setup
     $LDFLAGS = $LDFLAGS + " -L/usr/local/lib"   # for libjpeg and libtiff
     %w{Xft}.each {|lib| $libs = append_library($libs, lib) }
   end
-  $libs = append_library($libs, "stdc++")
-  have_header("sys/time.h") unless RUBY_PLATFORM =~ /mingw/
+  $libs = append_library($libs, "stdc++") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
+  have_header("sys/time.h") unless RUBY_PLATFORM =~ /mingw/ || enable_config("win32-static-build")
   have_header("signal.h")
   if have_library("z", "deflate")
     have_library("png", "png_create_read_struct")

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.23"
+    "1.6.24"
   end
 end

data/swig-interfaces/FXApp.i

@@ -464,7 +464,7 @@ public:
   * Run popup menu while shown, until stop() or stopModal() is called.
   * Also returns when entering previous cascading popup menu.
   */
-  FXint runPopup(FXWindow* window);
+  FXint runPopup(FXWindow* owner);
 
   /// True if the window is modal
   bool isModal(FXWindow* window) const;

data/swig-interfaces/FXSplashWindow.i

@@ -53,10 +53,10 @@ public:
 public:
 
   /// Construct splash window
-  FXSplashWindow(FXApp* ap,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
+  FXSplashWindow(FXApp* a,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
 
   /// Construct splash window
-  FXSplashWindow(FXWindow* ow,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
+  FXSplashWindow(FXWindow* own,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
 
   /// Set the icon for the splash window
   void setIcon(FXIcon* ic);

data/swig-interfaces/ruby-typemaps.i

@@ -24,8 +24,14 @@
 
 %apply Pointer NONNULL {
   FXApp* APP,
-	FXComposite* PARENT,
-	FXWindow* OWNER
+  FXApp* a,
+  FXApp* app,
+  FXApp* application,
+  FXComposite* PARENT,
+  FXComposite* p,
+  FXWindow* OWNER,
+  FXWindow* own,
+  FXWindow* owner
 }
 
 /* Type-checking rules */

data/test/TC_FXApp.rb

@@ -23,6 +23,10 @@ class TC_FXApp2 < Fox::TestCase
     super(self.class.name)
   end
 
+  def test_nil_window_raises_argument_error
+    assert_raise(ArgumentError){ app.runPopup(nil) }
+  end
+
   def check_events(pipe_rd, pipe_wr)
     app.addInput(pipe_wr, INPUT_WRITE, app, FXApp::ID_QUIT)
     app.run

data/test/TC_FXButton.rb

@@ -10,6 +10,10 @@ class TC_FXButton < Fox::TestCase
     @button = FXButton.new(mainWindow, "buttonText")
   end
 
+  def test_nil_parent_raises_argument_error
+    assert_raise(ArgumentError){ FXButton.new(nil, "buttonText") }
+  end
+
   def testText
     assert(@button.text)
     assert_instance_of(String, @button.text)

data/test/TC_FXGLViewer.rb

@@ -10,6 +10,15 @@ class TC_FXGLViewer < Fox::TestCase
     vis = FXGLVisual.new(app, VISUAL_DOUBLEBUFFER)
     @viewer = FXGLViewer.new(mainWindow, vis)
   end
+
+  def test_supported
+    assert FXGLVisual.supported?(app)
+  end
+
+  def test_nil_app_raises_argument_error
+    assert_raise(ArgumentError){ FXGLVisual.supported?(nil) }
+  end
+
 =begin
   def test_readPixels
     pixels = @viewer.readPixels(0, 0, @viewer.width, @viewer.height)

data/test/TC_FXMessageBox.rb

@@ -9,6 +9,10 @@ class TC_FXMessageBox < Fox::TestCase
     super(self.class.name)
   end
 
+  def test_nil_app_raises_argument_error
+    assert_raise(ArgumentError){ FXMessageBox.new(nil, "Save?", "Save?", :opts => MBOX_SAVE_CANCEL_DONTSAVE) }
+  end
+
   def test_construct_with_save_cancel_dontsave
     assert_nothing_raised(RangeError) do
       FXMessageBox.new(mainWindow, "Save?", "Save?", :opts => MBOX_SAVE_CANCEL_DONTSAVE)

data/test/TC_FXScrollArea.rb

@@ -10,6 +10,10 @@ class TC_FXScrollArea < Fox::TestCase
     @scrollArea = FXScrollArea.new(mainWindow)
   end
 
+  def test_nil_parent_raises_argument_error
+    assert_raise(ArgumentError){ FXScrollArea.new(nil) }
+  end
+
   def test_position_get
     pos = @scrollArea.position
     assert_instance_of(Array, pos)

data/test/TC_FXShell.rb

@@ -15,6 +15,10 @@ class TC_FXShell < Test::Unit::TestCase
     @mainWin = FXMainWindow.new(@app, 'TC_FXShell')
   end
 
+  def test_nil_parent_raises_argument_error
+    assert_raise(ArgumentError){ FXShell.new(nil, 0, 0, 0, 0, 0) }
+  end
+
   def test_new
     # Free-floating
     shell1 = FXShell.new(@app, 0, 0, 0, 0, 0)

data/test/TC_FXTopWindow.rb

@@ -15,6 +15,10 @@ class TC_FXTopWindow < Test::Unit::TestCase
     @mainWin = FXMainWindow.new(@app, 'TC_FXButton')
   end
 
+  def test_nil_app_raises_argument_error
+    assert_raise(ArgumentError){ FXTopWindow.new(nil, 'TC_FXButton') }
+  end
+
   def test_new
     # Free-floating
     top1 = FXTopWindow.new(@app, "top1", nil, nil, DECOR_ALL, 0, 0, 0, 0,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fxruby
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 6
-  - 23
-  version: 1.6.23
+  - 24
+  version: 1.6.24
 platform: x86-mingw32
 authors: 
 - Lyle Johnson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-08 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -67,7 +67,6 @@ files:
 - .yardopts
 - History.txt
 - Manifest.txt
-- README.git
 - README.rdoc
 - Rakefile
 - Rakefile.cross

data/README.git

@@ -1,3 +0,0 @@
-To push changes on local topic/1.6 branch back to remote 1.6 branch:
-
-    git push origin topic/1.6:1.6