Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
David Youssefi
otb
Commits
c834ef03
Commit
c834ef03
authored
Jul 27, 2020
by
Cédric Traizet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: patch for png and freetype detection
parent
87e74857
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
0 deletions
+30
-0
SuperBuild/patches/QT5/qt5-2-png-freetype-detection-all.diff
SuperBuild/patches/QT5/qt5-2-png-freetype-detection-all.diff
+30
-0
No files found.
SuperBuild/patches/QT5/qt5-2-png-freetype-detection-all.diff
0 → 100644
View file @
c834ef03
diff -burN qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json--- qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json 2020-07-27 18:13:35.779000908 +0200
+++ qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json 2020-07-27 18:18:11.226987484 +0200
@@ -239,10 +239,10 @@
},
"headers": "ft2build.h",
"sources": [
- { "type": "pkgConfig", "args": "freetype2" },
{ "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
- { "libs": "-lfreetype" }
+ { "libs": "-lfreetype" },
+ { "type": "pkgConfig", "args": "freetype2" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
@@ -397,12 +397,12 @@
},
"headers": "png.h",
"sources": [
- { "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng16", "condition": "config.msvc" },
{ "libs": "-llibpng", "condition": "config.msvc" },
{ "libs": "-lpng16", "condition": "!config.msvc" },
{ "libs": "-lpng", "condition": "!config.msvc" },
- { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
+ { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" },
+ { "type": "pkgConfig", "args": "libpng" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment