Martchus
/
PKGBUILDs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
PKGBUILDs/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-st...

31 lines
1.4 KiB
Diff
Raw Normal View History

Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
Subject: [PATCH 11/34] Fix linking against static freetype2
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
---
Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
src/gui/configure.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
diff --git a/src/gui/configure.json b/src/gui/configure.json
Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
index 9124e3e77e..f3628f415d 100644
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
@@ -237,8 +237,11 @@
Update mingw-w64-qt5-* packages to 5.9.2
2017-10-13 21:29:48 +02:00
},
Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
"headers": "ft2build.h",
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
"sources": [
- { "type": "pkgConfig", "args": "freetype2" },
Update Qt packages to 5.12.0
2018-12-08 22:06:32 +01:00
- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
+ { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
+ { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
Update Qt packages to 5.12.0
2018-12-08 22:06:32 +01:00
+ { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
+ { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
+ { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
Update Qt packages to 5.12.1
2019-02-02 18:18:25 +01:00
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
],
"use": [
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00
--
Fix use of static Qt with CMake
2018-12-22 00:04:30 +01:00
2.20.1
Update mingw-w64-qt5-* to 5.8.0 * Adapt hacks to new config system * Use distinct mkspec mingw-w64-g++ rather than patching the existing win32-g++ * Testing QML and ANGLE is on TODO list because it hasn't been tested since quite a time
2017-01-23 21:37:13 +01:00