From ebc859ef6c714792c383b3be39e809e7e04bb017 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 20 May 2014 23:53:39 +0200 Subject: update qt5 modules --- index.html | 8 +++++ src/qtactiveqt-1.patch | 16 +++++---- src/qtactiveqt.mk | 2 +- src/qtbase-1.patch | 77 +++++++++++++++-------------------------- src/qtbase.mk | 6 ++-- src/qtconnectivity.mk | 2 +- src/qtdeclarative-1-fixes.patch | 65 ---------------------------------- src/qtdeclarative.mk | 2 +- src/qtenginio.mk | 21 +++++++++++ src/qtgraphicaleffects.mk | 2 +- src/qtimageformats-1.patch | 20 +++++------ src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- src/qtmultimedia-1.patch | 45 ------------------------ src/qtmultimedia.mk | 4 ++- src/qtquick1.mk | 2 +- src/qtquickcontrols.mk | 2 +- src/qtscript.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialport.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools-1.patch | 25 +++++++++++++ src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 21 +++++++++++ src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 28 files changed, 144 insertions(+), 198 deletions(-) delete mode 100644 src/qtdeclarative-1-fixes.patch create mode 100644 src/qtenginio.mk delete mode 100644 src/qtmultimedia-1.patch create mode 100644 src/qttools-1.patch create mode 100644 src/qtwebsockets.mk diff --git a/index.html b/index.html index 09a7aaa..13cc715 100644 --- a/index.html +++ b/index.html @@ -2102,6 +2102,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt + qtenginio + Qt + + qtgraphicaleffects Qt @@ -2166,6 +2170,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt + qtwebsockets + Qt + + qtwinextras Qt diff --git a/src/qtactiveqt-1.patch b/src/qtactiveqt-1.patch index 08e6b6e..38d24aa 100644 --- a/src/qtactiveqt-1.patch +++ b/src/qtactiveqt-1.patch @@ -1,23 +1,25 @@ This file is part of MXE. See index.html for further information. -From 7779365c9bd2741e28f16f99e2df19e4597e1c69 Mon Sep 17 00:00:00 2001 +From 470bf2340d0c275d9e02492f11e4103e081d1f93 Mon Sep 17 00:00:00 2001 From: Mark Brand -Date: Sat, 18 May 2013 15:28:33 +0200 +Date: Wed, 21 May 2014 08:59:53 +0200 Subject: [PATCH] Revert "idc is a host tool" This reverts commit a52db1a707f84eae74ce1cc3d1058f026e81ac13. +Conflicts: + src/tools/idc/idc.pro + diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro -index b9d8dee..05a592a 100644 +index 1898ed5..524ee2e 100644 --- a/src/tools/idc/idc.pro +++ b/src/tools/idc/idc.pro -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -option(host_build) -- - QT = core - + CONFIG += force_bootstrap SOURCES = main.cpp + -- 1.8.4.5 diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index 1f81904..d84ab91 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 31441f01c9d271c61cf289e372af3f4f9f0478e1 +$(PKG)_CHECKSUM := 573957a004c5d9af3267a77f958e18da5330994c $(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL)) diff --git a/src/qtbase-1.patch b/src/qtbase-1.patch index ea25b56..9eb07f0 100644 --- a/src/qtbase-1.patch +++ b/src/qtbase-1.patch @@ -1,56 +1,10 @@ This file is part of MXE. See index.html for further information. -From ce5c490ce4d6612a20cbfa2ed85e493af9513268 Mon Sep 17 00:00:00 2001 -From: Nicolas Cornu -Date: Thu, 28 Nov 2013 00:06:41 +0100 -Subject: [PATCH 1/3] Allow temporary databases in sqlite driver - -http://www3.sqlite.org/inmemorydb.html#temp_db -[ChangeLog][QtSql][QSQLITE] Enable creating temporary databases - -Change-Id: I9972fba5c91eca55cfc5a84f94cff03d19992324 -Reviewed-by: Tobias Koenig -Reviewed-by: Mark Brand -(cherry picked from commit 9de879c8a43a012254036d7f08b55793fa325cb2) - -diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc -index f1fd2f6..9858e30 100644 ---- a/src/sql/doc/src/sql-driver.qdoc -+++ b/src/sql/doc/src/sql-driver.qdoc -@@ -531,8 +531,8 @@ - is not necessary to have a database server. SQLite operates on a - single file, which must be set as the database name when opening - a connection. If the file does not exist, SQLite will try to -- create it. SQLite also supports in-memory databases, simply pass -- ":memory:" as the database name. -+ create it. SQLite also supports in-memory and temporary databases. Simply -+ pass respectively ":memory:" or an empty string as the database name. - - SQLite has some restrictions regarding multiple users and - multiple transactions. If you try to read/write on a resource from different -diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp -index c98d643..55ef092 100644 ---- a/src/sql/drivers/sqlite/qsql_sqlite.cpp -+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp -@@ -597,9 +597,6 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c - if (isOpen()) - close(); - -- if (db.isEmpty()) -- return false; -- - int timeOut = 5000; - bool sharedCache = false; - bool openReadOnlyOption = false; --- -1.8.4.5 - - -From 428f22caa4b1f0283821f25d4df639a674a075e3 Mon Sep 17 00:00:00 2001 +From 6999f62177783a39628b0916750fa4870543c24c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 26 Feb 2013 13:23:33 +0100 -Subject: [PATCH 2/3] use pkg-config for freetype +Subject: [PATCH 1/3] use pkg-config for freetype Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a @@ -70,10 +24,10 @@ index 88be809..8fc19d2 100644 1.8.4.5 -From 802941a977d99c1942bfca13d4fee6fc11c31fee Mon Sep 17 00:00:00 2001 +From cbb4f962f9744c4488b67b2ea28619ac1c990117 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 May 2013 23:07:46 +0200 -Subject: [PATCH 3/3] use pkgconfig for icu detection (MXE specific) +Subject: [PATCH 2/3] use pkgconfig for icu detection (MXE specific) Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3 @@ -103,3 +57,26 @@ index 2c1b431..e29798b 100644 -- 1.8.4.5 + +From 6a595942f1eb699a3d694e674f39bb7e9b0cf4f3 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sat, 8 Feb 2014 02:09:25 +0100 +Subject: [PATCH 3/3] extra windows.h for mingw4 compatibility + +Change-Id: I0dcf3b45f3eba31309525f14aee569afa5e1fd0a + +diff --git a/src/plugins/bearer/nativewifi/platformdefs.h b/src/plugins/bearer/nativewifi/platformdefs.h +index 4e0f6d5..7855462 100644 +--- a/src/plugins/bearer/nativewifi/platformdefs.h ++++ b/src/plugins/bearer/nativewifi/platformdefs.h +@@ -42,6 +42,7 @@ + #ifndef PLATFORMDEFS_H + #define PLATFORMDEFS_H + ++#include + #include + #undef interface + +-- +1.8.4.5 + diff --git a/src/qtbase.mk b/src/qtbase.mk index 30382e9..b20f15b 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,11 +3,11 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.1 -$(PKG)_CHECKSUM := 32cfec62138a478361711cb5f6c8d1c60a3d8c08 +$(PKG)_VERSION := 5.3.0 +$(PKG)_CHECKSUM := d4344110677cceb5f39819d1ea490ef397f5e4be $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://download.qt-project.org/official_releases/qt/5.2/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_URL := http://download.qt-project.org/official_releases/qt/5.3/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c define $(PKG)_UPDATE diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 1fc57a4..1a50c52 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2ec79e4869ed8b95f5fff8b4e30f33591cd73ccb +$(PKG)_CHECKSUM := b6ad220194dac278bb63fdfbed35f37fd3e88cb3 $(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL)) diff --git a/src/qtdeclarative-1-fixes.patch b/src/qtdeclarative-1-fixes.patch deleted file mode 100644 index 9ec5a73..0000000 --- a/src/qtdeclarative-1-fixes.patch +++ /dev/null @@ -1,65 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -https://github.com/qtproject/qtdeclarative/commit/156bb6ed1aafe96a1d5ea85e3ad8445d6e785bcb - -From 156bb6ed1aafe96a1d5ea85e3ad8445d6e785bcb Mon Sep 17 00:00:00 2001 -From: Konstantin Ritt -Date: Wed, 26 Mar 2014 20:29:29 +0200 -Subject: [PATCH] Fix build on older MinGW - -The correct declaration of the SHGetPathFromIDList symbol is -being used in mingw-w64 as of r6215, which is a v3 snapshot; -until then, SHGetPathFromIDList was declared to use LPITEMIDLIST. - -Change-Id: Icc2f7814bad475c9b825f7d70c0ae4da72f471d9 -Reviewed-by: Friedemann Kleint -Reviewed-by: Kai Koehne -Reviewed-by: Simon Hausmann ---- - src/qml/qml/qqmlengine.cpp | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp -index d927a8c..d378d77 100644 ---- a/src/qml/qml/qqmlengine.cpp -+++ b/src/qml/qml/qqmlengine.cpp -@@ -109,7 +109,9 @@ - #include - #include - --#define CSIDL_APPDATA 0x001a // \Application Data -+#ifndef CSIDL_APPDATA -+# define CSIDL_APPDATA 0x001a // \Application Data -+#endif - #endif - - Q_DECLARE_METATYPE(QQmlProperty) -@@ -2302,12 +2304,23 @@ static inline QString shellNormalizeFileName(const QString &name) - { - const QString nativeSeparatorName(QDir::toNativeSeparators(name)); - const LPCTSTR nameC = reinterpret_cast(nativeSeparatorName.utf16()); -+// The correct declaration of the SHGetPathFromIDList symbol is -+// being used in mingw-w64 as of r6215, which is a v3 snapshot. -+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) -+ ITEMIDLIST file; -+ if (FAILED(SHParseDisplayName(nameC, NULL, &file, 0, NULL))) -+ return name; -+ TCHAR buffer[MAX_PATH]; -+ if (!SHGetPathFromIDList(&file, buffer)) -+ return name; -+#else - PIDLIST_ABSOLUTE file; - if (FAILED(SHParseDisplayName(nameC, NULL, &file, 0, NULL))) - return name; - TCHAR buffer[MAX_PATH]; - if (!SHGetPathFromIDList(file, buffer)) - return name; -+#endif - QString canonicalName = QString::fromWCharArray(buffer); - // Upper case drive letter - if (canonicalName.size() > 2 && canonicalName.at(1) == QLatin1Char(':')) --- -1.9.1 - diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index 5290ee2..f722c5a 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1875e93665255ee4ef1694d946cd20c0861ac60d +$(PKG)_CHECKSUM := 2cc91a01804fec2eb49d814c82e85fc33fa7c52e $(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL)) diff --git a/src/qtenginio.mk b/src/qtenginio.mk new file mode 100644 index 0000000..f7e946c --- /dev/null +++ b/src/qtenginio.mk @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtenginio +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 5f977761a90e19aa36d2ea1770f0cbb1fe2ac087 +$(PKG)_SUBDIR = $(subst qtbase,qtenginio,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtenginio,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtenginio,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 3682bbe..c446006 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 649765bb8054abccbd1002606469f56bba5cab25 +$(PKG)_CHECKSUM := a13cba42e436ac4bd5fd83e4567474f350b6a940 $(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL)) diff --git a/src/qtimageformats-1.patch b/src/qtimageformats-1.patch index 30e5fcd..4edb348 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 44d6697bd01bbd489c90d3a0f64cd8ecfcb29eb3 Mon Sep 17 00:00:00 2001 +From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 3 Nov 2011 14:11:02 +0100 Subject: [PATCH 1/2] add pkg-config support for libtiff-4 @@ -9,27 +9,27 @@ Subject: [PATCH 1/2] add pkg-config support for libtiff-4 Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro -index 47a8437..bd2c6b0 100644 +index f7ac4c1..bd2c6b0 100644 --- a/config.tests/libtiff/libtiff.pro +++ b/config.tests/libtiff/libtiff.pro @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle win32:CONFIG += console --unix|win32-g++*: LIBS += -ltiff +-unix|mingw: LIBS += -ltiff +CONFIG += link_pkgconfig +packagesExist(libtiff-4):PKGCONFIG += libtiff-4 +else:if(unix|win32-g++*): LIBS += -ltiff else:win32: LIBS += libtiff.lib diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro -index 353e3f3..fa22141 100644 +index 0f841ab..fa22141 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp OTHER_FILES += tiff.json config_libtiff { -- unix|win32-g++*: LIBS += -ltiff +- unix|mingw: LIBS += -ltiff + CONFIG += link_pkgconfig + packagesExist(libtiff-4):PKGCONFIG += libtiff-4 + else:if(unix|win32-g++*): LIBS += -ltiff @@ -40,7 +40,7 @@ index 353e3f3..fa22141 100644 1.8.4.5 -From 8dea742660bb9d1196c4b05cf5b22fb4f4e41595 Mon Sep 17 00:00:00 2001 +From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 19 Dec 2012 23:29:52 +0100 Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) @@ -48,27 +48,27 @@ Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) Change-Id: I1216f35a01a974321efa2463b687c121baa22667 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro -index 7a45825..a20a0a0 100644 +index adc096e..a20a0a0 100644 --- a/config.tests/libmng/libmng.pro +++ b/config.tests/libmng/libmng.pro @@ -2,5 +2,7 @@ SOURCES = libmng.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle win32:CONFIG += console --unix|win32-g++*: LIBS += -lmng +-unix|mingw: LIBS += -lmng +CONFIG += link_pkgconfig +packagesExist(libmng):PKGCONFIG += libmng +else:if(unix|win32-g++*): LIBS += -lmng else:win32: LIBS += libmng.lib diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri -index cdf17c5..00cd0b3 100644 +index 5c0fff1..00cd0b3 100644 --- a/src/plugins/imageformats/mng/qmnghandler.pri +++ b/src/plugins/imageformats/mng/qmnghandler.pri @@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD HEADERS += $$PWD/qmnghandler_p.h SOURCES += $$PWD/qmnghandler.cpp config_libmng { -- unix|win32-g++*: LIBS += -lmng +- unix|mingw: LIBS += -lmng + CONFIG += link_pkgconfig + packagesExist(libmng):PKGCONFIG += libmng + else:if(unix|win32-g++*): LIBS += -lmng diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index d59e621..936a550 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6b08d46ef9147a5942e07f7c6b664d554f527e3a +$(PKG)_CHECKSUM := 9ab03e5744adea185f92af5bf5c99c51bbefc438 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) diff --git a/src/qtlocation.mk b/src/qtlocation.mk index a6e254d..2215e7f 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 40a73c0d94acadd35d1233affdef462206a91187 +$(PKG)_CHECKSUM := 19d8b2221b4a048998c51b8ab508ec0b26bd391c $(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL)) diff --git a/src/qtmultimedia-1.patch b/src/qtmultimedia-1.patch deleted file mode 100644 index e416fc9..0000000 --- a/src/qtmultimedia-1.patch +++ /dev/null @@ -1,45 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 678830f6f5e3e9c8112a40983be7f9fefc3e91b3 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Thu, 13 Dec 2012 20:23:48 +0100 -Subject: [PATCH] remove duplicate defs (mxe-specific) - - -diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp -index e9503d4..b92aa98 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp -+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp -@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT; - #else - - extern GUID CLSID_AudioInputDeviceCategory; --extern GUID CLSID_AudioRendererCategory; --extern GUID IID_ICreateDevEnum; --extern GUID CLSID_SystemDeviceEnum; -+//extern GUID CLSID_AudioRendererCategory; -+//extern GUID IID_ICreateDevEnum; -+//extern GUID CLSID_SystemDeviceEnum; - - #ifndef __ICreateDevEnum_INTERFACE_DEFINED__ - #define __ICreateDevEnum_INTERFACE_DEFINED__ - --DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) --{ -- STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, -- IEnumMoniker **ppEnumMoniker, -- DWORD dwFlags) PURE; --}; -+//DECLARE_INTERFACE_(ICreateDevEnum, IUnknown) -+//{ -+// STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass, -+// IEnumMoniker **ppEnumMoniker, -+// DWORD dwFlags) PURE; -+//}; - - #endif // __ICreateDevEnum_INTERFACE_DEFINED__ - --- -1.8.4.5 - diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index a830041..7f3d0e6 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0c686a2174c02e27bbf912a16b2939bf8b3e873d +$(PKG)_CHECKSUM := dfe2adf633321d000fa75d59bb6924e050bd3e6b $(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) @@ -19,3 +19,5 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef + +$(PKG)_BUILD_i686-pc-mingw32 = diff --git a/src/qtquick1.mk b/src/qtquick1.mk index dd9f731..0575480 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -4,7 +4,7 @@ PKG := qtquick1 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6013b6446be890cd4b27756bbb445072b53b1aa5 +$(PKG)_CHECKSUM := 97d9204d4ca8f2baa3fb2601d16e48596df86284 $(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL)) diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index bb9b9c8..6ca2210 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9fc54633504a593eb31b3bd71ed0a016fd5ddc65 +$(PKG)_CHECKSUM := 4ee9ad4dc0136b022d1d818e5ec8fca9f9d450ae $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL)) diff --git a/src/qtscript.mk b/src/qtscript.mk index 7a872db..a4a4240 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 329290ebb443966cbd9443189ced39a933de88e2 +$(PKG)_CHECKSUM := 7a4d5e78874f1a4ecaa5eee29aeb9e9baf8e430a $(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL)) diff --git a/src/qtsensors.mk b/src/qtsensors.mk index fd676b7..fd341bf 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5c9bd1be9920834cbd3cd1345235dab2dac9da44 +$(PKG)_CHECKSUM := c7965141ae46cad604afb39f805f94af9813a03c $(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL)) diff --git a/src/qtserialport.mk b/src/qtserialport.mk index 6c48980..fced262 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 929b27f7d67a44cd7f9fc138f0c1300145d7e517 +$(PKG)_CHECKSUM := f69a44a80de514ef002104b1f1e9dd4f7629ffc0 $(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL)) diff --git a/src/qtsvg.mk b/src/qtsvg.mk index 22ece5a..e94d987 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8ffaafb48566699386546b4316afce83025f4090 +$(PKG)_CHECKSUM := 28d140bea1a46dca962e5708ef12dba61a391414 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL)) diff --git a/src/qttools-1.patch b/src/qttools-1.patch new file mode 100644 index 0000000..8e4dc9f --- /dev/null +++ b/src/qttools-1.patch @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +From 5598f4297656326fd8a50fad2323fd5fe7e48653 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 21 May 2014 11:31:45 +0200 +Subject: [PATCH] disable windeployqt (MXE specific) + + +diff --git a/src/src.pro b/src/src.pro +index a07a3bb..bfbf722 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -27,7 +27,7 @@ android { + + qtHaveModule(dbus): SUBDIRS += qdbus + +-win32|winrt:SUBDIRS += windeployqt ++#win32|winrt:SUBDIRS += windeployqt + winrt:SUBDIRS += winrtrunner qtd3dservice + + qtNomakeTools( \ +-- +1.8.4.5 + diff --git a/src/qttools.mk b/src/qttools.mk index 899937a..f16f795 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 3b7ecfa4f0dfcc57424360801e91027450a34130 +$(PKG)_CHECKSUM := 25f79ef4f24930f0335e75eb2e8584ea27d51a54 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL)) diff --git a/src/qttranslations.mk b/src/qttranslations.mk index 199685b..609ca59 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c3d3a88005113be42e85f4b7c7e76fb7faffb73f +$(PKG)_CHECKSUM := dfb1afda34202089fbb12ca372e8c10766a5ad8c $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL)) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 142baef..35c42db 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -4,7 +4,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a3c6749c66d0192ef286c8a08c325124d52d9bc2 +$(PKG)_CHECKSUM := b534de070519906a915682b9bf5216aa1a907049 $(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL)) diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk new file mode 100644 index 0000000..297b935 --- /dev/null +++ b/src/qtwebsockets.mk @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtwebsockets +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := c21b04b7057b68fcd6b8b4cd74255899ec518202 +$(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index 647918f..ab2bfad 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b2f4108dd419f4b0edc54023028f4d3dedf7f095 +$(PKG)_CHECKSUM := 1aa4bbd9954f701c6d497b70729ad71015add287 $(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL)) diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index 9a0be38..5b0f489 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ef3a60e38e8c871835497a4b63094b8543a547c4 +$(PKG)_CHECKSUM := 7f0af98fe96c5bad677eb52a8070ad3913281b1a $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12