commit 6baf007bc369201d33f7db1fca4655b0bd7c4909 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Tue Mar 24 10:44:51 2020 +0100
- up to 4.1.0, finally with support for ImageMagick 7 disable-tests.patch | 564 ---------------------------------------------------- magick6.patch | 116 ----------- ruby-RMagick.spec | 53 ++--- 3 files changed, 22 insertions(+), 711 deletions(-) --- diff --git a/ruby-RMagick.spec b/ruby-RMagick.spec index a6c5d1e..c0ef0a8 100644 --- a/ruby-RMagick.spec +++ b/ruby-RMagick.spec @@ -7,18 +7,16 @@ Summary: Graphics Processing library for Ruby Summary(pl.UTF-8): Biblioteka przetwarzania grafiki dla języka Ruby Name: ruby-%{pkgname} -Version: 2.16.0 -Release: 7 +Version: 4.1.0 +Release: 1 License: Ruby-alike Group: Development/Languages Source0: http://rubygems.org/downloads/rmagick-%{version}.gem -# Source0-md5: d03bb84d342b0a78f9c6262acb451dc8 +# Source0-md5: e22024f2c78088f101ff0acade179043 Patch0: no-gem.patch -Patch1: disable-tests.patch -Patch2: no-git.patch -Patch3: magick6.patch +Patch1: no-git.patch URL: https://github.com/gemhome/rmagick -BuildRequires: ImageMagick6-devel >= 1:6.7.0.7-2 +BuildRequires: ImageMagick-devel >= 1:7.0.0 BuildRequires: ruby-test-unit BuildRequires: gmp-devel BuildRequires: rpm-rubyprov @@ -33,26 +31,26 @@ BuildRequires: ruby-rspec-core BuildRequires: ruby-rspec-expectations BuildRequires: ruby-rspec-mocks %if %{with tests} -BuildRequires: ImageMagick6-coder-dot -BuildRequires: ImageMagick6-coder-fpx -BuildRequires: ImageMagick6-coder-jbig -BuildRequires: ImageMagick6-coder-jpeg -BuildRequires: ImageMagick6-coder-jpeg2 -BuildRequires: ImageMagick6-coder-miff -BuildRequires: ImageMagick6-coder-mpr -BuildRequires: ImageMagick6-coder-pdf -BuildRequires: ImageMagick6-coder-png -BuildRequires: ImageMagick6-coder-ps2 -BuildRequires: ImageMagick6-coder-svg -BuildRequires: ImageMagick6-coder-tiff -BuildRequires: ImageMagick6-coder-url -BuildRequires: ImageMagick6-coder-wmf +BuildRequires: ImageMagick-coder-dot +BuildRequires: ImageMagick-coder-fpx +BuildRequires: ImageMagick-coder-jbig +BuildRequires: ImageMagick-coder-jpeg +BuildRequires: ImageMagick-coder-jpeg2 +BuildRequires: ImageMagick-coder-miff +BuildRequires: ImageMagick-coder-mpr +BuildRequires: ImageMagick-coder-pdf +BuildRequires: ImageMagick-coder-png +BuildRequires: ImageMagick-coder-ps2 +BuildRequires: ImageMagick-coder-svg +BuildRequires: ImageMagick-coder-tiff +BuildRequires: ImageMagick-coder-url +BuildRequires: ImageMagick-coder-wmf %endif %if %{with doc} BuildRequires: ruby-rdoc %endif BuildConflicts: ruby-RMagick < 1.7.2 -%requires_ge_to ImageMagick6-libs ImageMagick6-devel +%requires_ge_to ImageMagick-libs ImageMagick-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -100,10 +98,6 @@ Dokumentacja w formacie ri dla modułu języka Ruby %{pkgname}. %setup -q -n %{pkgname}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 - -%{__rm} spec/rmagick/draw_spec.rb %build # write .gemspec @@ -133,7 +127,7 @@ rdoc --op rdoc ext/RMagick lib %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_vendorarchdir},%{ruby_ridir},%{ruby_specdir},%{ruby_rdocdir}/%{name}-%{version},%{_examplesdir}/%{name}-%{version}} +install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_vendorarchdir},%{ruby_ridir},%{ruby_specdir},%{ruby_rdocdir}/%{name}-%{version}} cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir} %{__rm} $RPM_BUILD_ROOT%{ruby_vendorlibdir}/RMagick2.so @@ -146,8 +140,6 @@ cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir} cp -a rdoc/* $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version} %endif -cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} - # install gemspec cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir} @@ -156,13 +148,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc doc CHANGELOG.md LICENSE README.textile +%doc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md %{ruby_vendorlibdir}/rmagick %{ruby_vendorlibdir}/rmagick*.rb %{ruby_vendorlibdir}/rvg %attr(755,root,root) %{ruby_vendorarchdir}/RMagick2.so %{ruby_specdir}/%{pkgname}-%{version}.gemspec -%{_examplesdir}/%{name}-%{version} %if %{with doc} %files rdoc diff --git a/disable-tests.patch b/disable-tests.patch deleted file mode 100644 index a307600..0000000 --- a/disable-tests.patch +++ /dev/null @@ -1,564 +0,0 @@ -diff -ur RMagick-2.15.4.orig/test/Image2.rb RMagick-2.15.4/test/Image2.rb ---- RMagick-2.15.4.orig/test/Image2.rb 2015-12-31 10:40:49.152841217 +0100 -+++ RMagick-2.15.4/test/Image2.rb 2015-12-31 10:44:40.382987912 +0100 -@@ -72,15 +72,15 @@ - assert_raise(Magick::DestroyedImageError) { bg.composite_tiled(fg) } - end - -- def test_compress_colormap! -- # DirectClass images are converted to PseudoClass -- assert_equal(Magick::DirectClass, @img.class_type) -- assert_nothing_raised { @img.compress_colormap! } -- assert_equal(Magick::PseudoClass, @img.class_type) -- img = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first -- assert_equal(Magick::PseudoClass, @img.class_type) -- assert_nothing_raised { @img.compress_colormap! } -- end -+# def test_compress_colormap! -+# # DirectClass images are converted to PseudoClass -+# assert_equal(Magick::DirectClass, @img.class_type) -+# assert_nothing_raised { @img.compress_colormap! } -+# assert_equal(Magick::PseudoClass, @img.class_type) -+# img = Magick::Image.read(IMAGES_DIR+'/Button_0.gif').first -+# assert_equal(Magick::PseudoClass, @img.class_type) -+# assert_nothing_raised { @img.compress_colormap! } -+# end - - def test_contrast - assert_nothing_raised do -@@ -821,12 +821,12 @@ - assert_raise(RangeError) { @img.get_pixels(0, 0, @img.columns, @img.rows+1) } - end - -- def test_gray? -- gray = Magick::Image.new(20, 20) { self.background_color = 'gray50' } -- assert(gray.gray?) -- red = Magick::Image.new(20, 20) { self.background_color = 'red' } -- assert(!red.gray?) -- end -+# def test_gray? -+# gray = Magick::Image.new(20, 20) { self.background_color = 'gray50' } -+# assert(gray.gray?) -+# red = Magick::Image.new(20, 20) { self.background_color = 'red' } -+# assert(!red.gray?) -+# end - - def test_histogram? - assert_nothing_raised { @img.histogram? } -diff -ur RMagick-2.15.4.orig/test/Image_attributes.rb RMagick-2.15.4/test/Image_attributes.rb ---- RMagick-2.15.4.orig/test/Image_attributes.rb 2015-12-31 10:40:49.152841217 +0100 -+++ RMagick-2.15.4/test/Image_attributes.rb 2015-12-31 10:47:26.736842643 +0100 -@@ -32,17 +32,17 @@ - assert(!@img.alpha) - end - -- def test_background_color -- assert_nothing_raised { @img.background_color } -- assert_equal('white', @img.background_color) -- assert_nothing_raised { @img.background_color = '#dfdfdf' } -- #assert_equal("rgb(223,223,223)", @img.background_color) -- assert_equal('#DFDFDFDFDFDF', @img.background_color) -- assert_nothing_raised { @img.background_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2.0, Magick::QuantumRange/2.0) } -- #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.background_color) -- assert_equal('#FFFF7FFF7FFF', @img.background_color) -- assert_raise(TypeError) { @img.background_color = 2 } -- end -+# def test_background_color -+# assert_nothing_raised { @img.background_color } -+# assert_equal('white', @img.background_color) -+# assert_nothing_raised { @img.background_color = '#dfdfdf' } -+# #assert_equal("rgb(223,223,223)", @img.background_color) -+# assert_equal('#DFDFDFDFDFDF', @img.background_color) -+# assert_nothing_raised { @img.background_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2.0, Magick::QuantumRange/2.0) } -+# #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.background_color) -+# assert_equal('#FFFF7FFF7FFF', @img.background_color) -+# assert_raise(TypeError) { @img.background_color = 2 } -+# end - - def test_base_columns - assert_nothing_raised { @img.base_columns } -@@ -91,17 +91,17 @@ - assert_raise(TypeError) { @img.blur = 'x' } - end - -- def test_border_color -- assert_nothing_raised { @img.border_color } -- #assert_equal("rgb(223,223,223)", @img.border_color) -- assert_equal('#DFDFDFDFDFDF', @img.border_color) -- assert_nothing_raised { @img.border_color = 'red' } -- assert_equal('red', @img.border_color) -- assert_nothing_raised { @img.border_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2, Magick::QuantumRange/2) } -- #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.border_color) -- assert_equal('#FFFF7FFF7FFF', @img.border_color) -- assert_raise(TypeError) { @img.border_color = 2 } -- end -+# def test_border_color -+# assert_nothing_raised { @img.border_color } -+# #assert_equal("rgb(223,223,223)", @img.border_color) -+# assert_equal('#DFDFDFDFDFDF', @img.border_color) -+# assert_nothing_raised { @img.border_color = 'red' } -+# assert_equal('red', @img.border_color) -+# assert_nothing_raised { @img.border_color = Magick::Pixel.new(Magick::QuantumRange, Magick::QuantumRange/2, Magick::QuantumRange/2) } -+# #assert_equal("rgb(100%,49.9992%,49.9992%)", @img.border_color) -+# assert_equal('#FFFF7FFF7FFF', @img.border_color) -+# assert_raise(TypeError) { @img.border_color = 2 } -+# end - - def test_bounding_box - assert_nothing_raised { @img.bounding_box } -@@ -408,11 +408,11 @@ - assert_raise(TypeError) { @img.geometry = [] } - end - -- def test_image_type -- assert_nothing_raised { @img.image_type } -- assert_instance_of(Magick::ImageType, @img.image_type) -- assert_equal(Magick::GrayscaleMatteType, @img.image_type) -- end -+# def test_image_type -+# assert_nothing_raised { @img.image_type } -+# assert_instance_of(Magick::ImageType, @img.image_type) -+# assert_equal(Magick::GrayscaleMatteType, @img.image_type) -+# end - - def test_interlace_type - assert_nothing_raised { @img.interlace } -@@ -479,11 +479,11 @@ - assert_nil(@img.montage) - end - -- def test_number_colors -- assert_nothing_raised { @hat.number_colors } -- assert_equal(27942, @hat.number_colors) -- assert_raise(NoMethodError) { @hat.number_colors = 2 } -- end -+# def test_number_colors -+# assert_nothing_raised { @hat.number_colors } -+# assert_equal(27942, @hat.number_colors) -+# assert_raise(NoMethodError) { @hat.number_colors = 2 } -+# end - - def test_offset - assert_nothing_raised { @img.offset } -@@ -587,11 +587,11 @@ - assert_raise(TypeError) { @img.ticks_per_second = 'x' } - end - -- def test_total_colors -- assert_nothing_raised { @hat.total_colors } -- assert_equal(27942, @hat.total_colors) -- assert_raise(NoMethodError) { @img.total_colors = 2 } -- end -+# def test_total_colors -+# assert_nothing_raised { @hat.total_colors } -+# assert_equal(27942, @hat.total_colors) -+# assert_raise(NoMethodError) { @img.total_colors = 2 } -+# end - - def test_units - assert_nothing_raised { @img.units } -diff -ur RMagick-2.15.4.orig/test/ImageList1.rb RMagick-2.15.4/test/ImageList1.rb ---- RMagick-2.15.4.orig/test/ImageList1.rb 2015-12-31 10:40:49.146174558 +0100 -+++ RMagick-2.15.4/test/ImageList1.rb 2015-12-31 10:45:54.526518773 +0100 -@@ -367,24 +367,24 @@ - assert_same(@list[-1], @list.cur_image) - end - -- def test_delete_if -- @list.scene = 7 -- cur = @list.cur_image -- assert_nothing_raised do -- @list.delete_if { |img| img.filename =~ /5/ } -- assert_instance_of(Magick::ImageList, @list) -- assert_equal(9, @list.length) -- assert_same(cur, @list.cur_image) -- end -- -- # Delete the current image -- assert_nothing_raised do -- @list.delete_if { |img| img.filename =~ /7/ } -- assert_instance_of(Magick::ImageList, @list) -- assert_equal(8, @list.length) -- assert_same(@list[-1], @list.cur_image) -- end -- end -+# def test_delete_if -+# @list.scene = 7 -+# cur = @list.cur_image -+# assert_nothing_raised do -+# @list.delete_if { |img| img.filename =~ /5/ } -+# assert_instance_of(Magick::ImageList, @list) -+# assert_equal(9, @list.length) -+# assert_same(cur, @list.cur_image) -+# end -+# -+# # Delete the current image -+# assert_nothing_raised do -+# @list.delete_if { |img| img.filename =~ /7/ } -+# assert_instance_of(Magick::ImageList, @list) -+# assert_equal(8, @list.length) -+# assert_same(@list[-1], @list.cur_image) -+# end -+# end - - # defined by Enumerable - def test_enumerables -@@ -563,27 +563,27 @@ - assert_same(cur, @list.cur_image) - end - -- def test_reject! -- @list.scene = 7 -- cur = @list.cur_image -- assert_nothing_raised do -- @list.reject! { |img| img.filename =~ /5/ } -- assert_instance_of(Magick::ImageList, @list) -- assert_equal(9, @list.length) -- assert_same(cur, @list.cur_image) -- end -- -- # Delete the current image -- assert_nothing_raised do -- @list.reject! { |img| img.filename =~ /7/ } -- assert_instance_of(Magick::ImageList, @list) -- assert_equal(8, @list.length) -- assert_same(@list[-1], @list.cur_image) -- end -- -- # returns nil if no changes are made -- assert_nil(@list.reject! { false }) -- end -+# def test_reject! -+# @list.scene = 7 -+# cur = @list.cur_image -+# assert_nothing_raised do -+# @list.reject! { |img| img.filename =~ /5/ } -+# assert_instance_of(Magick::ImageList, @list) -+# assert_equal(9, @list.length) -+# assert_same(cur, @list.cur_image) -+# end -+# -+# # Delete the current image -+# assert_nothing_raised do -+# @list.reject! { |img| img.filename =~ /7/ } -+# assert_instance_of(Magick::ImageList, @list) -+# assert_equal(8, @list.length) -+# assert_same(@list[-1], @list.cur_image) -+# end -+# -+# # returns nil if no changes are made -+# assert_nil(@list.reject! { false }) -+# end - - def test_replace1 - # Replace with empty list -diff -ur RMagick-2.15.4.orig/test/ImageList2.rb RMagick-2.15.4/test/ImageList2.rb ---- RMagick-2.15.4.orig/test/ImageList2.rb 2015-12-31 10:40:49.146174558 +0100 -+++ RMagick-2.15.4/test/ImageList2.rb 2015-12-31 10:46:38.366662755 +0100 -@@ -145,80 +145,80 @@ - assert_equal(ilist1, ilist2) - end - -- def test_montage -- @ilist.read(*Dir[IMAGES_DIR+'/Button_*.gif']) -- ilist = @ilist.copy -- montage = nil -- assert_nothing_thrown do -- montage = ilist.montage do -- self.background_color = 'black' -- self.background_color = Magick::Pixel.new(Magick::QuantumRange, 0, 0) -- self.border_color = 'red' -- self.border_color = Magick::Pixel.new(0, 0, 0) -- self.border_width = 2 -- self.compose = Magick::OverCompositeOp -- self.fill = 'green' -- self.font = 'Arial' -- self.frame = '20x20+4+4' -- self.frame = Magick::Geometry.new(20, 20, 4, 4) -- self.geometry = '63x60+5+5' -- self.geometry = Magick::Geometry.new(63, 60, 5, 5) -- self.gravity = Magick::SouthGravity -- self.matte_color = '#bdbdbd' -- self.pointsize = 12 -- self.shadow = true -- self.stroke = 'transparent' -- self.tile = '4x9' -- self.tile = Magick::Geometry.new(4, 9) -- end -- assert_instance_of(Magick::ImageList, montage) -- assert_equal(@ilist, ilist) -- end -- -- # test illegal option arguments -- # looks like IM doesn't diagnose invalid geometry args -- # to tile= and geometry= -- assert_raise(TypeError) do -- montage = ilist.montage { self.background_color = 2 } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.border_color = 2 } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.border_width = [2] } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.compose = 2 } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.fill = 2 } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.font = 2 } -- assert_equal(@ilist, ilist) -- end -- assert_raise(Magick::ImageMagickError) do -- montage = ilist.montage { self.frame = 'z' } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.matte_color = 2 } -- assert_equal(@ilist, ilist) -- end -- assert_raise(TypeError) do -- montage = ilist.montage { self.pointsize = 'x' } -- assert_equal(@ilist, ilist) -- end -- assert_raise(ArgumentError) do -- montage = ilist.montage { self.stroke = 'x' } -- assert_equal(@ilist, ilist) -- end -- end -+# def test_montage -+# @ilist.read(*Dir[IMAGES_DIR+'/Button_*.gif']) -+# ilist = @ilist.copy -+# montage = nil -+# assert_nothing_thrown do -+# montage = ilist.montage do -+# self.background_color = 'black' -+# self.background_color = Magick::Pixel.new(Magick::QuantumRange, 0, 0) -+# self.border_color = 'red' -+# self.border_color = Magick::Pixel.new(0, 0, 0) -+# self.border_width = 2 -+# self.compose = Magick::OverCompositeOp -+# self.fill = 'green' -+# self.font = 'Arial' -+# self.frame = '20x20+4+4' -+# self.frame = Magick::Geometry.new(20, 20, 4, 4) -+# self.geometry = '63x60+5+5' -+# self.geometry = Magick::Geometry.new(63, 60, 5, 5) -+# self.gravity = Magick::SouthGravity -+# self.matte_color = '#bdbdbd' -+# self.pointsize = 12 -+# self.shadow = true -+# self.stroke = 'transparent' -+# self.tile = '4x9' -+# self.tile = Magick::Geometry.new(4, 9) -+# end -+# assert_instance_of(Magick::ImageList, montage) -+# assert_equal(@ilist, ilist) -+# end -+# -+# # test illegal option arguments -+# # looks like IM doesn't diagnose invalid geometry args -+# # to tile= and geometry= -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.background_color = 2 } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.border_color = 2 } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.border_width = [2] } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.compose = 2 } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.fill = 2 } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.font = 2 } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(Magick::ImageMagickError) do -+# montage = ilist.montage { self.frame = 'z' } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.matte_color = 2 } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(TypeError) do -+# montage = ilist.montage { self.pointsize = 'x' } -+# assert_equal(@ilist, ilist) -+# end -+# assert_raise(ArgumentError) do -+# montage = ilist.montage { self.stroke = 'x' } -+# assert_equal(@ilist, ilist) -+# end -+# end - - def test_morph - # can't morph an empty list -@@ -256,30 +256,30 @@ - assert_equal(2, @ilist.scene) - end - -- def test_optimize_layers -- layer_methods = [ -- Magick::CompareAnyLayer, -- Magick::CompareClearLayer, -- Magick::CompareOverlayLayer, -- Magick::OptimizeLayer, -- Magick::OptimizePlusLayer, -- Magick::CoalesceLayer, -- Magick::DisposeLayer, -- Magick::OptimizeTransLayer, -- Magick::RemoveDupsLayer, -- Magick::RemoveZeroLayer -- ] -- @ilist.read(IMAGES_DIR+'/Button_0.gif', IMAGES_DIR+'/Button_1.gif') -- layer_methods.each do |method| -- assert_nothing_raised do -- res = @ilist.optimize_layers(method) -- assert_instance_of(Magick::ImageList, res) -- assert_equal(2, res.length) -- end -- end -- assert_raise(ArgumentError) {@ilist.optimize_layers(Magick::UndefinedLayer)} -- assert_raise(TypeError) {@ilist.optimize_layers(2)} -- end -+# def test_optimize_layers -+# layer_methods = [ -+# Magick::CompareAnyLayer, -+# Magick::CompareClearLayer, -+# Magick::CompareOverlayLayer, -+# Magick::OptimizeLayer, -+# Magick::OptimizePlusLayer, -+# Magick::CoalesceLayer, -+# Magick::DisposeLayer, -+# Magick::OptimizeTransLayer, -+# Magick::RemoveDupsLayer, -+# Magick::RemoveZeroLayer -+# ] -+# @ilist.read(IMAGES_DIR+'/Button_0.gif', IMAGES_DIR+'/Button_1.gif') -+# layer_methods.each do |method| -+# assert_nothing_raised do -+# res = @ilist.optimize_layers(method) -+# assert_instance_of(Magick::ImageList, res) -+# assert_equal(2, res.length) -+# end -+# end -+# assert_raise(ArgumentError) {@ilist.optimize_layers(Magick::UndefinedLayer)} -+# assert_raise(TypeError) {@ilist.optimize_layers(2)} -+# end - - def test_ping - assert_nothing_raised { @ilist.ping(FLOWER_HAT) } ---- RMagick-2.15.4/test/Preview.rb~ 2015-12-31 11:53:56.000000000 +0100 -+++ RMagick-2.15.4/test/Preview.rb 2015-12-31 11:59:28.451396565 +0100 -@@ -5,50 +5,50 @@ - require 'test/unit/ui/console/testrunner' unless RUBY_VERSION[/^1\.9|^2/] - - class Preview_UT < Test::Unit::TestCase -- def test_preview -- preview_types = [ -- Magick::RotatePreview, -- Magick::ShearPreview, -- Magick::RollPreview, -- Magick::HuePreview, -- Magick::SaturationPreview, -- Magick::BrightnessPreview, -- Magick::GammaPreview, -- Magick::SpiffPreview, -- Magick::DullPreview, -- Magick::GrayscalePreview, -- Magick::QuantizePreview, -- Magick::DespecklePreview, -- Magick::ReduceNoisePreview, -- Magick::AddNoisePreview, -- Magick::SharpenPreview, -- Magick::BlurPreview, -- Magick::ThresholdPreview, -- Magick::EdgeDetectPreview, -- Magick::SpreadPreview, -- Magick::SolarizePreview, -- Magick::ShadePreview, -- Magick::RaisePreview, -- Magick::SegmentPreview, -- Magick::SwirlPreview, -- Magick::ImplodePreview, -- Magick::WavePreview, -- Magick::OilPaintPreview, -- Magick::CharcoalDrawingPreview, -- Magick::JPEGPreview ] -- -- hat = Magick::Image.read(IMAGES_DIR+'/Flower_Hat.jpg').first -- assert_nothing_raised do -- prev = hat.preview(Magick::RotatePreview) -- assert_instance_of(Magick::Image, prev) -- end -- puts "\n" -- preview_types.each do |type| -- puts "testing #{type}..." -- assert_nothing_raised { hat.preview(type) } -- end -- assert_raise(TypeError) { hat.preview(2) } -- end -+# def test_preview -+# preview_types = [ -+# Magick::RotatePreview, -+# Magick::ShearPreview, -+# Magick::RollPreview, -+# Magick::HuePreview, -+# Magick::SaturationPreview, -+# Magick::BrightnessPreview, -+# Magick::GammaPreview, -+# Magick::SpiffPreview, -+# Magick::DullPreview, -+# Magick::GrayscalePreview, -+# Magick::QuantizePreview, -+# Magick::DespecklePreview, -+# Magick::ReduceNoisePreview, -+# Magick::AddNoisePreview, -+# Magick::SharpenPreview, -+# Magick::BlurPreview, -+# Magick::ThresholdPreview, -+# Magick::EdgeDetectPreview, -+# Magick::SpreadPreview, -+# Magick::SolarizePreview, -+# Magick::ShadePreview, -+# Magick::RaisePreview, -+# Magick::SegmentPreview, -+# Magick::SwirlPreview, -+# Magick::ImplodePreview, -+# Magick::WavePreview, -+# Magick::OilPaintPreview, -+# Magick::CharcoalDrawingPreview, -+# Magick::JPEGPreview ] -+# -+# hat = Magick::Image.read(IMAGES_DIR+'/Flower_Hat.jpg').first -+# assert_nothing_raised do -+# prev = hat.preview(Magick::RotatePreview) -+# assert_instance_of(Magick::Image, prev) -+# end -+# puts "\n" -+# preview_types.each do |type| -+# puts "testing #{type}..." -+# assert_nothing_raised { hat.preview(type) } -+# end -+# assert_raise(TypeError) { hat.preview(2) } -+# end - end - - if __FILE__ == $PROGRAM_NAME diff --git a/magick6.patch b/magick6.patch deleted file mode 100644 index 74107b9..0000000 --- a/magick6.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- RMagick-2.16.0/ext/RMagick/extconf.rb.orig 2016-12-27 08:19:30.000000000 +0100 -+++ RMagick-2.16.0/ext/RMagick/extconf.rb 2016-12-27 09:02:57.930941759 +0100 -@@ -63,12 +63,12 @@ - $pkg_config = false - - # Check for Magick-config -- if find_executable('Magick-config') && !has_graphicsmagick_libmagick_dev_compat? -+ if find_executable('Magick6-config') && !has_graphicsmagick_libmagick_dev_compat? - $magick_config = true -- $magick_version = `Magick-config --version`[/^(\d+\.\d+\.\d+)/] -+ $magick_version = `Magick6-config --version`[/^(\d+\.\d+\.\d+)/] - elsif find_executable('pkg-config') - $pkg_config = true -- $magick_version = `pkg-config MagickCore --modversion`[/^(\d+\.\d+\.\d+)/] -+ $magick_version = `pkg-config MagickCore6 --modversion`[/^(\d+\.\d+\.\d+)/] - else - exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config or pkg-config in #{ENV['PATH']}\n" - end -@@ -101,34 +101,34 @@ - if $with_magick_wand - if $magick_config - # Save flags -- $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `MagickWand-config --cflags`.chomp -- $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `MagickWand-config --cppflags`.chomp -- $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `MagickWand-config --ldflags`.chomp -- $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `MagickWand-config --libs`.chomp -+ $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `MagickWand6-config --cflags`.chomp -+ $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `MagickWand6-config --cppflags`.chomp -+ $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `MagickWand6-config --ldflags`.chomp -+ $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `MagickWand6-config --libs`.chomp - end - - if $pkg_config - # Save flags -- $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp -- $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand`.chomp -- $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickWand`.chomp -- $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickWand`.chomp -+ $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand6`.chomp -+ $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickWand6`.chomp -+ $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickWand6`.chomp -+ $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickWand6`.chomp - end - else - if $magick_config - # Save flags -- $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `Magick-config --cflags`.chomp -- $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `Magick-config --cppflags`.chomp -- $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `Magick-config --ldflags`.chomp -- $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `Magick-config --libs`.chomp -+ $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `Magick6-config --cflags`.chomp -+ $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `Magick6-config --cppflags`.chomp -+ $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `Magick6-config --ldflags`.chomp -+ $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `Magick6-config --libs`.chomp - end - - if $pkg_config - # Save flags -- $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp -- $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore`.chomp -- $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickCore`.chomp -- $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickCore`.chomp -+ $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore6`.chomp -+ $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags MagickCore6`.chomp -+ $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs MagickCore6`.chomp -+ $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs MagickCore6`.chomp - end - end - -@@ -186,7 +186,7 @@ - end - - def has_graphicsmagick_libmagick_dev_compat? -- config_path = `which Magick-config`.chomp -+ config_path = `which Magick6-config`.chomp - if File.exist?(config_path) && - File.symlink?(config_path) && - File.readlink(config_path) =~ /GraphicsMagick/ -@@ -210,7 +210,7 @@ - versions = [] - path = ENV['PATH'].split(File::PATH_SEPARATOR) - path.each do |dir| -- file = File.join(dir, 'Magick-config') -+ file = File.join(dir, 'Magick6-config') - if File.executable? file - vers = `#{file} --version`.chomp.strip - prefix = `#{file} --prefix`.chomp.strip -@@ -221,7 +221,7 @@ - if versions.size > 1 - msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n" - versions.each do |vers, prefix, dir| -- msg << " #{dir}/Magick-config reports version #{vers} is installed in #{prefix}\n" -+ msg << " #{dir}/Magick6-config reports version #{vers} is installed in #{prefix}\n" - end - msg << "Using #{versions[0][0]} from #{versions[0][1]}.\n\n" - Logging.message msg -@@ -238,7 +238,7 @@ - matches = [ - prefix+'/lib/lib?agick*', - prefix+'/include/ImageMagick', -- prefix+'/bin/Magick-config', -+ prefix+'/bin/Magick6-config', - ].map do |file_glob| - Dir.glob(file_glob) - end -@@ -335,8 +335,8 @@ - if RUBY_PLATFORM !~ /mswin|mingw/ - - # check for pkg-config if Magick-config doesn't exist -- if $magick_config && `Magick-config --libs`[/\bl\s*(MagickCore|Magick)6?\b/] -- elsif $pkg_config && `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/] -+ if $magick_config && `Magick6-config --libs`[/\bl\s*(MagickCore|Magick)6?\b/] -+ elsif $pkg_config && `pkg-config --libs MagickCore6`[/\bl\s*(MagickCore|Magick)6?\b/] - else - exit_failure "Can't install RMagick #{RMAGICK_VERS}. " \ - "Can't find the ImageMagick library or one of the dependent libraries. " \ ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-RMagick.git/commitdiff/6baf007bc369201d33f7db1fca4655b0bd7c4909 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit