[133942] trunk/dports/graphics/cairo-devel

[ryandesign at macports.org]

Revision: 133942
          https://trac.macports.org/changeset/133942
Author:   ryandesign at macports.org
Date:     2015-03-15 17:23:26 -0700 (Sun, 15 Mar 2015)
Log Message:
-----------
cairo-devel: update to 1.14.2

Modified Paths:
--------------
    trunk/dports/graphics/cairo-devel/Portfile
    trunk/dports/graphics/cairo-devel/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2015-03-16 00:17:12 UTC (rev 133941)
+++ trunk/dports/graphics/cairo-devel/Portfile	2015-03-16 00:23:26 UTC (rev 133942)
@@ -11,7 +11,7 @@
 name                        cairo-devel
 conflicts                   cairo
 set my_name                 cairo
-version                     1.14.0
+version                     1.14.2
 categories                  graphics
 maintainers                 ryandesign
 license                     {LGPL-2.1 MPL-1.1}
@@ -31,8 +31,8 @@
                             advantage of display hardware acceleration when \
                             available (e.g. through the X Render Extension).
 
-checksums                   rmd160  87213a12c9789ff78dfbffbe4555aa28811c12c5 \
-                            sha256  2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
+checksums                   rmd160  36cb30e1db06135bd291acc8a1f0a1f2d95ecb14 \
+                            sha256  c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
 
 depends_build               port:pkgconfig
 
@@ -49,9 +49,6 @@
 # Prevent cairo from using librsvg, libspectre, poppler.
 patchfiles-append           patch-configure.diff
 
-# Fix crash.
-patchfiles-append           patch-src-cairo-tor-scan-converter.c.diff
-
 # https://trac.macports.org/ticket/34137
 compiler.blacklist-append   {clang < 318.0.61}
 

Modified: trunk/dports/graphics/cairo-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-configure.diff	2015-03-16 00:17:12 UTC (rev 133941)
+++ trunk/dports/graphics/cairo-devel/files/patch-configure.diff	2015-03-16 00:23:26 UTC (rev 133942)
@@ -1,6 +1,6 @@
---- configure.orig	2014-10-13 20:47:29.000000000 -0500
-+++ configure	2014-10-14 19:35:14.000000000 -0500
-@@ -30634,7 +30634,7 @@
+--- configure.orig	2015-03-10 20:43:14.000000000 -0500
++++ configure	2015-03-15 19:19:36.000000000 -0500
+@@ -30801,7 +30801,7 @@
  
  
  
@@ -9,7 +9,7 @@
  test_ps=no
  any2ppm_ps=no
  if test "x$use_ps" = "xyes"; then
-@@ -31031,7 +31031,7 @@
+@@ -31198,7 +31198,7 @@
  
  
  # poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
  test_pdf=no
  any2ppm_pdf=no
  if test "x$use_pdf" = "xyes"; then
-@@ -31401,7 +31401,7 @@
+@@ -31568,7 +31568,7 @@
  
  
  

Deleted: trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff
===================================================================
--- trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff	2015-03-16 00:17:12 UTC (rev 133941)
+++ trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff	2015-03-16 00:23:26 UTC (rev 133942)
@@ -1,15 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=85372
-http://cgit.freedesktop.org/cairo/commit/?id=2de69581c28bf115852037ca41eba13cb7335976
---- src/cairo-tor-scan-converter.c.orig
-+++ src/cairo-tor-scan-converter.c
-@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
- 
- 	if (e->dy) {
- 	    struct quorem x = e->x;
--	    x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
--	    x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
-+	    x.quo += e->dxdy_full.quo;
-+	    x.rem += e->dxdy_full.rem;
- 	    if (x.rem < 0) {
- 		x.quo--;
- 		x.rem += e->dy;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150315/3f5ef9e9/attachment.html>