From 7861f81c42784eabfc18986acd58e1cf04c90e3b Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Fri, 19 Jan 2018 13:47:34 +0330
Subject: [PATCH] Support circular dependency of harfbuzz-freetype

---
 freetype/VITABUILD      |  4 ++--
 harfbuzz/VITABUILD      |  8 ++++----
 harfbuzz_noft/VITABUILD | 20 ++++++++++++++++++++
 travis_packages.sh      |  1 +
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 harfbuzz_noft/VITABUILD

diff --git a/freetype/VITABUILD b/freetype/VITABUILD
index dac8e596..825fe01f 100644
--- a/freetype/VITABUILD
+++ b/freetype/VITABUILD
@@ -1,9 +1,9 @@
 pkgname=freetype
-pkgver=2.7
+pkgver=2.9
 pkgrel=1
 url="https://www.freetype.org/"
 source=("http://downloads.sourceforge.net/project/freetype/freetype2/${pkgver}/freetype-${pkgver}.tar.gz")
-sha256sums=('7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4')
+sha256sums=('bf380e4d7c4f3b5b1c1a7b2bf3abb967bda5e9ab480d0df656e0e08c5019c5e6')
 
 build() {
   cd freetype-$pkgver
diff --git a/harfbuzz/VITABUILD b/harfbuzz/VITABUILD
index 3878d17c..047901c0 100644
--- a/harfbuzz/VITABUILD
+++ b/harfbuzz/VITABUILD
@@ -1,9 +1,9 @@
 pkgname=harfbuzz
-pkgver=1.4.8
+pkgver=1.7.4
 pkgrel=1
 url="http://harfbuzz.org/"
-source=("https://github.com/behdad/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.bz2")
-sha256sums=('ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131')
+source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.bz2")
+sha256sums=('b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b')
 prepare() {
   cd $pkgname-$pkgver
 }
@@ -11,7 +11,7 @@ prepare() {
 build() {
   cd harfbuzz-$pkgver
   mkdir build && cd build
-  cmake .. $CMARGS -DCMAKE_INSTALL_PREFIX=$prefix
+  cmake .. $CMARGS -DHB_HAVE_FREETYPE=ON -DCMAKE_INSTALL_PREFIX=$prefix
   make
 }
 
diff --git a/harfbuzz_noft/VITABUILD b/harfbuzz_noft/VITABUILD
new file mode 100644
index 00000000..034861d5
--- /dev/null
+++ b/harfbuzz_noft/VITABUILD
@@ -0,0 +1,20 @@
+pkgname=harfbuzz
+pkgver=1.7.4
+pkgrel=1
+url="http://harfbuzz.org/"
+source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.bz2")
+sha256sums=('b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b')
+prepare() {
+  cd $pkgname-$pkgver
+}
+
+build() {
+  cd harfbuzz-$pkgver
+  ./autogen.sh --host arm-vita-eabi --prefix=$prefix --with-freetype=no --with-glib=no --with-icu=no --with-cairo=no --with-fontconfig=no --disable-shared --enable-static
+  make
+}
+
+package () {
+  cd harfbuzz-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/travis_packages.sh b/travis_packages.sh
index 9987f0c3..e54e846a 100755
--- a/travis_packages.sh
+++ b/travis_packages.sh
@@ -11,6 +11,7 @@ b libexif
 b libjpeg-turbo
 b jansson
 b yaml-cpp
+b harfbuzz_noft # to support hb-ft circular dependency
 b freetype
 b harfbuzz
 b fftw