From 3a154fa0ad18301f660d3be36b75843768b92e9c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 13 Feb 2013 13:25:55 +0200 Subject: harfbuzz: update to upstream version 0.9.12 Fixed license declaration to have AND between all the licenses instead of OR. (From OE-Core rev: 0a90fb2faebbb7848dbd5a23b37490866b397f5f) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../harfbuzz-0.9.10/avoid_double_version_h.patch | 14 ---------- .../harfbuzz-0.9.10/disable_graphite.patch | 15 ----------- .../harfbuzz-0.9.12/avoid_double_version_h.patch | 14 ++++++++++ .../harfbuzz-0.9.12/disable_graphite.patch | 15 +++++++++++ meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb | 30 ---------------------- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb | 30 ++++++++++++++++++++++ 6 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch deleted file mode 100644 index 66823ede70..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/avoid_double_version_h.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Marko Lindqvist -diff -Nurd harfbuzz-0.9.10/src/Makefile.am harfbuzz-0.9.10/src/Makefile.am ---- harfbuzz-0.9.10/src/Makefile.am 2012-12-19 03:39:27.000000000 +0200 -+++ harfbuzz-0.9.10/src/Makefile.am 2013-01-25 11:55:23.946354729 +0200 -@@ -210,7 +210,6 @@ - libharfbuzz_la_LIBADD = $(HBLIBS) - EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) - pkginclude_HEADERS = $(HBHEADERS) --nodist_pkginclude_HEADERS = hb-version.h - - CLEANFILES += harfbuzz.def - harfbuzz.def: $(HBHEADERS) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/disable_graphite.patch deleted file mode 100644 index 49938ba1a4..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.10/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.12/avoid_double_version_h.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch new file mode 100644 index 0000000000..66823ede70 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/avoid_double_version_h.patch @@ -0,0 +1,14 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist +diff -Nurd harfbuzz-0.9.10/src/Makefile.am harfbuzz-0.9.10/src/Makefile.am +--- harfbuzz-0.9.10/src/Makefile.am 2012-12-19 03:39:27.000000000 +0200 ++++ harfbuzz-0.9.10/src/Makefile.am 2013-01-25 11:55:23.946354729 +0200 +@@ -210,7 +210,6 @@ + libharfbuzz_la_LIBADD = $(HBLIBS) + EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) + pkginclude_HEADERS = $(HBHEADERS) +-nodist_pkginclude_HEADERS = hb-version.h + + CLEANFILES += harfbuzz.def + harfbuzz.def: $(HBHEADERS) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch new file mode 100644 index 0000000000..49938ba1a4 --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.12/disable_graphite.patch @@ -0,0 +1,15 @@ +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.10.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb deleted file mode 100644 index 2e849e122e..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.10.bb +++ /dev/null @@ -1,30 +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 = "Old-MIT | UCDN | ICU | HarfBuzz-old" -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 = "r1" - -SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \ - file://disable_graphite.patch \ - file://avoid_double_version_h.patch \ -" - -SRC_URI[md5sum] = "deec04f2281bef6323f4ad1dabbf75f7" -SRC_URI[sha256sum] = "1f8c281ded05290fd1964c0e11a2bde607713b33d0c8122a8d230452d99c2e23" - -inherit autotools pkgconfig - -DEPENDS = "icu glib-2.0 cairo freetype" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb new file mode 100644 index 0000000000..19269f116f --- /dev/null +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.12.bb @@ -0,0 +1,30 @@ +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 = "Old-MIT & UCDN & ICU & HarfBuzz-old" +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 \ + file://avoid_double_version_h.patch \ +" + +SRC_URI[md5sum] = "35551b8cdf53b75aa9c42460f210e89f" +SRC_URI[sha256sum] = "c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5" + +inherit autotools pkgconfig + +DEPENDS = "icu glib-2.0 cairo freetype" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf