From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:20:09 +0200
Subject: Revert "fix conflict, autoseect libgcj"

This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
---
 package/cairo/Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'package/cairo')

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 39667bdd9..a3d957acd 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -27,7 +27,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-xlib=yes
 
-- 
cgit v1.2.3


From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:21:13 +0200
Subject: I am to tupid for git, today.

Revert "Revert "fix conflict, autoseect libgcj""

This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
---
 package/cairo/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package/cairo')

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index a3d957acd..39667bdd9 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
 
+TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-xlib=yes
 
-- 
cgit v1.2.3


From 9201a515c4973269245bce80939aaac199e0a9f2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 7 Apr 2011 21:23:57 +0200
Subject: update to latest upstream version

---
 package/cairo/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/cairo')

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 39667bdd9..b15efd5e2 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cairo
-PKG_VERSION:=		1.8.10
+PKG_VERSION:=		1.10.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b60a82f405f9400bbfdcf850b1728d25
+PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
-- 
cgit v1.2.3


From 297e4004d154572e29ee71f8ed852b022686e852 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 8 Apr 2011 12:00:29 +0200
Subject: remove wrong patch

---
 package/cairo/patches/patch-src_cairo-features_h | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 package/cairo/patches/patch-src_cairo-features_h

(limited to 'package/cairo')

diff --git a/package/cairo/patches/patch-src_cairo-features_h b/package/cairo/patches/patch-src_cairo-features_h
deleted file mode 100644
index 6466deec7..000000000
--- a/package/cairo/patches/patch-src_cairo-features_h
+++ /dev/null
@@ -1,15 +0,0 @@
---- cairo-1.8.10.orig/src/cairo-features.h	2010-02-19 22:34:38.000000000 +0100
-+++ cairo-1.8.10/src/cairo-features.h	2011-01-14 20:12:28.000000000 +0100
-@@ -10,11 +10,11 @@
- #define CAIRO_HAS_SVG_SURFACE 1
- #define CAIRO_HAS_USER_FONT 1
- #define CAIRO_HAS_XLIB_SURFACE 1
--#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1
- 
- /*#undef CAIRO_HAS_QUARTZ_FONT */
- /*#undef CAIRO_HAS_QUARTZ_SURFACE */
- /*#undef CAIRO_HAS_WIN32_FONT */
- /*#undef CAIRO_HAS_WIN32_SURFACE */
-+/*#undef CAIRO_HAS_XLIB_XRENDER_SURFACE */
- 
- #endif
-- 
cgit v1.2.3