mirror of https://git.wownero.com/dsc/mxe.git
package qt: compatibility fix for dbus
This commit is contained in:
Mark Brand
parent
71bf801ba9
commit
8471e48784
|
|
@ -8,7 +8,7 @@ Also contains MXE specific fixes.
|
|||
From 26c66cfa7befc296f0c2196e4cc05f6fbc4ff927 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 13 Jan 2012 00:17:48 +0100
|
||||
Subject: [PATCH 01/15] remove trailing whitespace
|
||||
Subject: [PATCH 01/16] remove trailing whitespace
|
||||
|
||||
backported from qt5/qtbase
|
||||
Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
|
||||
|
|
@ -29,13 +29,13 @@ index 9090773..859ec8d 100644
|
|||
../plugins/codecs/tw/qbig5codec.h \
|
||||
../plugins/codecs/jp/qfontjpcodec.h
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 55f1b97b2a5e81ab5cb619cc4534268c1b6b33b6 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 30 Jun 2011 10:22:33 +0200
|
||||
Subject: [PATCH 02/15] do not detect or configure iconv for Windows
|
||||
Subject: [PATCH 02/16] do not detect or configure iconv for Windows
|
||||
|
||||
Qt doesn't use iconv on Windows, but configuring it will appear to
|
||||
work and the build will complete. The result is that character
|
||||
|
|
@ -63,13 +63,13 @@ index e3d464b..699a35c 100755
|
|||
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
|
||||
CFG_ICONV=yes
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From f29250542c9d73b69ae4711d152811dca9e111ce Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Wed, 18 Jan 2012 11:43:10 +0100
|
||||
Subject: [PATCH 03/15] fix whitespace
|
||||
Subject: [PATCH 03/16] fix whitespace
|
||||
|
||||
backported from qt5/qtbase
|
||||
Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
|
||||
|
|
@ -137,13 +137,13 @@ index 859ec8d..70cd890 100644
|
|||
../plugins/codecs/tw/qbig5codec.cpp \
|
||||
../plugins/codecs/jp/qfontjpcodec.cpp
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 6858fb1d980c4121ea53eff9ecdb746cad0ea729 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 4 Jul 2011 00:42:24 +0200
|
||||
Subject: [PATCH 04/15] build and load text codecs regardless of iconv and
|
||||
Subject: [PATCH 04/16] build and load text codecs regardless of iconv and
|
||||
platform
|
||||
|
||||
Otherwise applications linking to static Qt may have to import
|
||||
|
|
@ -279,13 +279,13 @@ index ca5c879..780ff5d 100644
|
|||
#endif // QT_NO_CODECS
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 945790530a3461ba920eed32e65f32cddff7cc24 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 13 Jan 2012 00:24:13 +0100
|
||||
Subject: [PATCH 05/15] move plugin text codecs to QtCore
|
||||
Subject: [PATCH 05/16] move plugin text codecs to QtCore
|
||||
|
||||
Having plugin text codecs adds considerable complexity to
|
||||
configuring Qt. The plugin interface is designed for optional
|
||||
|
|
@ -79230,13 +79230,13 @@ index 94ce675..c4af49b 100644
|
|||
!embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems
|
||||
embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 804f0db4ce4f40bee7178dab70500032e2163e9c Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Wed, 18 Jan 2012 21:01:26 +0100
|
||||
Subject: [PATCH 06/15] update private header references
|
||||
Subject: [PATCH 06/16] update private header references
|
||||
|
||||
backported from qt5/qtbase
|
||||
Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
|
||||
|
|
@ -79393,13 +79393,13 @@ index c631dea..e82efde 100644
|
|||
#include <QtCore/qlist.h>
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From b314e24c94453f7eca253e50f126f310e7467a67 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 3 Jul 2011 21:53:27 +0200
|
||||
Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs
|
||||
Subject: [PATCH 07/16] cosmetic adjustments for files moved to core/codecs
|
||||
|
||||
-update old reference to 'plugin'
|
||||
-rename multiple inclusion guards
|
||||
|
|
@ -79885,13 +79885,13 @@ index e82efde..5c23ca4 100644
|
|||
-#endif // QSJISCODEC_H
|
||||
+#endif // QSJISCODEC_P_H
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 932c5edc9dd7eac3815b5802eec295b05382ab72 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 12 Jan 2012 10:43:29 +0100
|
||||
Subject: [PATCH 08/15] remove obsolete codec plugin loading code
|
||||
Subject: [PATCH 08/16] remove obsolete codec plugin loading code
|
||||
|
||||
backported from qt5/qtbase
|
||||
Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
|
||||
|
|
@ -80422,13 +80422,13 @@ index 04ac185..21838ed 100644
|
|||
#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
|
||||
#define QT_NO_COLORDIALOG
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From ace3dbf1f6946c16c2330e807637621be9c59dc7 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 23 Jan 2012 23:12:46 +0100
|
||||
Subject: [PATCH 09/15] remove vestiges of text codec plugins
|
||||
Subject: [PATCH 09/16] remove vestiges of text codec plugins
|
||||
|
||||
follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
|
||||
|
||||
|
|
@ -80456,13 +80456,13 @@ index dea05e0..12cd8ea 100644
|
|||
Description: Supports translations using QObject::tr().
|
||||
Section: Internationalization
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 48e5806ddbd8786c8e72e4835f10fdfb0038e84d Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 3 Nov 2011 15:10:26 +0100
|
||||
Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific)
|
||||
Subject: [PATCH 10/16] use pkg-config for libmng (MXE specific)
|
||||
|
||||
Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
|
||||
|
||||
|
|
@ -80482,13 +80482,13 @@ index ffb98de..6aab68f 100644
|
|||
} else {
|
||||
include($$PWD/../../3rdparty/libmng.pri)
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From f7ab3cc652a6b63bdff144563df93373379186f0 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Thu, 3 Nov 2011 14:11:02 +0100
|
||||
Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific)
|
||||
Subject: [PATCH 11/16] use pkg-config for libtiff-4 (MXE specific)
|
||||
|
||||
Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
|
||||
|
||||
|
|
@ -80508,13 +80508,13 @@ index e1cc3ee..71cbab1 100644
|
|||
} else {
|
||||
include($$PWD/../../3rdparty/libtiff.pri)
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 05452c3fadf80400e968df08fb073fe4a0723227 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat, 5 Jun 2010 23:41:04 +0200
|
||||
Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE
|
||||
Subject: [PATCH 12/16] restore support for static linking of QtWebKit (MXE
|
||||
specific)
|
||||
|
||||
Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
|
||||
|
|
@ -80611,13 +80611,13 @@ index 9be0f4a..6744f58 100644
|
|||
build-qtscript {
|
||||
SUBDIRS += \
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 8ef7f77bd3fb66152e466c5d110503c14f26a12d Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Thu, 1 Sep 2011 13:47:10 +0200
|
||||
Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific)
|
||||
Subject: [PATCH 13/16] fix building on GNU/kFreeBSD (MXE specific)
|
||||
|
||||
This patch has been taken from:
|
||||
|
||||
|
|
@ -80642,14 +80642,14 @@ index 8346e46..51aed78 100644
|
|||
# define Q_OS_NETBSD
|
||||
# define Q_OS_BSD4
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From be982852ea7a223296fa7aff352f6f5e99d18b9f Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Thu, 1 Sep 2011 13:49:47 +0200
|
||||
Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD
|
||||
(MXE specific)
|
||||
Subject: [PATCH 14/16] fix missing platform when building on GNU/kFreeBSD (MXE
|
||||
specific)
|
||||
|
||||
This patch is inspired by:
|
||||
http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD
|
||||
|
|
@ -80673,13 +80673,13 @@ index bad107a..9aa9126 100755
|
|||
PLATFORM=dgux-g++
|
||||
;;
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 85989caf16b4e60e66e790988302243c5f5e12eb Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Thu, 1 Sep 2011 13:51:50 +0200
|
||||
Subject: [PATCH 15/15] fix building on dragonfly (MXE specific)
|
||||
Subject: [PATCH 15/16] fix building on dragonfly (MXE specific)
|
||||
|
||||
This patch is inspired by:
|
||||
http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
|
||||
|
|
@ -80700,5 +80700,53 @@ index 9aa9126..8643338 100755
|
|||
PLATFORM_NOTES="
|
||||
- Also available for FreeBSD: freebsd-icc
|
||||
--
|
||||
1.7.10.4
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 2c09dcd265e95d618be390263569f9f2c2ca01ac Mon Sep 17 00:00:00 2001
|
||||
From: Matt Fischer <matt.fischer@garmin.com>
|
||||
Date: Thu, 28 Feb 2013 10:52:12 -0600
|
||||
Subject: [PATCH 16/16] Fixed -dbus-linked when cross-compiling from Windows
|
||||
|
||||
Since Windows doesn't have pkg-config, it doesn't get -ldbus-1
|
||||
added to the command line automatically like Linux does. Code
|
||||
was present to deal with this case, however it was only configured
|
||||
to work when native-compiling Qt. The flag was not added when
|
||||
cross-compiling, meaning that -dbus-linked did not work correctly
|
||||
in that case. This patch changes the code to add the flag properly
|
||||
in both cases.
|
||||
|
||||
Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9
|
||||
Task-number: QTBUG-29984
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
(cherry-picked from qtbase/c82b0815ec80b3750a110d47c68142bb448ddf56)
|
||||
|
||||
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
|
||||
index 37e5925..56527ad 100644
|
||||
--- a/src/dbus/dbus.pro
|
||||
+++ b/src/dbus/dbus.pro
|
||||
@@ -6,6 +6,12 @@ CONFIG += link_pkgconfig
|
||||
DEFINES += QT_BUILD_DBUS_LIB \
|
||||
DBUS_API_SUBJECT_TO_CHANGE
|
||||
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
|
||||
+
|
||||
+isEmpty(QT_LIBS_DBUS) {
|
||||
+ win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d
|
||||
+ else:QT_LIBS_DBUS += -ldbus-1
|
||||
+}
|
||||
+
|
||||
contains(QT_CONFIG, dbus-linked) {
|
||||
LIBS_PRIVATE += $$QT_LIBS_DBUS
|
||||
DEFINES += QT_LINKED_LIBDBUS
|
||||
@@ -25,8 +31,6 @@ win32 {
|
||||
-ladvapi32 \
|
||||
-lnetapi32 \
|
||||
-luser32
|
||||
- CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d
|
||||
- else:LIBS_PRIVATE += -ldbus-1
|
||||
}
|
||||
include(../qbase.pri)
|
||||
PUB_HEADERS = qdbusargument.h \
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue