rmagick 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5638d3e358ce6dbfdaad27ad6f3a8cbb04a3268e7111be2ab789c2f2252ee8b
-  data.tar.gz: 6e1d9519cd2457071b665deb5c8365ecf9abd3d6bd0fbf187b37435a425d2a7c
+  metadata.gz: bb35ff56e69891085d8751cc08d6f6d4f1e70791afe76012ea869b6922551ab6
+  data.tar.gz: 0b64498e6b29eca46efa64f1011045728c9708d098868f0de0ffdc0d103cfc02
 SHA512:
-  metadata.gz: 752fbabb75ffa6fd6c78bdc3ea40e4605d960d8bbcaeb1040f7594dcb4f474cb613b33e3cfe06fce7f7fdd0f272b999f85cf89d3037a3e9ac5b2e3f0cb66848b
-  data.tar.gz: ceaf487faba530d128138f980d192eef6e79e5814cd2d4ad25d8cd3c1166b49374f10c0dbc6110c11994a9f43e7d4812b207368c14467deda355661ab9a975b5
+  metadata.gz: 8d9ff646c80d9ee524c001e5da165e5b0712fd8cf662d5a37bcfb28a5453d49ce3859f8b0c1b5324974203deb3b720d0c1ace2a405efae8b1e5e491b30d0a031
+  data.tar.gz: 3e75993a946eb0547d69ef8fa0c66eee8226e72658bc609eba07f405bd6ac22ac4794de5891a21a9466994f1e0254cb7770974666f47d37eba6500ab1962b47a

data/.github/ISSUE_TEMPLATE.md

@@ -10,6 +10,7 @@
 
 - ImageMagick version:
 - RMagick version:
+- Ruby version:
 - Environment (Operating system, version and so on):
 - Additional information:
 

data/.github/workflows/ci.yml

@@ -39,8 +39,8 @@ jobs:
         imagemagick-version:
           - { full: 6.7.7-10, major-minor: '6.7' }
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-2, major-minor: '6.9' }
-          - { full: 7.0.10-2, major-minor: '7.0' }
+          - { full: 6.9.11-6, major-minor: '6.9' }
+          - { full: 7.0.10-6, major-minor: '7.0' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -78,8 +78,8 @@ jobs:
       matrix:
         ruby-version: [2.6, 2.7]
         imagemagick-version:
-          - { full: 6.9.11-2, major-minor: '6.9' }
-          - { full: 7.0.10-2, major-minor: '7.0' }
+          - { full: 6.9.11-6, major-minor: '6.9' }
+          - { full: 7.0.10-6, major-minor: '7.0' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -118,8 +118,8 @@ jobs:
         ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
         imagemagick-version:
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.11-2, major-minor: '6.9' }
-          - { full: 7.0.10-2, major-minor: '7.0' }
+          - { full: 6.9.11-6, major-minor: '6.9' }
+          - { full: 7.0.10-6, major-minor: '7.0' }
     name: MSWin, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
     - uses: actions/checkout@v2
@@ -133,16 +133,9 @@ jobs:
         $imagemagick_version_without_patch = $imagemagick_version.split("-")[0]
         $installer_name = "ImageMagick-$($imagemagick_version)-Q16-x64-dll.exe"
         $url = "https://ftp.icm.edu.pl/pub/graphics/ImageMagick/binaries/$($installer_name)"
+        choco install wget ghostscript
         wget $url --progress=dot
         cmd.exe /D /S /C "$($installer_name) /DIR=D:\ImageMagick /VERYSILENT /TASKS=install_Devel"
-        cmd.exe /D /S /C "choco install ghostscript"
-    - name: Cache Ruby dependencies
-      uses: actions/cache@v1
-      with:
-        path: ./vendor/bundle
-        key: v1-windows-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
-        restore-keys: |
-          v1-windows-${{ matrix.ruby-version }}-${{ hashFiles('rmagick.gemspec') }}
     - name: Build and test with Rake
       run: |
         cmd.exe /D /S /C "SET MAKE=make & SET PATH=D:\ImageMagick;%PATH% & bundle install --path=vendor/bundle --retry 3 & bundle exec rake"

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 4.1.2
+
+Bug Fixes:
+
+- Fix build error on Freebsd (#1199)
+- Add workaround for FreeBSD that it isn't able to process PDF (#1203)
+
 ## RMagick 4.1.1
 
 Bug Fixes:

data/README.md

@@ -44,19 +44,41 @@ Ruby must be able to build C-Extensions (e.g. MRI, Rubinius, not JRuby)
 version 4.1.0.rc2 (#256). You can get ImageMagick from
 <https://imagemagick.org>.
 
-### Ubuntu
+### Linux
+#### Ubuntu
 On Ubuntu, you can run:
 
 ```sh
 sudo apt-get install libmagickwand-dev
 ```
 
+#### Centos
 On Centos, you can run:
 
 ```sh
 sudo yum install gcc ImageMagick-devel make which
 ```
 
+#### Arch Linux
+On Arch Linux, you can run:
+
+```sh
+pacman -Syy pkg-config imagemagick
+```
+
+#### Alpine Linux
+On Alpine Linux, you can run:
+
+```
+apk add pkgconfig imagemagick imagemagick-dev imagemagick-libs
+```
+
+or you can run if you would like to use ImageMagick 6:
+
+```
+apk add pkgconfig imagemagick6 imagemagick6-dev imagemagick6-libs
+```
+
 ### macOS
 On macOS, you can run:
 
@@ -72,8 +94,10 @@ brew install pkg-config imagemagick@6
 
 ### Windows
 1. Install latest Ruby+Devkit package which you can get from [RubyInstaller for Windows](https://rubyinstaller.org).
-2. 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).
-3. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers and librarries for C and C++` in an installer for RMagick.
+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%`)
+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 librarries 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" />
 
 Installing RMagick

data/ext/RMagick/extconf.rb

@@ -333,6 +333,10 @@ module RMagick
         have_func(func, headers)
       end
 
+      unless have_header('malloc.h')
+        have_header('malloc/malloc.h')
+      end
+
       # Miscellaneous constants
       $defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
       $defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")

data/ext/RMagick/rmimage.c

@@ -11049,7 +11049,7 @@ file_arg_rescue(VALUE arg, VALUE raised_exc ATTRIBUTE_UNUSED)
  * @see array_from_images
  */
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
 void sig_handler(int sig ATTRIBUTE_UNUSED)
 {
 }
@@ -11097,7 +11097,7 @@ rd_image(VALUE class ATTRIBUTE_UNUSED, VALUE file, reader_t reader)
 
     exception = AcquireExceptionInfo();
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
     struct sigaction act, oldact;
     act.sa_handler = sig_handler;
     act.sa_flags = SA_RESTART;
@@ -11109,7 +11109,7 @@ rd_image(VALUE class ATTRIBUTE_UNUSED, VALUE file, reader_t reader)
 
     images = (reader)(info, exception);
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
     if (sigaction(SIGCHLD, &oldact, NULL) < 0)
     {
         rb_sys_fail("sigaction");

data/ext/RMagick/rmmain.c

@@ -18,9 +18,9 @@
     #if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE__ALIGNED_MSIZE)
         #define USE_RM_ALIGNED_MALLOC 1
 
-        #if defined(HAVE_MALLOC_USABLE_SIZE)
+        #if defined(HAVE_MALLOC_H)
             #include <malloc.h>
-        #elif defined(HAVE_MALLOC_SIZE)
+        #elif defined(HAVE_MALLOC_MALLOC_H)
             #include <malloc/malloc.h>
         #endif
     #endif

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry