fxruby 1.6.50 → 1.6.51

data/ext/fox16_c/extconf.rb

@@ -20,20 +20,20 @@ def fxscintilla_support_suppressed?
   !with_config("fxscintilla", true)
 end
 
-LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.3.1'
+LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.4'
 LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
-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"
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.59'
+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.3'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '3.2.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.7.1'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.7.2'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
 LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.59'
@@ -224,6 +224,7 @@ def do_rake_compiler_setup
         "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",
+        "CXXFLAGS=-include algorithm", # include is missing for std::fill() in ./SplitVector.h
       ]
       recipe.cook_and_activate
     end
@@ -341,7 +342,7 @@ unless enable_config("win32-cross")
 
     unless $autodetected_fxscintilla
       checking_for "fxscintilla on Ubuntu with missing libfxscintilla.so link" do
-        if find_library(":libfxscintilla.so.19", nil) && (cflags = RUBY_VERSION>="2.1" ? pkg_config("fxscintilla", "cflags") : `pkg-config --cflags fxscintilla`)
+        if find_library(":libfxscintilla.so.19", nil) && (cflags = pkg_config("fxscintilla", "cflags"))
           $CXXFLAGS += " " + cflags
           $autodetected_fxscintilla = true
         end
@@ -356,6 +357,7 @@ end
 if enable_config("debug")
   $CPPFLAGS += " -ggdb"
   $LDFLAGS += " -ggdb"
+  $CPPFLAGS += " -DRUBY_DEBUG=1" # define RUBY_DEBUG otherwise ruby/assert.h defines NDEBUG
 else
   $CPPFLAGS += " -DNDEBUG"
 end
@@ -363,9 +365,10 @@ end
 # Platform-specific modifications
 do_rake_compiler_setup
 
-if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
+if RbConfig::MAKEFILE_CONFIG['CXX'] =~ /g++/
   $CXXFLAGS += " -Wno-unused-function"
   $CXXFLAGS += " -Wno-maybe-uninitialized"
+  $CXXFLAGS += " -Wno-attribute-warning"
 end
 
 # Last step: build the makefile