From b81267aa6f25dba9ae05862c513a53258e2ef9a4 Mon Sep 17 00:00:00 2001 From: taca Date: Sat, 28 May 2005 03:01:20 +0000 Subject: Update ruby-RMagick package to 1.8.1. o Fix bugs #1876, #1888, #1919 o Added feature #1941, RVG's polyline, polygon accept array arguments o Numerous fixes to the RVG documentation Fixes PR pkg/30313 provided by Akio Obata. --- graphics/ruby-RMagick/Makefile | 6 ++-- graphics/ruby-RMagick/distinfo | 12 +++---- graphics/ruby-RMagick/patches/patch-aa | 13 ------- graphics/ruby-RMagick/patches/patch-ab | 15 -------- graphics/ruby-RMagick/patches/patch-ac | 66 ---------------------------------- graphics/ruby-RMagick/patches/patch-ad | 15 -------- 6 files changed, 7 insertions(+), 120 deletions(-) delete mode 100644 graphics/ruby-RMagick/patches/patch-aa delete mode 100644 graphics/ruby-RMagick/patches/patch-ab delete mode 100644 graphics/ruby-RMagick/patches/patch-ac delete mode 100644 graphics/ruby-RMagick/patches/patch-ad (limited to 'graphics') diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile index 30f732aebf3..f612bdde009 100644 --- a/graphics/ruby-RMagick/Makefile +++ b/graphics/ruby-RMagick/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2005/05/11 15:57:32 taca Exp $ +# $NetBSD: Makefile,v 1.4 2005/05/28 03:01:20 taca Exp $ -DISTNAME= RMagick-1.8.0 +DISTNAME= RMagick-1.8.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= graphics ruby -MASTER_SITES= http://rubyforge.org/frs/download.php/4265/ +MASTER_SITES= http://rubyforge.org/frs/download.php/4527/ MAINTAINER= obata@lins.jp HOMEPAGE= http://rmagick.rubyforge.org/ diff --git a/graphics/ruby-RMagick/distinfo b/graphics/ruby-RMagick/distinfo index be4bb4ef8af..c0c40e69496 100644 --- a/graphics/ruby-RMagick/distinfo +++ b/graphics/ruby-RMagick/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.2 2005/05/11 15:57:32 taca Exp $ +$NetBSD: distinfo,v 1.3 2005/05/28 03:01:20 taca Exp $ -SHA1 (ruby/RMagick-1.8.0.tar.gz) = a6526dbf2ec6ba5b31b7629c75e7b06171ed30d5 -RMD160 (ruby/RMagick-1.8.0.tar.gz) = a4fd8b3d41607ca3d55b20bc64dff9f07b662bca -Size (ruby/RMagick-1.8.0.tar.gz) = 971790 bytes -SHA1 (patch-aa) = 3b3544191a7b1d7bd60bc4cb4f37eb48c854b2d5 -SHA1 (patch-ab) = dfb6e10a6a03270cb80f12ed66222445987b137c -SHA1 (patch-ac) = 3ca1cdec38fa4232a25bc571eec74cc0d422b505 -SHA1 (patch-ad) = 00356b1afde545a177174c7e008627c6d2984d80 +SHA1 (ruby/RMagick-1.8.1.tar.gz) = 865d6bd05ba724525fbb6a91d1565061bb1f01d6 +RMD160 (ruby/RMagick-1.8.1.tar.gz) = 71978b0239ba798d0e3c68e0260017de68f1f216 +Size (ruby/RMagick-1.8.1.tar.gz) = 976456 bytes diff --git a/graphics/ruby-RMagick/patches/patch-aa b/graphics/ruby-RMagick/patches/patch-aa deleted file mode 100644 index 6f38e1940e4..00000000000 --- a/graphics/ruby-RMagick/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2005/05/11 15:57:32 taca Exp $ - ---- ext/RMagick/extconf.rb.in.orig 2004-11-29 10:00:16.000000000 +0900 -+++ ext/RMagick/extconf.rb.in -@@ -6,7 +6,7 @@ require 'mkmf' - # Pass along Ruby's version number - VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','') - --$CFLAGS = "-std=gnu99 -Wall -g @CFLAGS@" -+$CFLAGS = "-Wall -g @CFLAGS@" - $CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@" - - if RUBY_VERSION >= '1.8.0' diff --git a/graphics/ruby-RMagick/patches/patch-ab b/graphics/ruby-RMagick/patches/patch-ab deleted file mode 100644 index 21535661c3d..00000000000 --- a/graphics/ruby-RMagick/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2005/05/11 15:57:32 taca Exp $ - ---- ext/RMagick/rmagick.h.orig 2005-04-29 08:41:54.000000000 +0900 -+++ ext/RMagick/rmagick.h -@@ -61,6 +61,10 @@ - #undef DegreesToRadians // defined in ImageMagick.h in 6.0.2 - #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0) - -+#define LMAX(a,b) ((((long)(a))>((long)(b)))?((long)(a)):((long)(b))) -+#define FMAX(a,b) ((((double)(a))>((double)(b)))?((double)(a)):((double)(b))) -+#define FMIN(a,b) ((((double)(a))<=((double)(b)))?((double)(a)):((double)(b))) -+ - typedef ImageInfo Info; // Make type name match class name - typedef PixelPacket Pixel; - diff --git a/graphics/ruby-RMagick/patches/patch-ac b/graphics/ruby-RMagick/patches/patch-ac deleted file mode 100644 index 1706d183f1a..00000000000 --- a/graphics/ruby-RMagick/patches/patch-ac +++ /dev/null @@ -1,66 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/05/11 15:57:32 taca Exp $ - ---- ext/RMagick/rmfill.c.orig 2005-03-06 01:18:39.000000000 +0900 -+++ ext/RMagick/rmfill.c -@@ -168,7 +168,7 @@ vertical_fill( - // Keep in mind that x1 could be < 0 or > image->columns. If steps - // is negative, swap the start and end colors and use the absolute - // value. -- steps = fmax(x1, ((long)image->columns)-x1); -+ steps = FMAX(x1, ((long)image->columns)-x1); - if (steps < 0) - { - PixelPacket t = *start_color; -@@ -240,7 +240,7 @@ horizontal_fill( - - // Bear in mind that y1 could be < 0 or > image->rows. If steps is - // negative, swap the start and end colors and use the absolute value. -- steps = fmax(y1, ((long)image->rows)-y1); -+ steps = FMAX(y1, ((long)image->rows)-y1); - if (steps < 0) - { - PixelPacket t = *start_color; -@@ -323,16 +323,16 @@ v_diagonal_fill( - - if (d1 < 0 && d2 < 0) - { -- steps += fmax(fabs(d1),fabs(d2)); -+ steps += FMAX(fabs(d1),fabs(d2)); - } - else if (d1 > image->rows && d2 > image->rows) - { -- steps += fmax(d1-image->rows, d2-image->rows); -+ steps += FMAX(d1-image->rows, d2-image->rows); - } - -- d1 = fmax(b, image->rows-b); -- d2 = fmax(d2, image->rows-d2); -- steps += fmax(d1, d2); -+ d1 = FMAX(b, image->rows-b); -+ d2 = FMAX(d2, image->rows-d2); -+ steps += FMAX(d1, d2); - - // If the line is entirely > image->rows, swap the start & end color - if (steps < 0) -@@ -404,16 +404,16 @@ h_diagonal_fill( - // the number of steps. - if (d1 < 0 && d2 < 0) - { -- steps += fmax(fabs(d1),fabs(d2)); -+ steps += FMAX(fabs(d1),fabs(d2)); - } - else if (d1 > image->columns && d2 > image->columns) - { -- steps += fmax(fabs(image->columns-d1),fabs(image->columns-d2)); -+ steps += FMAX(fabs(image->columns-d1),fabs(image->columns-d2)); - } - -- d1 = fmax(d1, image->columns-d1); -- d2 = fmax(d2, image->columns-d2); -- steps += fmax(d1, d2); -+ d1 = FMAX(d1, image->columns-d1); -+ d2 = FMAX(d2, image->columns-d2); -+ steps += FMAX(d1, d2); - - // If the line is entirely > image->columns, swap the start & end color - if (steps < 0) diff --git a/graphics/ruby-RMagick/patches/patch-ad b/graphics/ruby-RMagick/patches/patch-ad deleted file mode 100644 index a5502da8908..00000000000 --- a/graphics/ruby-RMagick/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/05/11 15:57:32 taca Exp $ - ---- ext/RMagick/rmimage.c.orig 2005-05-01 00:26:45.000000000 +0900 -+++ ext/RMagick/rmimage.c -@@ -6476,8 +6476,8 @@ Image_shadow(int argc, VALUE *argv, VALU - { - rb_warning("shadow will be transparent - opacity %g very small", opacity); - } -- opacity = fmin(opacity, 1.0); -- opacity = fmax(opacity, 0.01); -+ opacity = FMIN(opacity, 1.0); -+ opacity = FMAX(opacity, 0.01); - opacity *= 100.0; - case 3: - sigma = NUM2DBL(argv[2]); -- cgit v1.2.3