mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

cairo: updated to 1.6.4

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4290 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-04-21 08:11:42 +00:00
parent 58d88cec42
commit eebe267a21
2 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
meta/packages/cairo/cairo-1.4.14/configure_fix.patch → meta/packages/cairo/cairo-1.6.4/configure_fix.patch vendored
View File

@@ -10,30 +10,53 @@ now also a fatal error. Easiest fix is to drop the CXX stuff entirely.
RP - 14/4/08
Index: cairo-1.4.14/configure.in
===================================================================
--- cairo-1.4.14.orig/configure.in 2008-04-14 14:50:16.000000000 +0100
+++ cairo-1.4.14/configure.in 2008-04-14 15:05:59.000000000 +0100
@@ -23,15 +23,18 @@
---
boilerplate/Makefile.am | 1 -
configure.in | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
--- cairo-1.6.4.orig/boilerplate/Makefile.am
+++ cairo-1.6.4/boilerplate/Makefile.am
@@ -11,11 +11,10 @@ libcairoboilerplate_la_SOURCES = \
xmalloc.c \
xmalloc.h
libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
if CAIRO_HAS_BEOS_SURFACE
-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
# BeOS system headers trigger this warning
libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
endif
--- cairo-1.6.4.orig/configure.in
+++ cairo-1.6.4/configure.in
@@ -25,19 +25,22 @@ dnl ====================================
# libtool shared library version
# Increment if the interface has additions, changes, removals.
LT_CURRENT=13
LT_CURRENT=19
+AC_SUBST(LT_CURRENT)
# Increment any time the source changes; set to
# 0 if you increment CURRENT
LT_REVISION=7
LT_REVISION=5
+AC_SUBST(LT_REVISION)
# Increment if any interfaces have been added; set to 0
# if any interfaces have been removed. removal has
# precedence over adding, so set to 0 if both happened.
LT_AGE=11
LT_AGE=17
+AC_SUBST(LT_AGE)
dnl ===========================================================================
@@ -342,9 +345,6 @@
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
AC_SUBST(VERSION_INFO)
@@ -442,13 +445,10 @@ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, be
use_beos="no (requires a BeOS platform)"
;;
esac
])
@@ -43,27 +66,5 @@ Index: cairo-1.4.14/configure.in
dnl ===========================================================================
Index: cairo-1.4.14/boilerplate/Makefile.am
===================================================================
--- cairo-1.4.14.orig/boilerplate/Makefile.am 2008-04-14 15:08:47.000000000 +0100
+++ cairo-1.4.14/boilerplate/Makefile.am 2008-04-14 15:08:57.000000000 +0100
@@ -9,7 +9,6 @@
libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
if CAIRO_HAS_BEOS_SURFACE
-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
# BeOS system headers trigger this warning
libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
Index: cairo-1.4.14/src/Makefile.am
===================================================================
--- cairo-1.4.14.orig/src/Makefile.am 2008-04-14 15:08:25.000000000 +0100
+++ cairo-1.4.14/src/Makefile.am 2008-04-14 15:08:38.000000000 +0100
@@ -97,7 +97,6 @@
libcairo_beos_sources =
if CAIRO_HAS_BEOS_SURFACE
libcairo_beos_headers = cairo-beos.h
-libcairo_beos_sources += cairo-beos-surface.cpp
backend_pkgconfigs += cairo-beos.pc
noinst_LTLIBRARIES = libcairo_beos.la
CAIRO_BACKEND_ENABLE(png, PNG, png, PNG_FUNCTIONS, yes, [
use_png=no

3
meta/packages/cairo/cairo_1.4.14.bb → meta/packages/cairo/cairo_1.6.4.bb
View File

@@ -2,6 +2,3 @@ require cairo.inc
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
file://configure_fix.patch;patch=1 "
PR = "r1"