diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-31 00:15:45 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-31 00:15:45 +0000 |
| commit | 4f2bb36f31de0e4c0253379efcd6dba49c58b81c (patch) | |
| tree | 83f0eac7bc91b3dec72980858b9746c28212d288 /meta/packages/cairo/cairo-1.4.14/configure_fix.patch | |
| parent | 90f97b66b52a7a2890b4a2da07117ee8596948be (diff) | |
| download | poky-4f2bb36f31de0e4c0253379efcd6dba49c58b81c.tar.gz | |
cairo: Drop old versions
Diffstat (limited to 'meta/packages/cairo/cairo-1.4.14/configure_fix.patch')
| -rw-r--r-- | meta/packages/cairo/cairo-1.4.14/configure_fix.patch | 71 |
1 files changed, 0 insertions, 71 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 @@ | |||
| 1 | Libtool 2.2.2 can't cope unless the LT_ variables are marked as AC_SUBST | ||
| 2 | as otherwise autofoo tries to expand them, fails and gets upset. | ||
| 3 | |||
| 4 | You can't conditionally add AC_PROG_CXX to a configure.ac file since the | ||
| 5 | mere mention of it triggers some internals which then get upset it if | ||
| 6 | wasn't really called at configure time. | ||
| 7 | |||
| 8 | Referring to a .cpp file in Makefiles without calling AC_PROG_CXX is | ||
| 9 | now also a fatal error. Easiest fix is to drop the CXX stuff entirely. | ||
| 10 | |||
| 11 | RP - 14/4/08 | ||
| 12 | |||
| 13 | Index: 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 | |||
| 46 | Index: 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 | ||
| 58 | Index: 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 | |||
