summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-21 08:11:42 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-21 08:11:42 +0000
commiteebe267a2157b66d1387d220babeb9babcc21f0c (patch)
treee7e4674f0c64349f82f21fae3cae4f7ab97ca103 /meta
parent58d88cec423e8a4d36a25e962f4a4df84d235ced (diff)
downloadpoky-eebe267a2157b66d1387d220babeb9babcc21f0c.tar.gz
cairo: updated to 1.6.4
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4290 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/cairo/cairo-1.6.4/configure_fix.patch (renamed from meta/packages/cairo/cairo-1.4.14/configure_fix.patch)67
-rw-r--r--meta/packages/cairo/cairo_1.6.4.bb (renamed from meta/packages/cairo/cairo_1.4.14.bb)3
2 files changed, 34 insertions, 36 deletions
diff --git a/meta/packages/cairo/cairo-1.4.14/configure_fix.patch b/meta/packages/cairo/cairo-1.6.4/configure_fix.patch
index 04993bb0b9..44b59867f1 100644
--- a/meta/packages/cairo/cairo-1.4.14/configure_fix.patch
+++ b/meta/packages/cairo/cairo-1.6.4/configure_fix.patch
@@ -10,30 +10,53 @@ now also a fatal error. Easiest fix is to drop the CXX stuff entirely.
10 10
11RP - 14/4/08 11RP - 14/4/08
12 12
13Index: cairo-1.4.14/configure.in 13---
14=================================================================== 14 boilerplate/Makefile.am | 1 -
15--- cairo-1.4.14.orig/configure.in 2008-04-14 14:50:16.000000000 +0100 15 configure.in | 6 +++---
16+++ cairo-1.4.14/configure.in 2008-04-14 15:05:59.000000000 +0100 16 2 files changed, 3 insertions(+), 4 deletions(-)
17@@ -23,15 +23,18 @@ 17
18--- cairo-1.6.4.orig/boilerplate/Makefile.am
19+++ cairo-1.6.4/boilerplate/Makefile.am
20@@ -11,11 +11,10 @@ libcairoboilerplate_la_SOURCES = \
21 xmalloc.c \
22 xmalloc.h
23 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
24
25 if CAIRO_HAS_BEOS_SURFACE
26-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
27 libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
28 # BeOS system headers trigger this warning
29 libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
30 endif
31
32--- cairo-1.6.4.orig/configure.in
33+++ cairo-1.6.4/configure.in
34@@ -25,19 +25,22 @@ dnl ====================================
35
36 # libtool shared library version
18 37
19 # Increment if the interface has additions, changes, removals. 38 # Increment if the interface has additions, changes, removals.
20 LT_CURRENT=13 39 LT_CURRENT=19
21+AC_SUBST(LT_CURRENT) 40+AC_SUBST(LT_CURRENT)
22 41
23 # Increment any time the source changes; set to 42 # Increment any time the source changes; set to
24 # 0 if you increment CURRENT 43 # 0 if you increment CURRENT
25 LT_REVISION=7 44 LT_REVISION=5
26+AC_SUBST(LT_REVISION) 45+AC_SUBST(LT_REVISION)
27 46
28 # Increment if any interfaces have been added; set to 0 47 # Increment if any interfaces have been added; set to 0
29 # if any interfaces have been removed. removal has 48 # if any interfaces have been removed. removal has
30 # precedence over adding, so set to 0 if both happened. 49 # precedence over adding, so set to 0 if both happened.
31 LT_AGE=11 50 LT_AGE=17
32+AC_SUBST(LT_AGE) 51+AC_SUBST(LT_AGE)
33 52
34 dnl =========================================================================== 53 dnl ===========================================================================
35 54
36@@ -342,9 +345,6 @@ 55 VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
56 AC_SUBST(VERSION_INFO)
57@@ -442,13 +445,10 @@ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, be
58 use_beos="no (requires a BeOS platform)"
59 ;;
37 esac 60 esac
38 ]) 61 ])
39 62
@@ -43,27 +66,5 @@ Index: cairo-1.4.14/configure.in
43 66
44 dnl =========================================================================== 67 dnl ===========================================================================
45 68
46Index: cairo-1.4.14/boilerplate/Makefile.am 69 CAIRO_BACKEND_ENABLE(png, PNG, png, PNG_FUNCTIONS, yes, [
47=================================================================== 70 use_png=no
48--- cairo-1.4.14.orig/boilerplate/Makefile.am 2008-04-14 15:08:47.000000000 +0100
49+++ cairo-1.4.14/boilerplate/Makefile.am 2008-04-14 15:08:57.000000000 +0100
50@@ -9,7 +9,6 @@
51 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
52
53 if CAIRO_HAS_BEOS_SURFACE
54-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
55 libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
56 # BeOS system headers trigger this warning
57 libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
58Index: cairo-1.4.14/src/Makefile.am
59===================================================================
60--- cairo-1.4.14.orig/src/Makefile.am 2008-04-14 15:08:25.000000000 +0100
61+++ cairo-1.4.14/src/Makefile.am 2008-04-14 15:08:38.000000000 +0100
62@@ -97,7 +97,6 @@
63 libcairo_beos_sources =
64 if CAIRO_HAS_BEOS_SURFACE
65 libcairo_beos_headers = cairo-beos.h
66-libcairo_beos_sources += cairo-beos-surface.cpp
67 backend_pkgconfigs += cairo-beos.pc
68
69 noinst_LTLIBRARIES = libcairo_beos.la
diff --git a/meta/packages/cairo/cairo_1.4.14.bb b/meta/packages/cairo/cairo_1.6.4.bb
index 116c79810a..8a14118219 100644
--- a/meta/packages/cairo/cairo_1.4.14.bb
+++ b/meta/packages/cairo/cairo_1.6.4.bb
@@ -2,6 +2,3 @@ require cairo.inc
2 2
3SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ 3SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
4 file://configure_fix.patch;patch=1 " 4 file://configure_fix.patch;patch=1 "
5
6PR = "r1"
7
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 16:39:36 +0000