From ac98a24c50b69bd3892f18ba0d347fbaa3ae7ad5 Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau <antoine.regimbeau@c-s.fr> Date: Tue, 10 Apr 2018 16:41:46 +0200 Subject: [PATCH] SuperBuild: add patch to fix lib and include dir --- .../QT5/qt5.1-png-freetype-detection-all.diff | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 SuperBuild/patches/QT5/qt5.1-png-freetype-detection-all.diff diff --git a/SuperBuild/patches/QT5/qt5.1-png-freetype-detection-all.diff b/SuperBuild/patches/QT5/qt5.1-png-freetype-detection-all.diff new file mode 100644 index 0000000000..1a46b0acd8 --- /dev/null +++ b/SuperBuild/patches/QT5/qt5.1-png-freetype-detection-all.diff @@ -0,0 +1,25 @@ +--- qt-everywhere-src-5.10.1/qtbase/src/gui/configure.json 2018-02-08 19:24:48.000000000 +0100 ++++ QT5/src/QT5/qtbase/src/gui/configure.json 2018-04-10 14:34:05.529668610 +0200 +@@ -158,8 +158,8 @@ + ] + }, + "sources": [ +- { "type": "pkgConfig", "args": "freetype2" }, +- { "type": "freetype", "libs": "-lfreetype" } ++ { "type": "freetype", "libs": "-lfreetype" }, ++ { "type": "pkgConfig", "args": "freetype2" } + ] + }, + "fontconfig": { +@@ -289,9 +289,9 @@ + "main": "(void) png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);" + }, + "sources": [ +- { "type": "pkgConfig", "args": "libpng" }, ++ { "libs": "-lpng", "condition": "!config.msvc" }, + { "libs": "-llibpng", "condition": "config.msvc" }, +- { "libs": "-lpng", "condition": "!config.msvc" } ++ { "type": "pkgConfig", "args": "libpng" } + ], + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } -- GitLab