From c93d147e0889ac91a01e3570f818624f68b3c8e8 Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Thu, 22 Aug 2013 13:53:05 +0300 Subject: harfbuzz: upgrade to v0.9.19 Remove the disable_graphite.patch because the --without-graphite2 configure option can be used instead. Split package into harfbuzz and harfbuzz-icu. The ICU support is now built into a separate library that will be shipped in a different package. Signed-off-by: Mihai Prica Signed-off-by: Saul Wold --- .../harfbuzz-0.9.17/disable_graphite.patch | 15 --------- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb | 29 ----------------- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb | 37 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch deleted file mode 100644 index 49938ba1a4..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Marko Lindqvist -diff -Nurd harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac ---- harfbuzz-0.9.10/configure.ac 2013-01-03 08:08:51.000000000 +0200 -+++ harfbuzz-0.9.10/configure.ac 2013-01-09 08:18:04.812529418 +0200 -@@ -185,7 +185,7 @@ - - dnl ========================================================================== - --PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false) -+have_graphite=false - if $have_graphite; then - AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library]) - fi diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb deleted file mode 100644 index 968d8a2818..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Text shaping library" -DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" - -LICENSE = "MIT & ICU" -LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ - file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ - file://src/hb-icu-le/COPYING;md5=0ac60acf068e2cc9facdf86169a9c13e \ - file://src/hb-icu-le/license.html;md5=9136737088bbfbbf86d9a714da49fb89 \ - file://src/hb-old/COPYING;md5=6e8442c12d498ce55cfe39fc60f97981 \ -" - -SECTION = "libs" - -PR = "r0" - -SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ - file://disable_graphite.patch \ -" - -SRC_URI[md5sum] = "c48827713e93539dc7285f9e86ffbdc5" -SRC_URI[sha256sum] = "a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed" - -inherit autotools pkgconfig - -DEPENDS = "icu glib-2.0 cairo freetype" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb new file mode 100644 index 0000000000..daf7273e96 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb @@ -0,0 +1,37 @@ +SUMMARY = "Text shaping library" +DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" + +LICENSE = "MIT & ICU" +LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ + file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ + file://src/hb-icu-le/COPYING;md5=0ac60acf068e2cc9facdf86169a9c13e \ + file://src/hb-icu-le/license.html;md5=9136737088bbfbbf86d9a714da49fb89 \ + file://src/hb-old/COPYING;md5=6e8442c12d498ce55cfe39fc60f97981 \ +" + +SECTION = "libs" + +SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ +" + +SRC_URI[md5sum] = "9782581ee6ef972554772e84ca448131" +SRC_URI[sha256sum] = "d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35" + +inherit autotools pkgconfig + +DEPENDS = "icu glib-2.0 cairo freetype" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --with-icu --without-graphite2" + +PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" + +FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" +FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*" +FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ + ${libdir}/libharfbuzz-icu.so \ + ${libdir}/pkgconfig/harfbuzz-icu.pc \ +" -- cgit 1.2.3-korg