fxruby 1.6.49-x64-mingw32 → 1.6.50-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d4de8a66c184fc2f34599207cf190ebdc8af4c6b75b350c9fcc3d2d7922c5f
-  data.tar.gz: bca6fa426e7af42cf5334766ee3ab6f90befb704247377429f67c5881d5ae1fe
+  metadata.gz: 3bbf6eff491cc97dac7c1251b0dc8af37a94de35adf72544a5bb054df47a6e69
+  data.tar.gz: ca328e8a1b79cba2da02b25ab09d88b86619f03f95e183e7533da837718370ae
 SHA512:
-  metadata.gz: df50aa498b988415efb0f8ca3f4130e7d974db824e41d255cb5811919f1fd854ffb33e213d8b328626dccf7fc0969d074224aab2a59a17ebb41c67da9e774f51
-  data.tar.gz: eeb9fd668f5b6bde07c67ecb5afb9ec561ba9051cae178fe59a68ddbcf39f18f257a9c77e3cf9d92508ce78a01e41392e2f4df125b15ac5ac9e6c2f5807f88e2
+  metadata.gz: 0ebd04e12ce1d9a5704743f26621dba51e50107796ac7daadfad79df445c9d3b3f9ba1fcb1ad9471cc5c6dec255320b00fb1e392164d18ae874e3fa669b2d71d
+  data.tar.gz: 9125a229ef40d03513dc9c4140af84098a647b759302dc0fd56ef2390b752105ac920ee685d0c21c288aa85ecabae5be10798104089e4e198f1f640322e299d5

data/.github/workflows/binary.yml

@@ -15,6 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - platform: "aarch64-mingw-ucrt"
           - platform: "x64-mingw-ucrt"
           - platform: "x64-mingw32"
           - platform: "x86-mingw32"
@@ -23,7 +24,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: "4.0"
       - run: bundle install
 
       - name: Build binary gem
@@ -42,14 +43,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - os: windows-11-arm
+            ruby: "4.0"
+            platform: "aarch64-mingw-ucrt"
           - os: windows-latest
-            ruby: "3.4"
+            ruby: "4.0"
             platform: "x64-mingw-ucrt"
           - os: windows-latest
             ruby: "3.1.7-1"
             platform: "x86-mingw32"
           - os: windows-latest
-            ruby: "2.7"
+            ruby: "3.0"
             platform: "x64-mingw32"
 
     runs-on: ${{ matrix.os }}
@@ -77,7 +81,6 @@ jobs:
           name: binary-gem-${{ matrix.platform }}
 
       - run: echo $env:PATH
-      - run: gem update --system 3.3.26
       - run: bundle install
       - run: gem install --local fxruby-*${{ matrix.platform }}.gem --verbose
       - name: Run specs

data/.github/workflows/ci.yml

@@ -17,13 +17,13 @@ jobs:
           - os: windows
             ruby: "head"
           - os: windows
-            ruby: "2.7"
+            ruby: "3.2"
           - os: ubuntu
             ruby: "head"
           - os: ubuntu
-            ruby: "3.4"
+            ruby: "4.0"
           - os: ubuntu
-            ruby: "2.7"
+            ruby: "3.0"
           - os: macos
             ruby: "head"
 
@@ -37,7 +37,7 @@ jobs:
           ruby-version: ${{ matrix.ruby }}      # passed to ruby/setup-ruby
           apt-get: "xpra xserver-xorg-video-dummy libxrandr-dev libfox-1.6-dev swig" # Ubuntu
           brew: "fox swig xquartz"     # macOS
-          mingw: "fox swig gcc"   # Windows mingw / mswin /ucrt
+          mingw: "fox swig"   # Windows mingw / mswin /ucrt
 
       - name: Print tool versions
         run: |
@@ -46,6 +46,11 @@ jobs:
           swig -version
           gem env
 
+      - name: MacOS Start XQuartz
+        if: matrix.os == 'macos'
+        run: |
+          open -a XQuartz
+
       - name: Bundle install
         run: bundle install
 
@@ -66,13 +71,6 @@ jobs:
           xpra --xvfb="Xorg +extension GLX -config `pwd`/test/dummy.xorg.conf -logfile ${HOME}/.xpra/xorg.log"  start :9
           echo "DISPLAY=:9"  >> $GITHUB_ENV
 
-      - name: MacOS Start XQuartz
-        if: matrix.os == 'macos'
-        run: |
-          open -a XQuartz
-          # wait some seconds until XQuartz has started
-          sleep 10
-
       - name: Run tests
         run: bundle exec rake test
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's runtime dependencies in fxruby.gemspec
-gemspec
+# No fxruby gemspec, since "bundle package" fails on bundler-2.7+, if the extension isn't built
+# gemspec
 
 # For some reason this is required in addition to the gemspec
 # when 'bundle config force_ruby_platform true' is active:
@@ -9,9 +9,9 @@ gem 'mini_portile2'
 
 group :development do
   gem 'rake-compiler', '~> 1.0'
-  gem 'rake-compiler-dock', '~> 1.9.1'
+  gem 'rake-compiler-dock', '~> 1.11.0'
   gem 'yard', '~> 0.8'
-  gem "bundler", ">= 1.12", "< 3.a"
+  gem "bundler", ">= 1.12", "< 5.a"
   gem "rake", "~> 13.0"
 end
 

data/History.md

@@ -1,3 +1,11 @@
+## 1.6.50 / 2026-01-02
+
+* Add binary gem support for ruby-4.0.
+* Drop support for ruby older than 3.0.
+* Fix breaking some other gems (date_core.so) by shipped DLLs. #84
+* Update to libpng-1.6.53, libjpeg-turbo-3.1.3, libtiff-4.7.1 for Windows binary gems.
+* Some documentation improvements.
+
 ## 1.6.49 / 2025-07-14
 
 * Add compatibility to SWIG-4.3. Type of "NULL pointer" error changed in swig 4.3.0. It was ArgumentError before and is NullReferenceError now. #81

data/Rakefile

@@ -132,6 +132,30 @@ ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
 
       spec.files += dlls.map{|dll| "ports/#{gemplat}/bin/#{dll}" }
 
+      # Bind the external DLLs per manifest to our fox16_c.so ,
+      # so that they aren't used by any other extension.
+      # Otherwise version dependent incompatibilities can break other gems.
+      manif_fname = "ports/#{gemplat}/bin/fxruby-assembly.manifest"
+      File.binwrite manif_fname, <<~EOT
+        <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+        <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+        <assemblyIdentity type="win32" name="fxruby-assembly" version="1.0.0.0"></assemblyIdentity>
+
+        #{ dlls.map{|dll| %Q{<file name="#{dll}"/>} }.join }
+        </assembly>
+      EOT
+      spec.files += [manif_fname]
+
+      # Windows manifest files don't allow file paths but only file names.
+      # Therefore move our fox16_c.so into the bin directory
+      # and change to a ruby version dependent file name like "4_0_fox16_c.so".
+      exts, spec.files = spec.files.partition{|f| File.fnmatch("lib/?.?/fox16_c.so", f) }
+      spec.files += exts.map do |f|
+        new = "ports/#{gemplat}/bin/#{File.basename(File.dirname(f)).gsub(".","_")}_#{File.basename(f)}"
+        mv("tmp/#{gemplat}/stage/#{f}", new)
+        new
+      end
+
       unless ENV['FXRUBY_MINGW_DEBUG']
         dlls.each do |dll|
           task "ports/#{gemplat}/bin/#{dll}" do |t|
@@ -162,8 +186,9 @@ namespace :gem do
       RakeCompilerDock.sh <<-EOT, platform: plat
         sudo apt-get update &&
         sudo apt-get install -y yasm libtool m4 automake &&
-        bundle --local --without=test &&
-        rake native:#{plat} pkg/#{ext_task.gem_spec.full_name}-#{plat}.gem MAKE=\"nice make V=1 VERBOSE=1 -j `nproc`\" #{debug}  RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>2.7", "~>3.0")}
+        bundle config set without test &&
+        bundle install --local &&
+        rake native:#{plat} pkg/#{ext_task.gem_spec.full_name}-#{plat}.gem MAKE=\"nice make V=1 VERBOSE=1 -j `nproc`\" #{debug}  RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>4.0", "~>3.0")}
       EOT
     end
   end

data/appveyor.yml

@@ -28,4 +28,4 @@ test_script:
 environment:
   matrix:
     - ruby_version: "head-x64"
-    - ruby_version: "27"
+    - ruby_version: "32"

data/ext/fox16_c/FXRuby.cpp

@@ -2010,4 +2010,18 @@ Init_fox16_c(void) {
 
   appSensitiveObjs=st_init_numtable();
   appSensitiveDCs=st_init_numtable();
-  }
+}
+
+/* Define an additioal ruby version dependent init function.
+ * It is used in the binary gem when loaded by
+ *     require "4_0_fox16_c"
+ */
+#ifdef FXRUBY_INITFUNC
+extern "C" void
+#if defined _WIN32
+__declspec(dllexport)
+#endif
+FXRUBY_INITFUNC(void) {
+  Init_fox16_c();
+}
+#endif

data/ext/fox16_c/extconf.rb

@@ -23,17 +23,17 @@ end
 LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.3.1'
 LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
-LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.50'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.53'
 # LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 LIBPNG_SOURCE_URI = "https://netcologne.dl.sourceforge.net/project/libpng/libpng16/#{LIBPNG_VERSION}/libpng-#{LIBPNG_VERSION}.tar.xz"
 
 # 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'] || '3.1.1'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '3.1.3'
 LIBJPEG_SOURCE_URI = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/#{LIBJPEG_VERSION}/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.7.0'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.7.1'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
 LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.59'
@@ -240,11 +240,27 @@ def do_rake_compiler_setup
       FileUtils.cp `#{cmd}`.chomp, "#{libfox_recipe.path}/bin/", verbose: true
     end
 
+    # Compile a DLL manifest to be used in fox16_c.so
+    File.binwrite "fxruby_manifest.xml", <<~EOT
+      <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+      <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+      <dependency>
+      <dependentAssembly>
+      <assemblyIdentity version="1.0.0.0" type="win32" name="fxruby-assembly" />
+      </dependentAssembly>
+      </dependency>
+      </assembly>
+    EOT
+    File.binwrite "fxruby_manifest.rc", "2 24 fxruby_manifest.xml"
+    system "#{RbConfig::CONFIG["WINDRES"]} --input fxruby_manifest.rc --output fxruby_manifest.res --output-format=coff"
+
     CONFIG['CXX'] = "#{libfox_recipe.host}-g++" # CXX setting must be prefixed for cross build
     CONFIG['CC'] += "\nCXX=#{CONFIG['CXX']}" # Hack CXX into Makefile for cross compilation
     CONFIG['LDSHARED'].gsub!('gcc', 'g++') # ensure C++ linker is used, so that libstdc++ is linked static
-    $LDFLAGS += " -s" # remove symbol table informations from shared lib
+    $LDFLAGS += " -s fxruby_manifest.res" # remove symbol table informations from shared lib and add manifest
     $libs = append_library($libs, "fxscintilla")
+    major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ].gsub(".","_")
+    $CPPFLAGS += " -DFXRUBY_INITFUNC=Init_#{major_minor}_fox16_c"
 
   elsif RUBY_PLATFORM =~ /mingw/
     $CFLAGS = $CFLAGS + " -I/usr/local/include"

data/fxruby.gemspec

@@ -50,7 +50,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/fox16_c/extconf.rb"]
   spec.metadata['msys2_mingw_dependencies'] = 'fox'
-  spec.required_ruby_version = [">= 2.7", "< 4"]
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_runtime_dependency 'mini_portile2', '~> 2.1'
 

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.49"
+    "1.6.50"
   end
 end

data/lib/fox16.rb

@@ -6,24 +6,8 @@ rescue LoadError
     major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
       raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
 
-    add_dll_path = proc do |path, &block|
-      begin
-        require 'ruby_installer/runtime'
-        RubyInstaller::Runtime.add_dll_directory(path, &block)
-      rescue LoadError
-        old_path = ENV['PATH']
-        ENV['PATH'] = "#{path};#{old_path}"
-        block.call
-        ENV['PATH'] = old_path
-      end
-    end
-
     ruby_plat = RUBY_PLATFORM.gsub("i386", "x86")
-    # Temporary add this directory for DLL search, so that bundled DLLs can be found.
-    ports_bin = File.expand_path("../../ports/#{ruby_plat}/bin", __FILE__)
-    add_dll_path.call(ports_bin) do
-      require "#{major_minor}/fox16_c"
-    end
+    require_relative "../ports/#{ruby_plat}/bin/#{major_minor.gsub(".","_")}_fox16_c"
   else
     raise
   end

data/ports/x64-mingw32/bin/fxruby-assembly.manifest

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity type="win32" name="fxruby-assembly" version="1.0.0.0"></assemblyIdentity>
+
+<file name="libwinpthread-1.dll"/><file name="libgcc_s_seh-1.dll"/><file name="libstdc++-6.dll"/><file name="libfxscintilla-25.dll"/><file name="libFOX-1.6-0.dll"/><file name="libjpeg-62.dll"/><file name="libpng16-16.dll"/><file name="libtiff-6.dll"/><file name="zlib1.dll"/>
+</assembly>

data/rdoc-sources/FXImage.rb

@@ -80,7 +80,10 @@ module Fox
     #
     # Populate the image with new pixel data of the same size or of a new size
     #
-    # Pixel data is copied and IMAGE_OWNED option is set.
+    # Pixel data is copied when IMAGE_OWNED option is set or when provided as Array.
+    # Pixel data is used without copying when IMAGE_OWNED isn't set and provided as String.
+    # In that case the string must be writable and receives modifications to the image.
+    #
     # If called with +width+ and +height+, the size of the serverside representation
     # of the image, if it exists, is adjusted but the contents are not updated yet.
     # This can be done by calling render().

data/test/TC_FXBMPImage.rb

@@ -15,7 +15,7 @@ class TC_FXBMPImage < Fox::TestCase
 
   def test_image_from_pixel_data
     img = FXBMPImage.new app
-    img.setPixels "rgbaRGBA", 0, 1, 2
+    img.setPixels +"rgbaRGBA", 0, 1, 2
     bmp_data = FXMemoryStream.open(FXStreamSave, nil) do |outfile|
       img.savePixels(outfile)
       outfile.takeBuffer

data/test/TC_FXImage.rb

@@ -76,14 +76,14 @@ class TC_FXImage < Fox::TestCase
 
   def test_setPixels_string
     img = FXImage.new(app, nil, 0, 2, 1)
-    img.pixels = "rgbaRGBA"
+    img.pixels = +"rgbaRGBA"
     assert_equal(0, img.options)
     assert_equal("rgbaRGBA", img.pixel_string)
   end
 
   def test_dataPtr
     img = FXImage.new(app, nil, 0, 2, 1)
-    img.pixels = "rgbaRGBA"
+    img.pixels = +"rgbaRGBA"
     assert_equal(0, img.options)
     assert_equal("rgbaRGBA", Fiddle::Pointer.new(img.dataPtr)[0, 8])
   end
@@ -121,7 +121,7 @@ class TC_FXImage < Fox::TestCase
   end
 
   def image_with_non_owned_data
-    FXImage.new(app, "rgbaRGBA", 0, 1, 2)
+    FXImage.new(app, +"rgbaRGBA", 0, 1, 2)
   end
 
   def test_create_with_non_owned_data
@@ -135,7 +135,7 @@ class TC_FXImage < Fox::TestCase
   end
 
   def set_non_owned_data(img)
-    img.setPixels("rgbaRGBA", 0, 2, 1)
+    img.setPixels(+"rgbaRGBA", 0, 2, 1)
   end
 
   def test_set_pixel_with_non_owned_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.49
+  version: 1.6.50
 platform: x64-mingw32
 authors:
 - Lyle Johnson
 - Lars Kanis
 bindir: exe
 cert_chain: []
-date: 2025-07-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -947,8 +947,6 @@ files:
 - ext/fox16_c/unregisterOwnedObjects.cpp
 - fxruby.gemspec
 - index.html
-- lib/2.7/fox16_c.so
-- lib/3.0/fox16_c.so
 - lib/fox16.rb
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
@@ -982,6 +980,8 @@ files:
 - lib/fox16/tkcompat.rb
 - lib/fox16/undolist.rb
 - lib/fox16/version.rb
+- ports/x64-mingw32/bin/3_0_fox16_c.so
+- ports/x64-mingw32/bin/fxruby-assembly.manifest
 - ports/x64-mingw32/bin/libFOX-1.6-0.dll
 - ports/x64-mingw32/bin/libfxscintilla-25.dll
 - ports/x64-mingw32/bin/libgcc_s_seh-1.dll
@@ -1525,7 +1525,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.1.dev
@@ -1535,7 +1535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.
 test_files: []