diff options
| author | Martchus | 2016-12-08 21:20:14 +0100 |
|---|---|---|
| committer | Martchus | 2016-12-08 21:20:14 +0100 |
| commit | ad140bfce5f9eb398e54c829668bac5277f7f2c1 (patch) | |
| tree | 7d8911b3ea7b530587c8cb9a0e913d91ad90a96c /0013-Fix-linking-against-external-harfbuzz.patch | |
| parent | d226ad19f2d078deedaf41de6dd6a3ee232784b3 (diff) | |
| download | aur-ad140bfce5f9eb398e54c829668bac5277f7f2c1.tar.gz | |
Fix misc issues
Diffstat (limited to '0013-Fix-linking-against-external-harfbuzz.patch')
| -rw-r--r-- | 0013-Fix-linking-against-external-harfbuzz.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/0013-Fix-linking-against-external-harfbuzz.patch b/0013-Fix-linking-against-external-harfbuzz.patch new file mode 100644 index 000000000000..789fb3f92db5 --- /dev/null +++ b/0013-Fix-linking-against-external-harfbuzz.patch @@ -0,0 +1,36 @@ +From 3bbcdf8e7657d5112e3d35e372786949424b5a37 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 + +--- + config.tests/unix/harfbuzz/harfbuzz.pro | 3 ++- + src/3rdparty/harfbuzz_dependency.pri | 4 +++- + 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 +--- a/config.tests/unix/harfbuzz/harfbuzz.pro ++++ b/config.tests/unix/harfbuzz/harfbuzz.pro +@@ -1,3 +1,4 @@ + SOURCES = harfbuzz.cpp + CONFIG -= qt dylib +-LIBS += -lharfbuzz ++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 +--- a/src/3rdparty/harfbuzz_dependency.pri ++++ b/src/3rdparty/harfbuzz_dependency.pri +@@ -2,5 +2,7 @@ contains(QT_CONFIG, harfbuzz) { + INCLUDEPATH += $$PWD/harfbuzz-ng/include + LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix() + } else:contains(QT_CONFIG, system-harfbuzz) { +- LIBS_PRIVATE += -lharfbuzz ++ # can't use 'feature' link_pkgconfig here because it would add harfbuzz to LIBS rather than LIBS_PRIVATE ++ contains(QT_CONFIG, static): LIBS_PRIVATE += $$system($$PKG_CONFIG --static --libs harfbuzz) ++ else: LIBS_PRIVATE += $$system($$PKG_CONFIG --libs harfbuzz) + } +-- +2.10.2 + |