diff options
Diffstat (limited to '0013-Fix-linking-against-external-harfbuzz.patch')
| -rw-r--r-- | 0013-Fix-linking-against-external-harfbuzz.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0013-Fix-linking-against-external-harfbuzz.patch b/0013-Fix-linking-against-external-harfbuzz.patch index 789fb3f92db5..738b8664bd72 100644 --- a/0013-Fix-linking-against-external-harfbuzz.patch +++ b/0013-Fix-linking-against-external-harfbuzz.patch @@ -1,4 +1,4 @@ -From 3bbcdf8e7657d5112e3d35e372786949424b5a37 Mon Sep 17 00:00:00 2001 +From e08f71f26c964c3f5a82eb208d871fc883869f23 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 13/26] Fix linking against external harfbuzz @@ -9,7 +9,7 @@ Subject: [PATCH 13/26] Fix linking against external harfbuzz 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro -index 32edd6e..cc40fc1 100644 +index 32edd6e358..cc40fc1678 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.pro +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -1,3 +1,4 @@ @@ -19,7 +19,7 @@ index 32edd6e..cc40fc1 100644 +contains(CONFIG, static): LIBS += $$system($$PKG_CONFIG --static --libs harfbuzz) +else: LIBS += $$system($$PKG_CONFIG --libs harfbuzz) diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri -index 7443368..2932f05 100644 +index 74433688f6..2932f059e9 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -2,5 +2,7 @@ contains(QT_CONFIG, harfbuzz) { @@ -32,5 +32,5 @@ index 7443368..2932f05 100644 + else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz) } -- -2.10.2 +2.11.0 |