rmagick 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8727d63370f3301d1003b3289cb4f7d4d51053866c665fdf209fece0ff3a2cd5
-  data.tar.gz: 42f684f58bacb86862a11b9d37cd061846860b5cec169e267a42f4a815d424d1
+  metadata.gz: 869808111e9ff5a238c87513cf287fccf958b962a0d0a11cef7d7f2e4d66f1a4
+  data.tar.gz: 781eeaca5f13d2544c41a26faa9c7a7d7a08c8a8615d8982e6ae8ebfef73fee0
 SHA512:
-  metadata.gz: 8fe89adf4ce1c080090ab6b762dd7978a73615aadcef2be75340eab407c866d3c7bd9129f037f4c3d4ccc522494e15cfed2af9f8c3cb28f64d088492949f1d32
-  data.tar.gz: ce107ad02c27ce449d81d9640028a0be798fc8e916ae638321f22c05f59b06e3073777c5b89bb73360fdc52f909fb64ddb75a5c4510cb994a69757805ae639ba
+  metadata.gz: 1e587419ce08959d886d52e1a21648444ef3054f385b8f4aa78cbcd66d37467730555d8ff7e4ba1db753fc98918f65b64b075906dae5a26daf15bdd792a8a589
+  data.tar.gz: 006f8c9ab91b011cc1a53c588ad4e7e85ecd015efbb3984f154dddff2de030d64209e97a69ce921d053938ffd758351636d42357197076a9be3e19c3d45795ef

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@master
       with:
@@ -30,7 +30,7 @@ jobs:
     name: RBS
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@master
       with:
@@ -55,7 +55,7 @@ jobs:
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -89,7 +89,7 @@ jobs:
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -123,7 +123,7 @@ jobs:
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -167,7 +167,7 @@ jobs:
 
     name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Setup environment variable
       # https://stackoverflow.com/questions/60169752/how-to-update-the-path-in-a-github-action-workflow-file-for-a-windows-latest-hos
       run: |

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.1.4
+
+Improvements
+
+- Improve check whether C++ compiler exists (#1708)
+
 ## RMagick 6.1.3
 
 Bug Fixes

data/ext/RMagick/extconf.rb

@@ -226,9 +226,12 @@ module RMagick
     def assert_can_compile!
       assert_has_dev_libs!
 
-      # 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)
+      # Check for C++ compiler. Extract first word so ENV['CXX'] can be a program name with arguments.
+      # Ref. https://bugs.ruby-lang.org/issues/21111
+      cxx = (ENV['CXX'] || RbConfig::CONFIG['CXX']).split.first
+      return if cxx != "false" && find_executable(cxx)
+
+      exit_failure "No C++ compiler found in ${ENV['PATH']}. See mkmf.log for details."
     end
 
     def assert_has_dev_libs!

data/lib/rmagick/version.rb

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

data/lib/rmagick_internal.rb

@@ -224,7 +224,7 @@ module Magick
 
     def enquote(str)
       str = to_string(str)
-      if str.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(str)
+      if str.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(str)
         str
       else
         '"' + str + '"'
@@ -619,7 +619,7 @@ module Magick
     def text(x, y, text)
       text = to_string(text)
       Kernel.raise ArgumentError, 'missing text argument' if text.empty?
-      if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
+      if text.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(text)
       # text already quoted
       elsif !text['\'']
         text = '\'' + text + '\''

data/lib/rvg/misc.rb

@@ -74,7 +74,7 @@ module Magick
         end
 
         def enquote(text)
-          return text if text.length > 2 && /\A(?:"[^\"]+"|'[^\']+'|\{[^\}]+\})\z/.match(text)
+          return text if text.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(text)
 
           if !text['\'']
             text = '\'' + text + '\''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Tim Hunter