# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1285240317 -7200
# Node ID 26fbdea21f7eb547c923cfbb8661c91e957f07d9
# Parent  c4e5d3613b5f3f539fbc239059c7cb8512c4313c
upgrade packages: cairo cairomm

diff -r c4e5d3613b5f -r 26fbdea21f7e src/cairo-1-stray-comma.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cairo-1-stray-comma.patch	Thu Sep 23 13:11:57 2010 +0200
@@ -0,0 +1,19 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information
+
+This patch has been taken from:
+https://bugs.freedesktop.org/show_bug.cgi?id=30342
+
+diff --git a/src/cairo.h b/src/cairo.h
+index 913320f..136c5db 100644
+--- a/src/cairo.h
++++ b/src/cairo.h
+@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
+     CAIRO_DEVICE_TYPE_SCRIPT,
+     CAIRO_DEVICE_TYPE_XCB,
+     CAIRO_DEVICE_TYPE_XLIB,
+-    CAIRO_DEVICE_TYPE_XML,
++    CAIRO_DEVICE_TYPE_XML
+ } cairo_device_type_t;
+ 
+ cairo_public cairo_device_type_t
diff -r c4e5d3613b5f -r 26fbdea21f7e src/cairo.mk
--- a/src/cairo.mk	Thu Sep 23 18:17:57 2010 +1000
+++ b/src/cairo.mk	Thu Sep 23 13:11:57 2010 +0200
@@ -4,8 +4,8 @@
 # cairo
 PKG             := cairo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.10
-$(PKG)_CHECKSUM := fd5e8ca82ff0e8542ea4c51612cad387f2a49df3
+$(PKG)_VERSION  := 1.10.0
+$(PKG)_CHECKSUM := efe7e47408d5188690228ccadc8523652f6bf702
 $(PKG)_SUBDIR   := cairo-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairo-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://cairographics.org/
@@ -39,6 +39,7 @@
         --disable-beos \
         --disable-glitz \
         --disable-directfb \
+        --disable-atomic \
         --enable-win32 \
         --enable-win32-font \
         --enable-png \
diff -r c4e5d3613b5f -r 26fbdea21f7e src/cairomm.mk
--- a/src/cairomm.mk	Thu Sep 23 18:17:57 2010 +1000
+++ b/src/cairomm.mk	Thu Sep 23 13:11:57 2010 +0200
@@ -4,8 +4,8 @@
 # cairomm
 PKG             := cairomm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.4
-$(PKG)_CHECKSUM := fdea579f406261881a0f4f6242a3980aecef382d
+$(PKG)_VERSION  := 1.9.2
+$(PKG)_CHECKSUM := 8dc75d88b7d2d10bf4e98032aa329b791b519657
 $(PKG)_SUBDIR   := cairomm-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairomm-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://cairographics.org/cairomm/