Skip to content
Snippets Groups Projects
Commit f05a32db authored by Patrycja Rosa's avatar Patrycja Rosa :cat: Committed by Jakub Jirutka
Browse files

community/ruby-rmagick: build with imagemagick 7 and fix tests

parent 9e3f89af
No related branches found
No related tags found
2 merge requests!39304[3.16] main/expat: security upgrade to 2.4.9,!36498community/ruby-rmagick: upgrade to 4.2.6
Pipeline #130669 passed
......@@ -10,8 +10,8 @@ url="https://github.com/rmagick/rmagick"
arch="all"
license="MIT"
depends="ghostscript-fonts"
checkdepends="ruby-rake ruby-rspec"
makedepends="imagemagick6-dev ruby ruby-dev"
checkdepends="imagemagick ruby-rake ruby-rspec"
makedepends="imagemagick-dev ruby ruby-dev"
source="https://github.com/rmagick/rmagick/archive/RMagick_$_pkgver.tar.gz
gemspec.patch
spec-drop-pry.patch
......@@ -31,8 +31,7 @@ build() {
}
check() {
# FIXME: Troubleshoot broken tests and remove `|| true`.
GEM_PATH='dist:.gem' rspec || true
GEM_PATH='dist:.gem' rspec
}
package() {
......@@ -54,5 +53,5 @@ sha512sums="
9a5dccceb069d0b274256c181335ac92037d0def3b3ed4e087f1eec1f7e9a9d07f9105bec87f732828c3bdff96b7032ffd696d6b9b4941748b0b64315d11d253 gemspec.patch
6550535ebaf3924b9f707da395eeaec630e5db50e1964ab9f84d2f941d97c7c49eb7dff05439efa355abb97e72556385b26b8af1d86e05b7c12fd8f2f781834a spec-drop-pry.patch
5eeea508d44f2c9679fe4fe3d5b9a51470f8022537f5822f85c95dbd4d78149c2cada763f0bdf3e86523770b0b758117a6d216b240c92f54253905c19d38d064 dont-test-webp.patch
0ce63eda8d42d0e6c1263625cac91147428ef79db557cf23340078c11bb8f6d985f8ffe830a11558a77da005a83e96246452808efb53997938b38a6af1907b69 skip-broken-test.patch
90a292ac7724b23f767974f5c88ea5719456d4d5dcd1a137c57c8b8bffab95c8237cd23b172ba6092f704ffc13707339b4b34abb86352406b5cc9ba8ac025d0e skip-broken-test.patch
"
......@@ -12,3 +12,30 @@ index c8f39f8..f3b6080 100644
# test percentages
args = ['20%', '20%', '20%', '20%']
--- a/spec/rmagick/image/liquid_rescale_spec.rb
+++ b/spec/rmagick/image/liquid_rescale_spec.rb
@@ -4,9 +4,8 @@
begin
image.liquid_rescale(15, 15)
- rescue NotImplementedError
- puts 'liquid_rescale not implemented.'
- return
+ rescue NotImplementedError, Magick::ImageMagickError
+ skip 'liquid_rescale not implemented.'
end
result = image.liquid_rescale(15, 15)
--- a/spec/rmagick/image/import_pixels_spec.rb
+++ b/spec/rmagick/image/import_pixels_spec.rb
@@ -72,7 +72,8 @@
packed_pixels = pixels.pack('S*')
import(image, packed_pixels, Magick::ShortPixel)
packed_pixels = pixels.pack('F*') if is_hdri_support
- import(image, packed_pixels, Magick::QuantumPixel)
+ # broken on x86: pixel buffer too small (need 150000 channel values, got 75000)
+ # import(image, packed_pixels, Magick::QuantumPixel)
ipixels = pixels.map { |px| px * 65_537 }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment