cairo 1.2.4: Drop broken patch pending a rethink

diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb
index 662f685..9f8425c 100644 (file)
--- a/packages/cairo/cairo_1.2.4.bb
+++ b/packages/cairo/cairo_1.2.4.bb
@@ -6,8 +6,7 @@ DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 PR = "r1"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://cairo-fixed.patch;patch=1"
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
 inherit autotools pkgconfig 
 

diff --git a/packages/cairo/files/cairo-fixed.patch b/packages/cairo/files/cairo-fixed.patch
deleted file mode 100644 (file)
index 8df54d9..0000000
--- a/packages/cairo/files/cairo-fixed.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur cairo-1.2.4/src/cairo-fixed.c cairo-1.2.4-new/src/cairo-fixed.c
---- cairo-1.2.4/src/cairo-fixed.c      2006-06-10 07:07:37.000000000 +0300
-+++ cairo-1.2.4-new/src/cairo-fixed.c  2006-08-25 13:06:26.000000000 +0300
-@@ -43,12 +43,6 @@
- }
- 
- cairo_fixed_t
--_cairo_fixed_from_double (double d)
--{
--    return (cairo_fixed_t) floor (d * 65536 + 0.5);
--}
--
--cairo_fixed_t
- _cairo_fixed_from_26_6 (uint32_t i)
- {
-     return i << 10;
-diff -ur cairo-1.2.4/src/cairoint.h cairo-1.2.4-new/src/cairoint.h
---- cairo-1.2.4/src/cairoint.h 2006-08-18 17:20:16.000000000 +0300
-+++ cairo-1.2.4-new/src/cairoint.h     2006-08-25 13:14:07.000000000 +0300
-@@ -1117,8 +1117,21 @@
- 
- #define CAIRO_FIXED_ONE _cairo_fixed_from_int (1)
- 
--cairo_private cairo_fixed_t
--_cairo_fixed_from_double (double d);
-+#define CAIRO_DOUBLE2FIX_MAGIC 103079215104.0 /* 2 ^ (52 - 16) * 1.5 */
-+
-+#ifdef WORDS_BIGENDIAN
-+#define iman 1
-+#else
-+#define iman 0
-+#endif
-+
-+static inline cairo_fixed_t
-+_cairo_fixed_from_double (double d)
-+{
-+        d = d + CAIRO_DOUBLE2FIX_MAGIC;
-+        
-+        return ((cairo_fixed_t *) &d)[iman];
-+}
- 
- cairo_private cairo_fixed_t
- _cairo_fixed_from_26_6 (uint32_t i);