fxruby 1.6.47-x64-mingw32 → 1.6.49-x64-mingw32

data/ext/fox16_c/extconf.rb

@@ -23,26 +23,26 @@ 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.42'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.50'
 # 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.0.2'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '3.1.1'
 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.6.0'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.7.0'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.57'
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.59'
 LIBFOX_SOURCE_URI         = "http://fox-toolkit.org/ftp/fox-#{LIBFOX_VERSION}.tar.gz"
 
-LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
-LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
-# LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '3.5.2'
-# LIBFXSCINTILLA_SOURCE_URI         = "https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-#{LIBFXSCINTILLA_VERSION.gsub(".","_")}.tar.gz"
+# LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
+# LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
+LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '3.5.2'
+LIBFXSCINTILLA_SOURCE_URI         = "https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-#{LIBFXSCINTILLA_VERSION.gsub(".","_")}.tar.gz"
 
 module BuildRecipeCommons
   def initialize(name, version, files)
@@ -51,7 +51,7 @@ module BuildRecipeCommons
     rootdir = File.expand_path('../../..', __FILE__)
     self.target = File.join(rootdir, "ports")
     self.host = RbConfig::CONFIG["CC"].match(/(.*)-/)[1]
-    self.patch_files = Dir[File.join(rootdir, "patches", self.name, self.version, "*.diff")].sort
+    self.patch_files = Dir[File.join(rootdir, "patches", self.name, self.version, "*.patch")].sort
   end
 
   def port_path
@@ -87,6 +87,7 @@ class BuildRecipe < MiniPortile
   def configure_defaults
     [
       "--host=#{host}",    # build for specific target (host)
+      "--build=x86_64-linux-gnu", # workaround old config.guess of fxscintilla not recognizing aarch64 host platform
       "--disable-static",
       "--enable-shared",
     ]
@@ -99,6 +100,7 @@ class BuildRecipeCMake < MiniPortileCMake
     case host
     when /x86_64/ then "amd64"
     when /i686/ then "x86"
+    when /aarch64/ then "aarch64"
     else raise "unknown host #{host}"
     end
   end
@@ -169,6 +171,11 @@ def do_rake_compiler_setup
     end
 
     libtiff_recipe = BuildRecipe.new("libtiff", LIBTIFF_VERSION, [LIBTIFF_SOURCE_URI]).tap do |recipe|
+      if RUBY_PLATFORM=~/aarch64-mingw/
+        recipe.configure_options += [
+          "LDFLAGS=-lclang_rt.builtins-aarch64",
+        ]
+      end
       recipe.cook_and_activate
     end
 
@@ -178,8 +185,8 @@ def do_rake_compiler_setup
         "--without-xft",
         "--without-x",
         debug ? "--enable-debug" : "--enable-release",
-        "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""} -D__USE_MINGW_ANSI_STDIO=1 -DHAVE_VSSCANF",
-        "LDFLAGS=-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib #{debug ? "-ggdb" : ""}",
+        "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""} -D__USE_MINGW_ANSI_STDIO=1 -DHAVE_VSSCANF -Wno-register",
+        "LDFLAGS=-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib #{debug ? "-ggdb" : ""} #{"-lclang_rt.builtins-aarch64" if RUBY_PLATFORM=~/aarch64-mingw/}",
       ]
       recipe.cook_and_activate
     end
@@ -191,17 +198,18 @@ def do_rake_compiler_setup
           "#{ENV['MAKE'] || "make"}"
         end
 
-#         # This can be uncommented when fxscintilla is used from the source repository.
-#         def configure
-#           execute "bootstrap", "./bootstrap.sh"
-#           super
-#         end
+        def configure
+          # This is necessary when fxscintilla is used from the github repository.
+          execute "bootstrap", "./bootstrap.sh"
+
+          super
+        end
 
         def compile
           execute "compile_lexers", "cd lexers && #{mk}"
           execute "compile_lexlib", "cd lexlib && #{mk}"
           execute "compile_src", "cd src && #{mk}"
-          execute "compile_fox", "cd fox && #{mk} libfxscintilla_la_LDFLAGS='-version-info 23:0:3 -export-dynamic -no-undefined -L#{libfox_path}/lib -lFOX-1.6'"
+          execute "compile_fox", "cd fox && #{mk} libfxscintilla_la_LDFLAGS='-version-info 25:0:0 -export-dynamic -no-undefined -L#{libfox_path}/lib -lFOX-1.6'"
         end
 
         def install
@@ -212,6 +220,10 @@ def do_rake_compiler_setup
 
       recipe.configure_options += [
         "PKG_CONFIG_PATH=#{libfox_recipe.path}/lib/pkgconfig",
+        # Fix undefined symbol __chkstk:
+        "LDFLAGS=#{"-lclang_rt.builtins-aarch64" if RUBY_PLATFORM=~/aarch64-mingw/}",
+        # Avoid gcc error: fxscintilla-FXSCINTILLA-3_5_2/fox/PlatFOX.cxx:1034: undefined reference to `_imp___ZN11FXScintilla11sendMessageEjml'
+        "CPPFLAGS=-DFOXDLL_EXPORTS",
       ]
       recipe.cook_and_activate
     end
@@ -294,6 +306,9 @@ dir_config('fox', '/usr/local/include/fox-1.6', '/usr/local/lib')
 dir_config('fxscintilla', '/usr/local/include/fxscintilla', '/usr/local/lib')
 
 unless enable_config("win32-cross")
+  if RUBY_PLATFORM =~ /^arm64-darwin/
+    dir_config('x11', '/opt/homebrew/include', '/opt/homebrew/lib')
+  end
   checking_for "fox per pkg-config" do
     pkg_config("fox")
   end