[134245] users/devans/GNOME-3/stable/dports/graphics/cairo

[devans at macports.org]

Revision: 134245
          https://trac.macports.org/changeset/134245
Author:   devans at macports.org
Date:     2015-03-20 08:03:35 -0700 (Fri, 20 Mar 2015)
Log Message:
-----------
GNOME-3/stable: cairo, update to version 1.14.2 for testing.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/graphics/cairo/


Property changes on: users/devans/GNOME-3/stable/dports/graphics/cairo
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/graphics/cairo:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/cairo:128861-128937
   + /branches/mld-qt-481/dports/graphics/cairo:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/graphics/cairo:128861-134238

Modified: users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile	2015-03-20 14:57:23 UTC (rev 134244)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile	2015-03-20 15:03:35 UTC (rev 134245)
@@ -11,7 +11,7 @@
 name                        cairo
 conflicts                   cairo-devel
 set my_name                 cairo
-version                     1.14.0
+version                     1.14.2
 categories                  graphics
 maintainers                 ryandesign
 license                     {LGPL-2.1 MPL-1.1}
@@ -30,8 +30,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
 
@@ -48,9 +48,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}
 

Deleted: users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff	2015-03-20 14:57:23 UTC (rev 134244)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff	2015-03-20 15:03:35 UTC (rev 134245)
@@ -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/20150320/df24d3fd/attachment-0001.html>