RubyGems - rmagick - Versions diffs - 4.2.5 → 5.5.0 - Mend

rmagick 4.2.5 → 5.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (76) hide show

checksums.yaml +4 -4
data/.devcontainer/Dockerfile +14 -0
data/.devcontainer/ImageMagick6/devcontainer.json +11 -0
data/.devcontainer/devcontainer.json +11 -0
data/.devcontainer/setup-repo.sh +10 -0
data/.devcontainer/setup-user.sh +45 -0
data/.editorconfig +1 -1
data/.github/workflows/ci.yml +90 -9
data/.gitignore +4 -0
data/.rubocop_todo.yml +16 -9
data/.yardopts +1 -1
data/CHANGELOG.md +141 -0
data/Gemfile +20 -0
data/README.md +12 -17
data/Rakefile +63 -80
data/before_install_linux.sh +4 -4
data/before_install_osx.sh +7 -6
data/ext/RMagick/extconf.rb +113 -52
data/ext/RMagick/{rmagick.c → rmagick.cpp} +19 -22
data/ext/RMagick/rmagick.h +88 -59
data/ext/RMagick/rmagick_gvl.h +224 -0
data/ext/RMagick/{rmdraw.c → rmdraw.cpp} +170 -159
data/ext/RMagick/{rmenum.c → rmenum.cpp} +69 -50
data/ext/RMagick/{rmfill.c → rmfill.cpp} +85 -24
data/ext/RMagick/{rmilist.c → rmilist.cpp} +191 -93
data/ext/RMagick/{rmimage.c → rmimage.cpp} +1544 -989
data/ext/RMagick/{rminfo.c → rminfo.cpp} +140 -152
data/ext/RMagick/{rmkinfo.c → rmkinfo.cpp} +46 -34
data/ext/RMagick/rmmain.cpp +1923 -0
data/ext/RMagick/{rmmontage.c → rmmontage.cpp} +50 -29
data/ext/RMagick/{rmpixel.c → rmpixel.cpp} +108 -83
data/ext/RMagick/{rmstruct.c → rmstruct.cpp} +6 -6
data/ext/RMagick/{rmutil.c → rmutil.cpp} +62 -161
data/lib/rmagick/version.rb +3 -1
data/lib/rmagick.rb +2 -0
data/lib/rmagick_internal.rb +76 -110
data/lib/rvg/embellishable.rb +6 -2
data/lib/rvg/misc.rb +7 -7
data/lib/rvg/rvg.rb +2 -0
data/lib/rvg/stretchable.rb +2 -2
data/lib/rvg/transformable.rb +1 -1
data/rmagick.gemspec +6 -17
data/sig/rmagick/_draw_common_methods.rbs +64 -0
data/sig/rmagick/_image_common_methods.rbs +389 -0
data/sig/rmagick/draw.rbs +38 -0
data/sig/rmagick/draw_attribute.rbs +28 -0
data/sig/rmagick/enum.rbs +814 -0
data/sig/rmagick/error.rbs +11 -0
data/sig/rmagick/fill.rbs +21 -0
data/sig/rmagick/geometry.rbs +14 -0
data/sig/rmagick/image.rbs +194 -0
data/sig/rmagick/image_list.rbs +181 -0
data/sig/rmagick/iptc.rbs +101 -0
data/sig/rmagick/kernel_info.rbs +12 -0
data/sig/rmagick/optional_method_arguments.rbs +10 -0
data/sig/rmagick/pixel.rbs +46 -0
data/sig/rmagick/struct.rbs +90 -0
data/sig/rmagick.rbs +43 -0
data/sig/rvg/clippath.rbs +34 -0
data/sig/rvg/container.rbs +78 -0
data/sig/rvg/deep_equal.rbs +48 -0
data/sig/rvg/describable.rbs +30 -0
data/sig/rvg/embellishable.rbs +226 -0
data/sig/rvg/misc.rbs +145 -0
data/sig/rvg/paint.rbs +55 -0
data/sig/rvg/pathdata.rbs +77 -0
data/sig/rvg/rvg.rbs +125 -0
data/sig/rvg/stretchable.rbs +56 -0
data/sig/rvg/stylable.rbs +66 -0
data/sig/rvg/text.rbs +118 -0
data/sig/rvg/transformable.rbs +59 -0
data/sig/rvg/units.rbs +33 -0
metadata +63 -128
data/.codeclimate.yml +0 -63
data/deprecated/RMagick.rb +0 -6
data/ext/RMagick/rmmain.c +0 -1951

data/Rakefile CHANGED Viewed

@@ -63,26 +63,13 @@ end
 desc 'Release'
 task release: %i[assert_clean_repo push_and_tag]
-desc 'Release and build the legacy way'
-task legacy_release: ['legacy:README.html', 'legacy:extconf', 'legacy:doc', 'legacy:manifest', 'release']
+namespace :website do
+  PATH_TO_LOCAL_WEBSITE_REPOSITORY = File.expand_path('../rmagick.github.io')
-namespace :legacy do
-  require 'find'
-  task :redcloth do
-    require 'redcloth'
-  end
-  README = 'README.html'
-  MANIFEST = 'ext/RMagick/MANIFEST'
-  # Change the version number placeholders in a file.
-  # Returns an array of lines from the file.
-  def reversion(name)
+  def replace_reversion(lines)
     now = Time.new
     now = now.strftime('%m/%d/%y')
-    lines = File.readlines name
     lines.each do |line|
       line.gsub!(/0\.0\.0/, Magick::VERSION)
       line.gsub!(%r{YY/MM/DD}, now)
@@ -90,87 +77,83 @@ namespace :legacy do
     lines
   end
-  # Rewrite a file containing embedded version number placeholders.
-  def reversion_file(name)
-    lines = reversion(name)
-    tmp_name = name + '_tmp'
-    mv name, tmp_name
-    begin
-      File.open(name, 'w') { |f| lines.each { |line| f.write line } }
-    rescue StandardError
-      mv tmp_name, name
-    ensure
-      rm tmp_name
-    end
-  end
-  desc 'Update version in extconf'
-  task :extconf do
-    reversion_file 'ext/RMagick/extconf.rb'
+  def update_html(input_dir, output_dir, file_name)
+    lines = File.readlines(File.join(input_dir, file_name))
+    lines = replace_reversion(lines)
+    File.open(File.join(output_dir, file_name), 'w') { |f| lines.each { |line| f.write line } }
   end
-  desc 'Build README.txt from README.textile using RedCloth'
-  task 'README.txt' => [:redcloth] do
-    reversion_file 'README.textile'
-    body = File.readlines 'README.textile'
-    body = RedCloth.new(body.join).to_html + "\n"
-    File.open('README.txt', 'w') { |f| f.write body }
-  end
-  desc 'Build README.html from README.txt'
-  task README => 'README.txt' do
-    puts "writing #{README}"
-    File.open(README, 'w') do |html|
-      html.write <<~END_HTML_HEAD
-        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-        <html>
+  ENTITY = {
+    '&' => '&amp;',
+    '>' => '&gt;',
+    '<' => '&lt;'
+  }.freeze
+  def file_to_html(input_dir, input_file_name, output_dir, output_file_name)
+    File.open(File.join(input_dir, input_file_name)) do |src|
+      File.open(File.join(output_dir, output_file_name), 'w') do |dest|
+        dest.puts <<~END_EXHTMLHEAD
+          <!DOCTYPE public PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+          <html xmlns="http://www.w3.org/1999/xhtml">
           <head>
-            <title>RMagick #{Magick::VERSION} README</title>
-            <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-            <meta name="GENERATOR" content="RedCloth">
+            <meta name="generator" content="ex2html.rb" />
+            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+            <link rel="stylesheet" type="text/css" href="css/popup.css" />
+            <title>RMagick example: #{input_file_name}</title>
           </head>
           <body>
-      END_HTML_HEAD
-      html.write File.readlines('README.txt')
-      html.write <<~END_HTML_TAIL
+          <h1>#{input_file_name}</h1>
+          <div class="bodybox">
+          <div class="bodyfloat">
+          <pre>
+        END_EXHTMLHEAD
+        src.each do |line|
+          line.gsub!(/[&><]/) { |s| ENTITY[s] }
+          dest.puts(line)
+        end
+        dest.puts <<~END_EXHTMLTAIL
+          </pre>
+          </div>
+          </div>
+          <div id="close"><a href="javascript:window.close();">Close window</a></div>
           </body>
-        </html>
-      END_HTML_TAIL
+          </html>
+        END_EXHTMLTAIL
+      end
     end
   end
-  desc 'Update versions in html files'
-  task :doc do
-    Dir.chdir('doc') do
-      FileList['*.html'].each { |d| reversion_file(d) }
+  desc 'Update RMagick website'
+  task :update do
+    unless File.exist?(PATH_TO_LOCAL_WEBSITE_REPOSITORY)
+      puts "Please clone the rmagick.github.io repository to #{PATH_TO_LOCAL_WEBSITE_REPOSITORY}"
+      exit 1
     end
-  end
-  # Remove files we don't want in the tarball.
-  # Ensure files are not executable. (ref: bug #10080)
-  desc "Remove files we don't want in the .gem; ensure files are not executable"
-  task :fix_files do
-    rm 'README.txt', verbose: true
-    chmod 0o644, FileList['doc/*.html', 'doc/ex/*.rb', 'doc/ex/images/*', 'examples/*.rb']
-  end
-  desc 'Build manifest'
-  task :manifest do
-    now = Time.new
-    now = now.strftime('%H:%M:%S %m/%d/%y')
-    puts "generating #{MANIFEST}"
+    Dir.glob('doc/*.html') do |file|
+      update_html('doc', PATH_TO_LOCAL_WEBSITE_REPOSITORY, File.basename(file))
+    end
-    File.open(MANIFEST, 'w') do |f|
-      f.puts "MANIFEST for #{Magick::VERSION} - #{now}\n\n"
-      Find.find('.') do |name|
-        next if File.directory? name
+    Dir.glob('doc/ex/*.rb') do |file|
+      file_name = File.basename(file)
+      file_to_html('doc/ex', file_name, PATH_TO_LOCAL_WEBSITE_REPOSITORY, "#{file_name}.html")
+    end
+  end
+end
-        f.puts name[2..-1] # remove leading "./"
-      end
+namespace :rbs do
+  desc 'Validate RBS definitions'
+  task :validate do
+    all_sigs = Dir.glob('sig').map { |dir| "-I #{dir}" }.join(' ')
+    sh("bundle exec rbs #{all_sigs} validate") do |ok, _|
+      abort('one or more rbs validate failed') unless ok
     end
   end
 end
+require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)

data/before_install_linux.sh CHANGED Viewed

@@ -2,7 +2,7 @@
 set -euox pipefail
-gem install bundler
+gem install bundler -v 2.3.26 # Bundler 2.4.x has dropped support for Ruby 2.3
 if [ -v STYLE_CHECKS ]; then
   set +ux
@@ -24,7 +24,7 @@ sudo apt-get autoremove -y imagemagick* libmagick* --purge
 # install build tools, ImageMagick delegates
 sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev \
   liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev libxml2-dev \
-  libtiff5-dev libwebp-dev liblqr-1-0-dev vim gsfonts ghostscript ccache
+  libtiff5-dev libwebp-dev liblqr-1-0-dev vim gsfonts ghostscript
 if [ ! -d /usr/include/freetype ]; then
   # If `/usr/include/freetype` is not existed, ImageMagick 6.7 configuration fails about Freetype.
@@ -41,7 +41,7 @@ build_imagemagick() {
   mkdir -p build-ImageMagick
   version=(${IMAGEMAGICK_VERSION//./ })
-  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  wget "https://imagemagick.org/archive/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"
@@ -52,7 +52,7 @@ build_imagemagick() {
   fi
   cd "${build_dir}"
-  CC="ccache cc" CXX="ccache c++" ./configure --prefix=/usr "${options}"
+  ./configure --prefix=/usr "${options}"
   make -j
 }

data/before_install_osx.sh CHANGED Viewed

@@ -2,7 +2,7 @@
 set -euox pipefail
-gem install bundler
+gem install bundler -v 2.3.26 # Bundler 2.4.x has dropped support for Ruby 2.3
 if [ -v STYLE_CHECKS ]; then
   set +ux
@@ -16,10 +16,11 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
 fi
 export HOMEBREW_NO_AUTO_UPDATE=true
-brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff liblqr libtool libxml2 zlib webp
+brew uninstall --force imagemagick imagemagick@6
+brew install wget ghostscript freetype jpeg little-cms2 openexr libomp libpng libtiff liblqr libtool zlib webp
-export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/lib"
-export CPPFLAGS="-I/usr/local/opt/libxml2/include/libxml2 -I/usr/local/opt/zlib/include"
+export LDFLAGS="-L$(brew --prefix libxml2)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix glib)/lib -L$(brew --prefix openexr)/lib"
+export CPPFLAGS="-I$(brew --prefix libxml2)/include -I$(brew --prefix zlib)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include -I$(brew --prefix openexr)/include/OpenEXR"
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
@@ -31,7 +32,7 @@ build_imagemagick() {
   mkdir -p build-ImageMagick
   version=(${IMAGEMAGICK_VERSION//./ })
-  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  wget "https://imagemagick.org/archive/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"
@@ -42,7 +43,7 @@ build_imagemagick() {
   fi
   cd "${build_dir}"
-  ./configure --prefix=/usr/local "${options}"
+  ./configure --prefix=/usr/local "${options}" --without-raw --without-jxl --without-openjp2
   make -j
 }

data/ext/RMagick/extconf.rb CHANGED Viewed

@@ -2,6 +2,13 @@ lib_dir = File.expand_path('../../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 require 'rubygems'
 require 'mkmf'
+require 'pkg-config'
+module MakeMakefile
+  # Use the C++ compiler to retrieve the information needed to create a Makefile for mswin environment.
+  remove_const(:CONFTEST_C)
+  CONFTEST_C = "#{CONFTEST}.cpp"
+end
 module RMagick
   class Extconf
@@ -9,6 +16,33 @@ module RMagick
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
+    # ImageMagick 6.7 package
+    IM6_7_PACKAGES = ['ImageMagick'].freeze
+    # ImageMagick 6.8+ packages
+    IM6_PACKAGES = %w[
+      ImageMagick-6.Q64HDRI
+      ImageMagick-6.Q32HDRI
+      ImageMagick-6.Q16HDRI
+      ImageMagick-6.Q8HDRI
+      ImageMagick-6.Q64
+      ImageMagick-6.Q32
+      ImageMagick-6.Q16
+      ImageMagick-6.Q8
+    ].freeze
+    # ImageMagick 7 packages
+    IM7_PACKAGES = %w[
+      ImageMagick-7.Q64HDRI
+      ImageMagick-7.Q32HDRI
+      ImageMagick-7.Q16HDRI
+      ImageMagick-7.Q8HDRI
+      ImageMagick-7.Q64
+      ImageMagick-7.Q32
+      ImageMagick-7.Q16
+      ImageMagick-7.Q8
+    ].freeze
     attr_reader :headers
     def initialize
@@ -24,16 +58,17 @@ module RMagick
       return if RUBY_PLATFORM =~ /mswin|mingw/
       if find_executable('brew')
-        pkg_config_path = "#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig"
+        append_pkg_config_path("#{`brew --prefix imagemagick`.strip}/lib/pkgconfig")
+        append_pkg_config_path("#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig")
       elsif find_executable('pacman')
-        pkg_config_path = '/usr/lib/imagemagick6/pkgconfig'
-      else
-        return
+        append_pkg_config_path('/usr/lib/imagemagick6/pkgconfig')
       end
+    end
+    def append_pkg_config_path(path)
       pkg_config_paths = ENV['PKG_CONFIG_PATH'].to_s.split(':')
-      if File.exist?(pkg_config_path) && !pkg_config_paths.include?(pkg_config_path)
-        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], pkg_config_path].compact.join(':')
+      if File.exist?(path) && !pkg_config_paths.include?(path)
+        ENV['PKG_CONFIG_PATH'] = [ENV['PKG_CONFIG_PATH'], path].compact.join(':')
       end
     end
@@ -49,7 +84,7 @@ module RMagick
     end
     def configure_headers
-      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h sys/types.h]
+      @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h sys/types.h ruby.h ruby/io.h]
       if have_header('MagickCore/MagickCore.h')
         headers << 'MagickCore/MagickCore.h'
@@ -67,17 +102,21 @@ module RMagick
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
-        libdir  = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
-        ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
+        original_ldflags = $LDFLAGS.dup
+        libdir  = PKGConfig.libs_only_L($magick_package).chomp.sub('-L', '')
+        ldflags = "#{ENV['LDFLAGS']} " + PKGConfig.libs($magick_package).chomp
+        rpath   = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}"
         # Save flags
-        $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
-        $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
-        $LDFLAGS    = "#{ldflags} -Wl,-rpath,#{libdir}"
+        $CPPFLAGS   += " #{ENV['CPPFLAGS']} " + PKGConfig.cflags($magick_package).chomp
+        $CPPFLAGS   += ' -x c++ -std=c++11 -Wno-register'
+        $LOCAL_LIBS += " #{ENV['LIBS']} " + PKGConfig.libs($magick_package).chomp
+        $LDFLAGS    += " #{ldflags} #{rpath}"
         unless try_link("int main() { }")
           # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
-          $LDFLAGS = ldflags
+          $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
@@ -85,8 +124,9 @@ module RMagick
       elsif RUBY_PLATFORM =~ /mingw/ # mingw
         dir_paths = search_paths_for_library_for_windows
-        $CPPFLAGS = %(-I"#{dir_paths[:include]}")
-        $LDFLAGS = %(-L"#{dir_paths[:lib]}")
+        $CPPFLAGS += %( -I"#{dir_paths[:include]}")
+        $CPPFLAGS += ' -x c++ -std=c++11 -Wno-register'
+        $LDFLAGS += %( -L"#{dir_paths[:lib]}")
         $LDFLAGS << ' -lucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
         have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
@@ -98,11 +138,13 @@ module RMagick
         $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
         $LDFLAGS << ' -libpath:ucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-        $LOCAL_LIBS = im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib'
+        $LOCAL_LIBS += ' ' + (im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib')
+        $CPPFLAGS += ' /std:c++11'
       end
-      $CPPFLAGS << (have_macro('__GNUC__') ? ' -std=gnu99' : ' -std=c99')
+      ruby_version = RUBY_VERSION.split('.')
+      $CPPFLAGS += " -DRUBY_VERSION_MAJOR=#{ruby_version[0]} -DRUBY_VERSION_MINOR=#{ruby_version[1]}"
+      $CPPFLAGS += ' $(optflags) $(debugflags)'
     end
     def exit_failure(msg)
@@ -122,31 +164,40 @@ module RMagick
       exit(1)
     end
+    def detect_imagemagick_packages(packages)
+      packages.select do |package|
+        PKGConfig.exist?(package)
+      end
+    end
+    def installed_im6_packages
+      @installed_im6_packages ||= detect_imagemagick_packages(IM6_PACKAGES)
+    end
+    def installed_im7_packages
+      @installed_im7_packages ||= detect_imagemagick_packages(IM7_PACKAGES)
+    end
     def determine_imagemagick_package
-      packages = `pkg-config --list-all`.scan(/(ImageMagick\-[\.A-Z0-9]+) .*/).flatten
+      packages = [installed_im7_packages, installed_im6_packages].flatten
-      # For ancient version of ImageMagick 6 we need a different regex
       if packages.empty?
-        packages = `pkg-config --list-all`.scan(/(ImageMagick) .*/).flatten
+        # ImageMagick 6.7 does not have package file like ImageMagick-6.Q16.pc
+        packages = detect_imagemagick_packages(IM6_7_PACKAGES)
       end
       if packages.empty?
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
       end
-      if packages.length > 1
-        im7_packages = packages.grep(/\AImageMagick-7/)
-        if im7_packages.any?
-          checking_for('forced use of ImageMagick 6') do
-            if ENV['USE_IMAGEMAGICK_6']
-              packages -= im7_packages
-              true
-            else
-              packages = im7_packages
-              false
-            end
+      if installed_im6_packages.any? && installed_im7_packages.any?
+        checking_for('forced use of ImageMagick 6') do
+          if ENV['USE_IMAGEMAGICK_6']
+            packages = installed_im6_packages
+            true
+          else
+            packages = installed_im7_packages
+            false
           end
         end
       end
@@ -218,7 +269,7 @@ module RMagick
     # issue #169
     # set ARCHFLAGS appropriately for OSX
     def configure_archflags_for_osx(magick_package)
-      return unless `pkg-config #{magick_package} --libs-only-L`.match(%r{-L(.+)/lib})
+      return unless PKGConfig.libs_only_L(magick_package).match(%r{-L(.+)/lib})
       imagemagick_dir = Regexp.last_match(1)
       command = Dir.glob(File.join(imagemagick_dir, "bin/*")).select { |file| File.executable? file }.first
@@ -261,10 +312,8 @@ module RMagick
       exit_failure <<~END_MINGW
         Can't install RMagick #{RMAGICK_VERS}.
         Can't find the ImageMagick library.
-        Retry with '--with-opt-dir' option.
-        Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
-        e.g.
-          gem install rmagick -- '--with-opt-dir=\"C:\\Program Files\\ImageMagick-6.9.1-Q16\"'
+        Please check PATH environment variable for ImageMagick installation path.
       END_MINGW
     end
@@ -272,9 +321,9 @@ module RMagick
       assert_minimum_ruby_version!
       assert_has_dev_libs!
-      # Check for compiler. Extract first word so ENV['CC'] can be a program name with arguments.
-      cc = (ENV['CC'] || RbConfig::CONFIG['CC'] || 'gcc').split(' ').first
-      exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cc)
+      # Check for compiler. Extract first word so ENV['CXX'] can be a program name with arguments.
+      cxx = (ENV['CXX'] || RbConfig::CONFIG['CXX'] || 'g++').split(' ').first
+      exit_failure "No C++ compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cxx)
     end
     def assert_minimum_ruby_version!
@@ -293,16 +342,12 @@ module RMagick
       END_FAILURE
       if RUBY_PLATFORM !~ /mswin|mingw/
-        unless find_executable('pkg-config')
-          exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find pkg-config in #{ENV['PATH']}\n"
-        end
-        unless `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
+        unless PKGConfig.libs('MagickCore')[/\bl\s*(MagickCore|Magick)6?\b/]
           exit_failure failure_message
         end
         $magick_package = determine_imagemagick_package
-        $magick_version = `pkg-config #{$magick_package} --modversion`[/^(\d+\.\d+\.\d+)/]
+        $magick_version = PKGConfig.modversion($magick_package)[/^(\d+\.\d+\.\d+)/]
       else
         `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         $magick_version = Regexp.last_match(1)
@@ -320,7 +365,9 @@ module RMagick
     def create_header_file
       ruby_api = [
-        'rb_gc_adjust_memory_usage' # Ruby 2.4.0
+        'rb_gc_adjust_memory_usage', # Ruby 2.4.0
+        'rb_gc_mark_movable', # Ruby 2.7.0
+        'rb_io_path' # Ruby 3.2.0
       ]
       memory_api = %w[
         posix_memalign
@@ -359,9 +406,6 @@ module RMagick
     def create_makefile_file
       create_header_file
-      # Prior to 1.8.5 mkmf duplicated the symbols on the command line and in the
-      # extconf.h header. Suppress that behavior by removing the symbol array.
-      $defs = []
       # Force re-compilation if the generated Makefile changed.
       $config_h = 'Makefile'
@@ -370,6 +414,22 @@ module RMagick
       print_summary
     end
+    def create_compile_flags_txt
+      cppflags = $CPPFLAGS.split(' ')
+      include_flags = cppflags.select { |flag| flag.start_with?('-I') }
+      define_flags = cppflags.select { |flag| flag.start_with?('-D') } + $defs
+      File.open('compile_flags.txt', 'w') do |f|
+        include_flags.each { |flag| f.puts(flag) }
+        f.puts "-I#{Dir.pwd}"
+        f.puts "-I#{RbConfig::CONFIG['rubyhdrdir']}"
+        f.puts "-I#{RbConfig::CONFIG['rubyhdrdir']}/ruby/backward"
+        f.puts "-I#{RbConfig::CONFIG['rubyarchhdrdir']}"
+        f.puts "-std=c++11"
+        define_flags.each { |flag| f.puts(flag) }
+      end
+    end
     def magick_command
       @magick_command ||= if find_executable('magick')
                             'magick'
@@ -408,3 +468,4 @@ at_exit do
   message msg + "\n"
 end
 extconf.create_makefile_file
+extconf.create_compile_flags_txt