summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-31 00:15:45 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-31 00:15:45 +0000
commit4f2bb36f31de0e4c0253379efcd6dba49c58b81c (patch)
tree83f0eac7bc91b3dec72980858b9746c28212d288
parent90f97b66b52a7a2890b4a2da07117ee8596948be (diff)
downloadpoky-4f2bb36f31de0e4c0253379efcd6dba49c58b81c.tar.gz
cairo: Drop old versions
-rw-r--r--meta/packages/cairo/cairo-1.4.14/configure_fix.patch71
-rw-r--r--meta/packages/cairo/cairo-1.6.4/configure_fix.patch70
-rw-r--r--meta/packages/cairo/cairo_1.4.14.bb6
-rw-r--r--meta/packages/cairo/cairo_1.6.4.bb6
4 files changed, 0 insertions, 153 deletions
diff --git a/meta/packages/cairo/cairo-1.4.14/configure_fix.patch b/meta/packages/cairo/cairo-1.4.14/configure_fix.patch
deleted file mode 100644
index f4ed6cc6fe..0000000000
--- a/meta/packages/cairo/cairo-1.4.14/configure_fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1Libtool 2.2.2 can't cope unless the LT_ variables are marked as AC_SUBST
2as otherwise autofoo tries to expand them, fails and gets upset.
3
4You can't conditionally add AC_PROG_CXX to a configure.ac file since the
5mere mention of it triggers some internals which then get upset it if
6wasn't really called at configure time.
7
8Referring to a .cpp file in Makefiles without calling AC_PROG_CXX is
9now also a fatal error. Easiest fix is to drop the CXX stuff entirely.
10
11RP - 14/4/08
12
13Index: cairo-1.4.14/configure.in
14===================================================================
15--- cairo-1.4.14.orig/configure.in 2008-04-14 14:50:16.000000000 +0100
16+++ cairo-1.4.14/configure.in 2008-04-14 15:05:59.000000000 +0100
17@@ -23,15 +23,18 @@
18
19 # Increment if the interface has additions, changes, removals.
20 LT_CURRENT=13
21+AC_SUBST(LT_CURRENT)
22
23 # Increment any time the source changes; set to
24 # 0 if you increment CURRENT
25 LT_REVISION=7
26+AC_SUBST(LT_REVISION)
27
28 # Increment if any interfaces have been added; set to 0
29 # if any interfaces have been removed. removal has
30 # precedence over adding, so set to 0 if both happened.
31 LT_AGE=11
32+AC_SUBST(LT_AGE)
33
34 dnl ===========================================================================
35
36@@ -342,9 +345,6 @@
37 esac
38 ])
39
40-if test "x$use_beos" = "xyes"; then
41- AC_PROG_CXX
42-fi
43
44 dnl ===========================================================================
45
46Index: cairo-1.4.14/boilerplate/Makefile.am
47===================================================================
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
70
71
diff --git a/meta/packages/cairo/cairo-1.6.4/configure_fix.patch b/meta/packages/cairo/cairo-1.6.4/configure_fix.patch
deleted file mode 100644
index 44b59867f1..0000000000
--- a/meta/packages/cairo/cairo-1.6.4/configure_fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1Libtool 2.2.2 can't cope unless the LT_ variables are marked as AC_SUBST
2as otherwise autofoo tries to expand them, fails and gets upset.
3
4You can't conditionally add AC_PROG_CXX to a configure.ac file since the
5mere mention of it triggers some internals which then get upset it if
6wasn't really called at configure time.
7
8Referring to a .cpp file in Makefiles without calling AC_PROG_CXX is
9now also a fatal error. Easiest fix is to drop the CXX stuff entirely.
10
11RP - 14/4/08
12
13---
14 boilerplate/Makefile.am | 1 -
15 configure.in | 6 +++---
16 2 files changed, 3 insertions(+), 4 deletions(-)
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
37
38 # Increment if the interface has additions, changes, removals.
39 LT_CURRENT=19
40+AC_SUBST(LT_CURRENT)
41
42 # Increment any time the source changes; set to
43 # 0 if you increment CURRENT
44 LT_REVISION=5
45+AC_SUBST(LT_REVISION)
46
47 # Increment if any interfaces have been added; set to 0
48 # if any interfaces have been removed. removal has
49 # precedence over adding, so set to 0 if both happened.
50 LT_AGE=17
51+AC_SUBST(LT_AGE)
52
53 dnl ===========================================================================
54
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 ;;
60 esac
61 ])
62
63-if test "x$use_beos" = "xyes"; then
64- AC_PROG_CXX
65-fi
66
67 dnl ===========================================================================
68
69 CAIRO_BACKEND_ENABLE(png, PNG, png, PNG_FUNCTIONS, yes, [
70 use_png=no
diff --git a/meta/packages/cairo/cairo_1.4.14.bb b/meta/packages/cairo/cairo_1.4.14.bb
deleted file mode 100644
index 29cf9bae3f..0000000000
--- a/meta/packages/cairo/cairo_1.4.14.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cairo.inc
2
3SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
4 file://configure_fix.patch;patch=1 "
5
6PR = "r1" \ No newline at end of file
diff --git a/meta/packages/cairo/cairo_1.6.4.bb b/meta/packages/cairo/cairo_1.6.4.bb
deleted file mode 100644
index 006c2089b7..0000000000
--- a/meta/packages/cairo/cairo_1.6.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cairo.inc
2
3PR = "r1"
4
5SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
6 file://configure_fix.patch;patch=1 "