diff options
-rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 2 | ||||
-rw-r--r-- | meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch (renamed from meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch) | 0 | ||||
-rw-r--r-- | meta/packages/cairo/cairo.inc | 6 | ||||
-rw-r--r-- | meta/packages/cairo/cairo_1.8.10.bb | 8 | ||||
-rw-r--r-- | meta/packages/cairo/cairo_1.8.2.bb | 6 |
5 files changed, 13 insertions, 9 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index edadc1b4b0..df0b8f8f45 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -12,7 +12,7 @@ PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" | |||
12 | PREFERRED_VERSION_glib-2.0 ?= "2.24.1" | 12 | PREFERRED_VERSION_glib-2.0 ?= "2.24.1" |
13 | PREFERRED_VERSION_glib-2.0-native ?= "2.24.1" | 13 | PREFERRED_VERSION_glib-2.0-native ?= "2.24.1" |
14 | PREFERRED_VERSION_atk ?= "1.24.0" | 14 | PREFERRED_VERSION_atk ?= "1.24.0" |
15 | PREFERRED_VERSION_cairo ?= "1.8.2" | 15 | PREFERRED_VERSION_cairo ?= "1.8.10" |
16 | PREFERRED_VERSION_pango ?= "1.22.2" | 16 | PREFERRED_VERSION_pango ?= "1.22.2" |
17 | PREFERRED_VERSION_gtk+ ?= "2.14.2" | 17 | PREFERRED_VERSION_gtk+ ?= "2.14.2" |
18 | 18 | ||
diff --git a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch b/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch index afdf2c8f08..afdf2c8f08 100644 --- a/meta/packages/cairo/cairo-1.8.2/hardcoded_libtool.patch +++ b/meta/packages/cairo/cairo-1.8.10/hardcoded_libtool.patch | |||
diff --git a/meta/packages/cairo/cairo.inc b/meta/packages/cairo/cairo.inc index 1847519c67..e73a839671 100644 --- a/meta/packages/cairo/cairo.inc +++ b/meta/packages/cairo/cairo.inc | |||
@@ -1,8 +1,10 @@ | |||
1 | DESCRIPTION = "Cairo graphics library" | ||
2 | HOMEPAGE = "http://cairographics.org" | ||
3 | BUGTRACKER = "http://bugs.freedesktop.org" | ||
1 | SECTION = "libs" | 4 | SECTION = "libs" |
2 | PRIORITY = "optional" | 5 | PRIORITY = "optional" |
6 | LICENSE = "MPLv1.1 & LGPLv2.1" | ||
3 | DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman" | 7 | DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman" |
4 | DESCRIPTION = "Cairo graphics library" | ||
5 | LICENSE = "MPL LGPL" | ||
6 | 8 | ||
7 | #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points | 9 | #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points |
8 | require cairo-fpu.inc | 10 | require cairo-fpu.inc |
diff --git a/meta/packages/cairo/cairo_1.8.10.bb b/meta/packages/cairo/cairo_1.8.10.bb new file mode 100644 index 0000000000..9e7e7a3bf6 --- /dev/null +++ b/meta/packages/cairo/cairo_1.8.10.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require cairo.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=7d7cc3410ae869ed913ebd30d7f45941" | ||
4 | |||
5 | PR = "r0" | ||
6 | |||
7 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ | ||
8 | file://hardcoded_libtool.patch" | ||
diff --git a/meta/packages/cairo/cairo_1.8.2.bb b/meta/packages/cairo/cairo_1.8.2.bb deleted file mode 100644 index fd8a99b49e..0000000000 --- a/meta/packages/cairo/cairo_1.8.2.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require cairo.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ | ||
6 | file://hardcoded_libtool.patch;patch=1" | ||