rmagick 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4002a5d6c97fb78a5f1a75b4b192cf5151a43570702da719262b34ea08f19c28
-  data.tar.gz: 61a03fd6de17ec92ddbf4650a03076072dfda17a6a6c9bcb5db7bb90089c5c84
+  metadata.gz: 513aba969c109a4cbaef2540e0c8c24b698bae9741340190439f689f36221dc5
+  data.tar.gz: b4c08a874757081e94168f3d61d648fa415a5db3bdf506fd9e1e33d23ddc4a44
 SHA512:
-  metadata.gz: dd88b3a404b7dedd24bd18a71cd5245af2b4cc38df32c377b9a3e8dbcb99b1790e9bd349e6c9abc9e45a0f64c6d75fdd5b92333e4febd1e3884cd04e8a07c23a
-  data.tar.gz: aa9ac858769d7332a334cfa154f361028650eeb2947fb0f28dc254d71d72932e0e39a04726586847230f53ee658bb2d169fab385c6992d20e3bac2e8343c707a
+  metadata.gz: b023dd20af9b18850820465beeec888783d0fd49d96ae35cb8aab30627789a7c542a575095bb15b85e4509d7194162bbe382bf9321e3b2e9f4d033c9dad44e82
+  data.tar.gz: 7cd836b62e7dc614fa00e5b781d096e05d8bac29a05e36c319cc57446e0ff285d91e4f7f1b0b27e38e0c36a3a190b50960470f4d0e808b1e93e61c81735e35db

data/.rubocop.yml

@@ -62,3 +62,6 @@ RSpec/AlignRightLetBrace:
 
 Style/Copyright:
   Enabled: false
+
+Style/DisableCopsWithinSourceCodeDirective:
+  Enabled: false

data/.rubocop_todo.yml

@@ -171,12 +171,6 @@ Lint/FloatComparison:
   Exclude:
     - 'lib/rvg/stretchable.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/IdentityComparison:
-  Exclude:
-    - 'lib/rmagick_internal.rb'
-
 # Offense count: 91
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredClasses.
@@ -199,12 +193,6 @@ Lint/RescueException:
   Exclude:
     - 'lib/rmagick_internal.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowComments, AllowNil.
-Lint/SuppressedException:
-  Exclude:
-    - 'lib/rmagick_internal.rb'
-
 # Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -389,12 +377,6 @@ Style/ClassMethodsDefinitions:
 Style/CommentedKeyword:
   Enabled: false
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/ConcatArrayLiterals:
-  Exclude:
-    - 'spec/rmagick/image_list/concat_spec.rb'
-
 # Offense count: 129
 # Configuration parameters: IgnoreModules.
 Style/ConstantVisibility:
@@ -408,17 +390,6 @@ Style/ConstantVisibility:
     - 'lib/rvg/stylable.rb'
     - 'spec/support/helpers.rb'
 
-# Offense count: 9
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedCops.
-Style/DisableCopsWithinSourceCodeDirective:
-  Exclude:
-    - 'lib/rmagick_internal.rb'
-    - 'spec/magick_spec.rb'
-    - 'spec/rmagick/image_list/collect_spec.rb'
-    - 'spec/rmagick/image_list/find_all_spec.rb'
-    - 'spec/rmagick/image_list_spec.rb'
-
 # Offense count: 3
 Style/DocumentDynamicEvalDefinition:
   Exclude:
@@ -455,12 +426,6 @@ Style/FormatStringToken:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'Rakefile'
-
 # Offense count: 46
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.0.1
+
+Bug Fixes
+
+- Fix build error on FreeBSD (#1618)
+- Fix build error with GCC 14 on Windows (#1616)
+
 ## RMagick 6.0.0
 
 Improvements

data/README.md

@@ -105,10 +105,10 @@ brew install imagemagick@6
 ### Windows
 1. Install latest Ruby+Devkit package which you can get from [RubyInstaller for Windows](https://rubyinstaller.org).
 2. You might need to configure `PATH` environment variable to where the compiler is located.
-   (Ex: `set PATH=C:\Ruby27-x64\msys64\usr\bin;C:\Ruby27-x64\msys64\mingw64\bin;%PATH%`)
+   (Ex: `set PATH=C:\Ruby33-x64\bin;C:\Ruby33-x64\msys64\ucrt64\bin;%PATH%`)
 3. Download `ImageMagick-7.XXXX-Q16-x64-dll.exe` (not, `ImageMagick-7.XXXX-Q16-x64-static.exe`) binary from [Windows Binary Release](https://imagemagick.org/script/download.php#windows), or you can download ImageMagick 6 from [Windows Binary Release](https://legacy.imagemagick.org/script/download.php#windows).
-4. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers and libraries for C and C++` in an installer for RMagick.
-<img width="50%" src="https://user-images.githubusercontent.com/199156/77183472-b72cbd00-6b11-11ea-8b9a-247bc1f9d8b1.png" />
+4. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers for C and C++` in an installer for RMagick.
+<img width="75%" src="https://github.com/rmagick/rmagick/assets/199156/494e7963-cca5-4cb5-b28a-6c4d76adce5d" />
 
 Installing RMagick
 ------------------

data/Rakefile

@@ -2,11 +2,9 @@ require 'simplecov'
 require './lib/rmagick/version'
 require 'fileutils'
 require 'English'
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -r ./ext/RMagick/extconf.rb -r ./lib/rmagick.rb"
-end
+require 'bundler/gem_tasks'
+require 'rake/extensiontask'
+require 'rspec/core/rake_task'
 
 task :config do
   def version
@@ -52,7 +50,7 @@ task push_and_tag: [:build] do
   sh "gem push #{File.join(base, 'pkg', gem_name)}"
   if $CHILD_STATUS.success?
     sh "git tag -a -m \"Version #{version}\" #{version_tag}"
-    STDOUT.puts "Tagged #{version_tag}."
+    puts "Tagged #{version_tag}."
     sh 'git push'
     sh 'git push --tags'
   else
@@ -60,6 +58,7 @@ task push_and_tag: [:build] do
   end
 end
 
+Rake::Task["release"].clear # Remove `release` task in bundler/gem_tasks
 desc 'Release'
 task release: %i[assert_clean_repo push_and_tag]
 
@@ -125,8 +124,8 @@ namespace :website do
     end
   end
 
-  desc 'Update RMagick website'
-  task :update do
+  desc 'Update RMagick website HTML files'
+  task :"update:html" 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
@@ -141,6 +140,25 @@ namespace :website do
       file_to_html('doc/ex', file_name, PATH_TO_LOCAL_WEBSITE_REPOSITORY, "#{file_name}.html")
     end
   end
+
+  desc 'Update RMagick website image files'
+  task :"update:image" 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
+
+    Rake::Task['install'].invoke
+
+    FileUtils.rm_rf("#{PATH_TO_LOCAL_WEBSITE_REPOSITORY}/ex")
+    FileUtils.cp_r('doc/ex', PATH_TO_LOCAL_WEBSITE_REPOSITORY)
+
+    FileUtils.cd("#{PATH_TO_LOCAL_WEBSITE_REPOSITORY}/ex") do
+      Dir.glob('*.rb').each do |file|
+        sh "ruby #{file}"
+      end
+    end
+  end
 end
 
 namespace :rbs do
@@ -153,9 +171,6 @@ namespace :rbs do
   end
 end
 
-require 'bundler/gem_tasks'
-require 'rake/extensiontask'
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 Rake::ExtensionTask.new('RMagick2') do |ext|

data/before_install_osx.sh

@@ -15,10 +15,10 @@ fi
 
 export HOMEBREW_NO_AUTO_UPDATE=true
 brew uninstall --force imagemagick imagemagick@6
-brew install wget ghostscript freetype libtool jpeg little-cms2 openexr libomp libpng libtiff liblqr zlib webp zstd
+brew install wget ghostscript freetype libtool jpeg jpeg-xl little-cms2 openexr libomp libpng libtiff liblqr zlib webp zstd
 
-export LDFLAGS="-L$(brew --prefix jpeg)/lib -L$(brew --prefix little-cms2)/lib -L$(brew --prefix openexr)/lib -L$(brew --prefix libomp)/lib -L$(brew --prefix libpng)/lib -L$(brew --prefix libtiff)/lib -L$(brew --prefix liblqr)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix webp)/lib -L$(brew --prefix zstd)/lib"
-export CPPFLAGS="-I$(brew --prefix jpeg)/include -I$(brew --prefix openexr)/include/OpenEXR -I$(brew --prefix libtiff)/include -I$(brew --prefix zlib)/include -I$(brew --prefix zstd)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include"
+export LDFLAGS="-L$(brew --prefix jpeg)/lib -I$(brew --prefix jpeg-xl)/lib -L$(brew --prefix little-cms2)/lib -L$(brew --prefix openexr)/lib -L$(brew --prefix libomp)/lib -L$(brew --prefix libpng)/lib -L$(brew --prefix libtiff)/lib -L$(brew --prefix liblqr)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix webp)/lib -L$(brew --prefix zstd)/lib"
+export CPPFLAGS="-I$(brew --prefix jpeg)/include -I$(brew --prefix jpeg-xl)/include -I$(brew --prefix openexr)/include/OpenEXR -I$(brew --prefix libtiff)/include -I$(brew --prefix zlib)/include -I$(brew --prefix zstd)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include"
 
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
@@ -41,7 +41,11 @@ build_imagemagick() {
   fi
 
   cd "${build_dir}"
-  ./configure --prefix=/usr/local "${options}" --without-raw
+  ./configure \
+    --prefix=/usr/local \
+    "${options}" \
+    --with-gs-font-dir=/opt/homebrew/share/ghostscript/fonts \
+    --without-raw
   make -j
 }
 

data/ext/RMagick/extconf.rb

@@ -20,6 +20,7 @@ module RMagick
       ImageMagick-6.Q32
       ImageMagick-6.Q16
       ImageMagick-6.Q8
+      ImageMagick-6
     ].freeze
 
     # ImageMagick 7 packages
@@ -32,6 +33,7 @@ module RMagick
       ImageMagick-7.Q32
       ImageMagick-7.Q16
       ImageMagick-7.Q8
+      ImageMagick-7
     ].freeze
 
     attr_reader :headers
@@ -129,7 +131,7 @@ module RMagick
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM.include?('darwin') # osx
 
       end
-      $CPPFLAGS += ' $(optflags) $(debugflags)'
+      $CPPFLAGS += ' $(optflags) $(debugflags) -fomit-frame-pointer'
     end
 
     def exit_failure(msg)

data/ext/RMagick/rmagick.h

@@ -273,8 +273,8 @@ typedef struct
 
 //! Quantum expression adapter.
 /**
- * Both ImageMagick and GraphicsMagick define an enum type for quantum-level
- * expressions, but they're different types. The QuantumExpressionOperator
+ * ImageMagick defines an enum type for quantum-level expressions,
+ * but they're different types. The QuantumExpressionOperator
  * type is an adapter type that can be mapped to either one.
  */
 typedef enum _QuantumExpressionOperator

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

data/lib/rmagick_internal.rb

@@ -11,12 +11,9 @@
 #==============================================================================
 
 if RUBY_PLATFORM.match?(/mingw/i)
-  begin
-    require 'ruby_installer'
-    ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
-      RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'CORE_RL_magick_.dll')) || File.exist?(File.join(path, 'CORE_RL_MagickCore_.dll'))
-    end
-  rescue LoadError
+  require 'ruby_installer'
+  ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
+    RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'CORE_RL_magick_.dll')) || File.exist?(File.join(path, 'CORE_RL_MagickCore_.dll'))
   end
 end
 
@@ -1616,7 +1613,7 @@ module Magick
       if @scene
         img = @images[@scene]
         new_img = img.public_send(meth_id, *args, &block)
-        img.object_id == new_img.object_id ? self : new_img
+        img.equal?(new_img) ? self : new_img
       else
         super
       end

data/rmagick.gemspec

@@ -12,6 +12,10 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/rmagick/rmagick'
   s.license = 'MIT'
 
+  s.metadata['bug_tracker_uri'] = 'https://github.com/rmagick/rmagick/issues'
+  s.metadata['documentation_uri'] = 'https://rmagick.github.io/'
+  s.metadata['changelog_uri'] = 'https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md'
+
   tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   file_exclusion_regex = /\A(doc|benchmarks|examples|spec|Steepfile)/
   files = tracked_files.reject { |file| file[file_exclusion_regex] }

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Tim Hunter
 - Omer Bar-or
 - Benjamin Thomas
 - Moncef Maiza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: observer
@@ -137,8 +137,11 @@ files:
 homepage: https://github.com/rmagick/rmagick
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/rmagick/rmagick/issues
+  documentation_uri: https://rmagick.github.io/
+  changelog_uri: https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.8.9 or later
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []