diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-09-11 14:21:08 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-09-11 14:21:08 +0000 |
| commit | 4499a81191bd7454671b0155e3e4accf9f5b07ac (patch) | |
| tree | d45204a8f3caf0af9a5facec2d463ae78bef2c9a | |
| parent | 8035b842b4f1c7ce465c2346d62fa55940a94def (diff) | |
| download | asb-4499a81191bd7454671b0155e3e4accf9f5b07ac.tar.gz asb-4499a81191bd7454671b0155e3e4accf9f5b07ac.tar.xz | |
libreoffice: rebase the harfbuzz patch for libreoffice-5.4.1
| -rw-r--r-- | libreoffice/build/patches/libreoffice5.harfbuzz-icu.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libreoffice/build/patches/libreoffice5.harfbuzz-icu.patch b/libreoffice/build/patches/libreoffice5.harfbuzz-icu.patch index ca53a8ea..f584370a 100644 --- a/libreoffice/build/patches/libreoffice5.harfbuzz-icu.patch +++ b/libreoffice/build/patches/libreoffice5.harfbuzz-icu.patch @@ -1,13 +1,11 @@ -diff -uarN libreoffice-5.3.0.3/configure.ac.orig libreoffice-5.3.0.3/configure.ac ---- libreoffice-5.3.0.3/configure.ac.orig 2017-02-15 08:39:41.271712241 +0000 -+++ libreoffice-5.3.0.3/configure.ac 2017-02-15 14:05:59.402223833 +0000 -@@ -9272,7 +9272,7 @@ - dnl =================================================================== - dnl HarfBuzz - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) -+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz -lharfbuzz-icu"]) +--- libreoffice-5.4.1.2/configure.ac.orig 2017-09-11 12:47:19.596433327 +0200 ++++ libreoffice-5.4.1.2/configure.ac 2017-09-11 14:21:42.704702009 +0200 +@@ -9179,7 +9179,7 @@ + + libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42], + ["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"], +- ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"]) ++ ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz -lharfbuzz-icu"]) + if test "$COM" = "MSC"; then # override the above - HARFBUZZ_LIBS="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.lib" - fi - + GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib" |