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 edadc1b4b..df0b8f8f4 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" PREFERRED_VERSION_glib-2.0 ?= "2.24.1" PREFERRED_VERSION_glib-2.0-native ?= "2.24.1" PREFERRED_VERSION_atk ?= "1.24.0" -PREFERRED_VERSION_cairo ?= "1.8.2" +PREFERRED_VERSION_cairo ?= "1.8.10" PREFERRED_VERSION_pango ?= "1.22.2" PREFERRED_VERSION_gtk+ ?= "2.14.2" 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 afdf2c8f0..afdf2c8f0 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 1847519c6..e73a83967 100644 --- a/meta/packages/cairo/cairo.inc +++ b/meta/packages/cairo/cairo.inc @@ -1,8 +1,10 @@ +DESCRIPTION = "Cairo graphics library" +HOMEPAGE = "http://cairographics.org" +BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" PRIORITY = "optional" +LICENSE = "MPLv1.1 & LGPLv2.1" DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman" -DESCRIPTION = "Cairo graphics library" -LICENSE = "MPL LGPL" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 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 000000000..9e7e7a3bf --- /dev/null +++ b/meta/packages/cairo/cairo_1.8.10.bb @@ -0,0 +1,8 @@ +require cairo.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7d7cc3410ae869ed913ebd30d7f45941" + +PR = "r0" + +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + 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 fd8a99b49..000000000 --- a/meta/packages/cairo/cairo_1.8.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cairo.inc - -PR = "r1" - -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ - file://hardcoded_libtool.patch;patch=1" |