mirror of https://git.wownero.com/dsc/mxe.git
186 lines
6.0 KiB
Diff
186 lines
6.0 KiB
Diff
This file is part of MXE.
|
|
See index.html for further information.
|
|
|
|
From b4a1284aa84466a5c757e1efd16a694d128b1038 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Thu, 6 Aug 2015 23:35:08 +0200
|
|
Subject: [PATCH 1/6] fix qwindows plugin linking with system-freetype (MXE
|
|
specific)
|
|
|
|
Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
|
|
|
|
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
|
|
index 39280de..e152b0d 100644
|
|
--- a/src/3rdparty/freetype_dependency.pri
|
|
+++ b/src/3rdparty/freetype_dependency.pri
|
|
@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
|
|
} else:contains(QT_CONFIG, system-freetype) {
|
|
# pull in the proper freetype2 include directory
|
|
include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
|
|
+ win32:shared:LIBS_PRIVATE += -lfreetype
|
|
}
|
|
--
|
|
2.1.4
|
|
|
|
|
|
From 217955a3e041e368857a696ebe8b512576d0cead Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Sat, 21 Jun 2014 13:12:49 +0200
|
|
Subject: [PATCH 2/6] use pkg-config for harfbuzz (MXE specific)
|
|
|
|
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
|
|
|
|
diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
|
|
index 32edd6e..a7f2c28 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
|
|
+CONFIG += link_pkgconfig
|
|
+PKGCONFIG += harfbuzz
|
|
diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
|
|
index 7443368..c24e684 100644
|
|
--- a/src/3rdparty/harfbuzz_dependency.pri
|
|
+++ b/src/3rdparty/harfbuzz_dependency.pri
|
|
@@ -2,5 +2,6 @@ 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
|
|
+ CONFIG += link_pkgconfig
|
|
+ PKGCONFIG += harfbuzz
|
|
}
|
|
--
|
|
2.1.4
|
|
|
|
|
|
From 81c61f1cf8a2b8ea01545212081427eed0ab2950 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Mon, 8 Dec 2014 14:15:12 +0100
|
|
Subject: [PATCH 3/6] fix oci config test on windows
|
|
|
|
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
|
|
|
|
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
|
|
index 3ffda1d..39b6f3759 100644
|
|
--- a/config.tests/unix/oci/oci.pro
|
|
+++ b/config.tests/unix/oci/oci.pro
|
|
@@ -1,3 +1,3 @@
|
|
SOURCES = oci.cpp
|
|
CONFIG -= qt dylib
|
|
-LIBS += -lclntsh
|
|
+!win32:LIBS += -lclntsh
|
|
--
|
|
2.1.4
|
|
|
|
|
|
From b656a46abeecfa7ace2e08393b63412e74c62589 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Thu, 6 Aug 2015 13:24:56 +0200
|
|
Subject: [PATCH 4/6] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
|
|
|
|
Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
|
|
|
|
diff --git a/configure b/configure
|
|
index cea62fb..d6bbcd2 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4464,7 +4464,7 @@ fi
|
|
[ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android"
|
|
|
|
# check IPC support
|
|
-if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
|
|
+if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then
|
|
# SYSV IPC is not supported - check POSIX IPC
|
|
if compileTest unix/ipc_posix "ipc_posix" ; then
|
|
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
|
|
--
|
|
2.1.4
|
|
|
|
|
|
From ae120a60f2f31c911a451036ecd826b4486e2d3f Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Tue, 6 Oct 2015 09:53:20 +0200
|
|
Subject: [PATCH 5/6] fix building mysql driver under mingw
|
|
|
|
Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
|
|
|
|
diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
|
|
index 3cfb614..8b7063f 100644
|
|
--- a/src/sql/drivers/mysql/qsql_mysql.pri
|
|
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
|
|
@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
|
|
QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
|
|
LIBS += $$QT_LFLAGS_MYSQL
|
|
|
|
-unix {
|
|
+if (unix|mingw) {
|
|
isEmpty(QT_LFLAGS_MYSQL) {
|
|
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
|
|
use_libmysqlclient_r:LIBS += -lmysqlclient_r
|
|
--
|
|
2.1.4
|
|
|
|
|
|
From 9f47024d54abca4590fc1954015d14df40b23755 Mon Sep 17 00:00:00 2001
|
|
From: Boris Nagaev <bnagaev@gmail.com>
|
|
Date: Sun, 18 Oct 2015 23:11:28 +0300
|
|
Subject: [PATCH 6/6] configure: fix log corruption with option -v
|
|
|
|
This bug occurs if ./configure is called with -v on systems on
|
|
which fd proc entries point to the files/devices they are open
|
|
on instead of being magic nodes which would basically dup() the
|
|
actual fds (e.g., Linux).
|
|
|
|
In this case, the command "tee $tty" appends to /dev/stderr, which
|
|
may be already opened by the parent process. This breaks the log file.
|
|
|
|
Normally, the log file starts with
|
|
|
|
This is the Qt Open Source Edition.
|
|
...
|
|
|
|
but with `-v` flag it would start with output of awkprog and maybe
|
|
some zero bytes. Zero bytes are observed on Debian Wheezy.
|
|
|
|
DEFAULT_INCDIRS=...
|
|
...
|
|
^@^@^@^@^@^@^@^@^@^@^@^@...
|
|
Done running configuration tests.
|
|
...
|
|
|
|
To fix this problem, the output of `...` is saved to a variable, and
|
|
then eval'd and echo'd (if -v).
|
|
|
|
This solution was found by Tony Theodore.
|
|
https://github.com/mxe/mxe/issues/938#issuecomment-149770348
|
|
|
|
Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77
|
|
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36)
|
|
|
|
diff --git a/configure b/configure
|
|
index d6bbcd2..def691f 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3571,10 +3571,9 @@ END {
|
|
print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n";
|
|
}'
|
|
|
|
-unset tty
|
|
-[ "$OPT_VERBOSE" = "yes" ] && tty=/dev/stderr
|
|
-eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`"
|
|
-unset tty
|
|
+awkprog_result=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog"`
|
|
+eval "$awkprog_result"
|
|
+[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result"
|
|
|
|
#setup the build parts
|
|
if [ -z "$CFG_BUILD_PARTS" ]; then
|
|
--
|
|
2.1.4
|
|
|