From aefdcb65883dbbd3c9dc2bd8ef0870a6b15717f2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 28 Apr 2017 21:46:22 +0200
Subject: [PATCH] switch to bundled harfbuzz on rhel

---
 .gitignore       | 2 ++
 libreoffice.spec | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8453ff6..60f95eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,9 @@
 /185d60944ea767075d27247c3162b3bc-unowinreg.dll
 /libreoffice-multiliblauncher.sh
 /0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
 /4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
+/harfbuzz-1.3.2.tar.bz2
 /libcmis-0.5.1.tar.gz
 /liborcus-0.12.1.tar.gz
 /libpagemaker-0.0.3.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index ebde8ae..c0d07e7 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -98,7 +98,10 @@ Source104:      %{external_url}/libwps-0.4.4.tar.bz2
 Source105:      %{external_url}/libpagemaker-0.0.3.tar.bz2
 Source106:      %{external_url}/libzmf-0.0.1.tar.bz2
 Source107:      %{external_url}/libstaroffice-0.0.2.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice
+# TODO: maybe it's still possible to build with harfbuzz 0.9.36 with some amount of patching?
+Source108:      %{external_url}/harfbuzz-1.3.2.tar.bz2
+Source109:      %{external_url}/3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
+%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite
 %endif
 
 # build tools
@@ -146,11 +149,9 @@ BuildRequires: pkgconfig(evolution-data-server-1.2)
 BuildRequires: pkgconfig(freetype2)
 BuildRequires: pkgconfig(glew) >= 1.10.0
 BuildRequires: pkgconfig(glu)
-BuildRequires: pkgconfig(graphite2)
 BuildRequires: pkgconfig(gstreamer-1.0)
 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: pkgconfig(harfbuzz)
 BuildRequires: pkgconfig(hunspell)
 BuildRequires: pkgconfig(ice)
 BuildRequires: pkgconfig(lcms2)
@@ -191,7 +192,9 @@ BuildRequires: unixODBC-devel
 BuildRequires: kdelibs4-devel
 BuildRequires: openCOLLADA-devel
 BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(graphite2)
 BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(harfbuzz)
 BuildRequires: pkgconfig(libcmis-0.5)
 BuildRequires: pkgconfig(libe-book-0.1)
 BuildRequires: pkgconfig(libeot)