summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/cairo-1-stray-comma.patch19
-rw-r--r--src/cairo.mk5
-rw-r--r--src/cairomm.mk4
3 files changed, 24 insertions, 4 deletions
diff --git a/src/cairo-1-stray-comma.patch b/src/cairo-1-stray-comma.patch
new file mode 100644
index 0000000..f8b2f34
--- /dev/null
+++ b/src/cairo-1-stray-comma.patch
@@ -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 --git a/src/cairo.mk b/src/cairo.mk
index 2881a46..2efcada 100644
--- a/src/cairo.mk
+++ b/src/cairo.mk
@@ -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 @@ define $(PKG)_BUILD
--disable-beos \
--disable-glitz \
--disable-directfb \
+ --disable-atomic \
--enable-win32 \
--enable-win32-font \
--enable-png \
diff --git a/src/cairomm.mk b/src/cairomm.mk
index b417c90..6289c99 100644
--- a/src/cairomm.mk
+++ b/src/cairomm.mk
@@ -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/