From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 14 Dec 2014 20:48:34 +0000 (-0500)
Subject: Add harfbuzz
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=92c6421dad559dd7cd8c0bab830dbe6cfb19d180;p=hvlinux.git

Add harfbuzz

Also reinstall freetype after harfbuzz in stage5 (freetype is first installed
in stage 3).
---

diff --git a/config/packages-list b/config/packages-list
index 7f73cb8..e2e2e9d 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -165,6 +165,7 @@ GUTENPRINT="gutenprint-5.2.10"
 GVFS="gvfs-1.22.2"
 GZIP="gzip-1.5"
 
+HARFBUZZ="harfbuzz-0.9.36"
 HDPARM="hdparm-9.43"
 HELP2MAN="help2man-1.37.1"
 HICOLOR_ICON_THEME="hicolor-icon-theme-0.13"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 3fac0bf..ea26244 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -32,6 +32,11 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${GLIBMM}
     ipkg ${CAIRO} "--enable-tee"
     ipkg ${CAIROMM}
+    ipkg ${HARFBUZZ}
+
+    # Freetype was installed in stage3, but needs to be reinstalled after harfbuzz
+    ipkg ${FREETYPE} "--disable-static"
+
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
     ipkg ${GDK_PIXBUF} "--with-x11"
diff --git a/stage5/packages-update b/stage5/packages-update
index 1c71f33..21316f8 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -6,6 +6,7 @@ update_packages_init ${*}
 
 # These packages were already downloaded in previous stages:
 lpkg 3 ${SUBVERSION}
+lpkg 3 ${FREETYPE}
 
 fpkg -m gnu ${HELP2MAN}
 fpkg -m gnu ${GSL}
@@ -26,6 +27,7 @@ fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software"
 fpkg -m gnome ${GLIBMM}
 fpkg ${CAIRO} ${CAIRO_URL}
 fpkg -e "tar.gz" ${CAIROMM} ${CAIRO_URL}
+fpkg ${HARFBUZZ} "http://www.freedesktop.org/software/harfbuzz/release"
 fpkg -m gnome ${PANGO}
 fpkg -m gnome ${PANGOMM}
 fpkg -m gnome ${ATK}