From ef2799c07b0e1ea9da573aa5cf51fca117532efb Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Feb 2014 16:34:20 +0100 Subject: update qt5 modules --- src/qtactiveqt-1.patch | 4 +- src/qtactiveqt.mk | 2 +- src/qtbase-1.patch | 145 ++++----------------------------------------- src/qtbase.mk | 4 +- src/qtconnectivity.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats-1.patch | 39 ++---------- src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- src/qtmultimedia-1.patch | 4 +- src/qtmultimedia.mk | 2 +- 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.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwinextras-1.patch | 4 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns-1.patch | 4 +- src/qtxmlpatterns.mk | 2 +- 24 files changed, 44 insertions(+), 194 deletions(-) diff --git a/src/qtactiveqt-1.patch b/src/qtactiveqt-1.patch index dc7c512..08e6b6e 100644 --- a/src/qtactiveqt-1.patch +++ b/src/qtactiveqt-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 4e320610c64732d1ef616d823eba9ce5d714fc4c Mon Sep 17 00:00:00 2001 +From 7779365c9bd2741e28f16f99e2df19e4597e1c69 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 May 2013 15:28:33 +0200 Subject: [PATCH] Revert "idc is a host tool" @@ -19,5 +19,5 @@ index b9d8dee..05a592a 100644 SOURCES = main.cpp -- -1.8.4 +1.8.4.5 diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index e7f9ca3..1f81904 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 20d46965fb8d28b6a1e175a057e58debbd65d7cb +$(PKG)_CHECKSUM := 31441f01c9d271c61cf289e372af3f4f9f0478e1 $(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 97b7943..ea25b56 100644 --- a/src/qtbase-1.patch +++ b/src/qtbase-1.patch @@ -1,133 +1,10 @@ This file is part of MXE. See index.html for further information. -From e5939294f82e7e337f517fead6d4d14ecde5ee24 Mon Sep 17 00:00:00 2001 -From: Tobias Koenig -Date: Wed, 27 Nov 2013 13:11:01 +0100 -Subject: [PATCH 1/5] Fix sub-second handling in SQLite driver - -Use explicit format string, that contains milliseconds, when -converting an QDateTime/QTime to a SQLite field content. - -Task-number: QTBUG-24200 -[ChangeLog][QtSql][QSQLITE] Fix sub-second handling -Change-Id: Ib89152b7c3dd780b57a8826beff8b6b118e9d3d6 -Reviewed-by: Giuseppe D'Angelo -Reviewed-by: Mark Brand - -(cherry picked from commit 9e64fc9e1cebf1e11694c4f536881128f5aee288) - -diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp -index 0a8b71a..27bc80e 100644 ---- a/src/sql/drivers/sqlite/qsql_sqlite.cpp -+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp -@@ -42,6 +42,7 @@ - #include "qsql_sqlite_p.h" - - #include -+#include - #include - #include - #include -@@ -447,6 +448,20 @@ bool QSQLiteResult::exec() - case QVariant::LongLong: - res = sqlite3_bind_int64(d->stmt, i + 1, value.toLongLong()); - break; -+ case QVariant::DateTime: { -+ const QDateTime dateTime = value.toDateTime(); -+ const QString str = dateTime.toString(QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz")); -+ res = sqlite3_bind_text16(d->stmt, i + 1, str.utf16(), -+ str.size() * sizeof(ushort), SQLITE_TRANSIENT); -+ break; -+ } -+ case QVariant::Time: { -+ const QTime time = value.toTime(); -+ const QString str = time.toString(QStringLiteral("hh:mm:ss.zzz")); -+ res = sqlite3_bind_text16(d->stmt, i + 1, str.utf16(), -+ str.size() * sizeof(ushort), SQLITE_TRANSIENT); -+ break; -+ } - case QVariant::String: { - // lifetime of string == lifetime of its qvariant - const QString *str = static_cast(value.constData()); --- -1.8.4 - - -From 0c5dcbce26413ee17e052d79f348c35b4f963842 Mon Sep 17 00:00:00 2001 -From: Tobias Koenig -Date: Sat, 30 Nov 2013 14:40:11 +0100 -Subject: [PATCH 2/5] Fix evaluation of SQLite driver options - -Ensure that the options, which are passed to the SQLite driver, are -evaluated in the correct order and do not overwrite each other. -According to http://www.sqlite.org/c3ref/open.html the -SQLITE_OPEN_READONLY and (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE) are -mutual exclusive, but SQLITE_OPEN_URI can be combined with both of them. - -Task-number: QTBUG-35186 -[ChangeLog][QtSql][QSQLITE] Fixed evaluation of driver options -Change-Id: I8e74fe1ce43b9118b15f7b13fc71670bdcd73f68 -Reviewed-by: Giuseppe D'Angelo -Reviewed-by: Mark Brand - -(cherry picked from commit 4f28464ab7dfe9f18cd72fc022257e66a8e2b279) - -diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp -index 27bc80e..c98d643 100644 ---- a/src/sql/drivers/sqlite/qsql_sqlite.cpp -+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp -@@ -599,24 +599,32 @@ bool QSQLiteDriver::open(const QString & db, const QString &, const QString &, c - - if (db.isEmpty()) - return false; -+ -+ int timeOut = 5000; - bool sharedCache = false; -- int openMode = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, timeOut=5000; -- QStringList opts=QString(conOpts).remove(QLatin1Char(' ')).split(QLatin1Char(';')); -- foreach(const QString &option, opts) { -+ bool openReadOnlyOption = false; -+ bool openUriOption = false; -+ -+ const QStringList opts = QString(conOpts).remove(QLatin1Char(' ')).split(QLatin1Char(';')); -+ foreach (const QString &option, opts) { - if (option.startsWith(QLatin1String("QSQLITE_BUSY_TIMEOUT="))) { - bool ok; -- int nt = option.mid(21).toInt(&ok); -+ const int nt = option.mid(21).toInt(&ok); - if (ok) - timeOut = nt; -- } -- if (option == QLatin1String("QSQLITE_OPEN_READONLY")) -- openMode = SQLITE_OPEN_READONLY; -- if (option == QLatin1String("QSQLITE_OPEN_URI")) -- openMode |= SQLITE_OPEN_URI; -- if (option == QLatin1String("QSQLITE_ENABLE_SHARED_CACHE")) -+ } else if (option == QLatin1String("QSQLITE_OPEN_READONLY")) { -+ openReadOnlyOption = true; -+ } else if (option == QLatin1String("QSQLITE_OPEN_URI")) { -+ openUriOption = true; -+ } else if (option == QLatin1String("QSQLITE_ENABLE_SHARED_CACHE")) { - sharedCache = true; -+ } - } - -+ int openMode = (openReadOnlyOption ? SQLITE_OPEN_READONLY : (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)); -+ if (openUriOption) -+ openMode |= SQLITE_OPEN_URI; -+ - sqlite3_enable_shared_cache(sharedCache); - - if (sqlite3_open_v2(db.toUtf8().constData(), &d->access, openMode, NULL) == SQLITE_OK) { --- -1.8.4 - - -From 4f829b92caae3ff877215b118b6c733714a74ab6 Mon Sep 17 00:00:00 2001 +From ce5c490ce4d6612a20cbfa2ed85e493af9513268 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 28 Nov 2013 00:06:41 +0100 -Subject: [PATCH 3/5] Allow temporary databases in sqlite driver +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 @@ -138,10 +15,10 @@ 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 d8d1058..82dfa27 100644 +index f1fd2f6..9858e30 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc -@@ -599,8 +599,8 @@ +@@ -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 @@ -167,13 +44,13 @@ index c98d643..55ef092 100644 bool sharedCache = false; bool openReadOnlyOption = false; -- -1.8.4 +1.8.4.5 -From 4222a7935ba386e296a0c24a56777de11b74bd75 Mon Sep 17 00:00:00 2001 +From 428f22caa4b1f0283821f25d4df639a674a075e3 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 26 Feb 2013 13:23:33 +0100 -Subject: [PATCH 4/5] use pkg-config for freetype +Subject: [PATCH 2/3] use pkg-config for freetype Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a @@ -190,13 +67,13 @@ index 88be809..8fc19d2 100644 } -- -1.8.4 +1.8.4.5 -From a9ed072cf46c2f23de4c7c4b7d706ea335b6a775 Mon Sep 17 00:00:00 2001 +From 802941a977d99c1942bfca13d4fee6fc11c31fee Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 May 2013 23:07:46 +0200 -Subject: [PATCH 5/5] use pkgconfig for icu detection (MXE specific) +Subject: [PATCH 3/3] use pkgconfig for icu detection (MXE specific) Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3 @@ -224,5 +101,5 @@ index 2c1b431..e29798b 100644 +CONFIG += link_pkgconfig +PKGCONFIG += icu-i18n -- -1.8.4 +1.8.4.5 diff --git a/src/qtbase.mk b/src/qtbase.mk index 5256e4e..b97ee08 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.0 -$(PKG)_CHECKSUM := 36cbda404e1fe27938a3d5778c757de96ff9f27a +$(PKG)_VERSION := 5.2.1 +$(PKG)_CHECKSUM := 32cfec62138a478361711cb5f6c8d1c60a3d8c08 $(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) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 8502f87..1fc57a4 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := fddd0996d14149a482830cbb7e8aaa2d3d32456f +$(PKG)_CHECKSUM := 2ec79e4869ed8b95f5fff8b4e30f33591cd73ccb $(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.mk b/src/qtdeclarative.mk index 81adb56..5290ee2 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2768fab8f3d81cfb67e101e94194cb4f90d4efa4 +$(PKG)_CHECKSUM := 1875e93665255ee4ef1694d946cd20c0861ac60d $(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/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 8c7b260..3682bbe 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 44a0ab24ae15270b22919ee1a8925ad119421560 +$(PKG)_CHECKSUM := 649765bb8054abccbd1002606469f56bba5cab25 $(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 c1477eb..30e5fcd 100644 --- a/src/qtimageformats-1.patch +++ b/src/qtimageformats-1.patch @@ -1,10 +1,10 @@ This file is part of MXE. See index.html for further information. -From fd1717af4dd33e3ea270ec97d7f7e5e3a61021da Mon Sep 17 00:00:00 2001 +From 44d6697bd01bbd489c90d3a0f64cd8ecfcb29eb3 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 1/3] add pkg-config support for libtiff-4 +Subject: [PATCH 1/2] add pkg-config support for libtiff-4 Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd @@ -37,13 +37,13 @@ index 353e3f3..fa22141 100644 } else { include($$PWD/../../../3rdparty/libtiff.pri) -- -1.8.4 +1.8.4.5 -From a1846586160249a2debcbf113b679c9ea452b909 Mon Sep 17 00:00:00 2001 +From 8dea742660bb9d1196c4b05cf5b22fb4f4e41595 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 19 Dec 2012 23:29:52 +0100 -Subject: [PATCH 2/3] add pkg-config support for libmng (mxe-specific) +Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) Change-Id: I1216f35a01a974321efa2463b687c121baa22667 @@ -76,32 +76,5 @@ index cdf17c5..00cd0b3 100644 } else { include($$PWD/../../../3rdparty/libmng.pri) -- -1.8.4 - - -From 5c209558b3c4d82e59c8d5ef3cc263a8fd3bff01 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Sat, 17 Aug 2013 18:08:22 +0200 -Subject: [PATCH 3/3] libmng 2 config.test compatibility - -Change-Id: I62903256590faf1f1d3d07265b96a6597f912fc2 - -diff --git a/config.tests/libmng/libmng.cpp b/config.tests/libmng/libmng.cpp -index 9def33e..266dd71 100644 ---- a/config.tests/libmng/libmng.cpp -+++ b/config.tests/libmng/libmng.cpp -@@ -46,9 +46,11 @@ int main(int, char **) - mng_handle hMNG; - mng_cleanup(&hMNG); - -+#ifdef MNG_VERSION_MAJOR - #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9) - #error System libmng version is less than 1.0.9; using built-in version instead. - #endif -+#endif - - return 0; - } --- -1.8.4 +1.8.4.5 diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index 4a74c3d..d59e621 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2b68391c449343ac3c6579cb8e49bbdea1824b1d +$(PKG)_CHECKSUM := 6b08d46ef9147a5942e07f7c6b664d554f527e3a $(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 61c253e..a6e254d 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := fabe92f954660719bd628be1811376b58ee4da29 +$(PKG)_CHECKSUM := 40a73c0d94acadd35d1233affdef462206a91187 $(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 index b99f6f4..e416fc9 100644 --- a/src/qtmultimedia-1.patch +++ b/src/qtmultimedia-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From b3ca574eaada965dbd20a90f89c3eb524627321a Mon Sep 17 00:00:00 2001 +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) @@ -41,5 +41,5 @@ index e9503d4..b92aa98 100644 #endif // __ICreateDevEnum_INTERFACE_DEFINED__ -- -1.8.4 +1.8.4.5 diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index f3b1e9f..a830041 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5bcb23814542dc73901fcb97331afb4bb06caf73 +$(PKG)_CHECKSUM := 0c686a2174c02e27bbf912a16b2939bf8b3e873d $(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) diff --git a/src/qtquick1.mk b/src/qtquick1.mk index eec985a..dd9f731 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -4,7 +4,7 @@ PKG := qtquick1 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 259ba637af0d6be6d25da1e1e24be9cfe978e2e0 +$(PKG)_CHECKSUM := 6013b6446be890cd4b27756bbb445072b53b1aa5 $(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 23156a9..bb9b9c8 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c0ed05af06a89074f330814c397815a0acaf8042 +$(PKG)_CHECKSUM := 9fc54633504a593eb31b3bd71ed0a016fd5ddc65 $(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 f5a6f36..7a872db 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7cdfb46b76d75475108970194d0aceb78b26db91 +$(PKG)_CHECKSUM := 329290ebb443966cbd9443189ced39a933de88e2 $(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 d9567ea..fd676b7 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 65baf9623452f787c4526ff462feb94ff5d3104f +$(PKG)_CHECKSUM := 5c9bd1be9920834cbd3cd1345235dab2dac9da44 $(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 782792b..6c48980 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 55e94b94658464ba6bb9f83bbbe34ca5f13f24e1 +$(PKG)_CHECKSUM := 929b27f7d67a44cd7f9fc138f0c1300145d7e517 $(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 985d408..22ece5a 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c57a83786f6509b1e8bbd3514727f1d63f32a214 +$(PKG)_CHECKSUM := 8ffaafb48566699386546b4316afce83025f4090 $(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.mk b/src/qttools.mk index 93ecd6a..899937a 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := bbca64f6c1c895ae463004e8963a3b5af72106ee +$(PKG)_CHECKSUM := 3b7ecfa4f0dfcc57424360801e91027450a34130 $(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 a2dcb45..199685b 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c25f6a541492308b15c7104bf982192afe55b0ab +$(PKG)_CHECKSUM := c3d3a88005113be42e85f4b7c7e76fb7faffb73f $(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/qtwinextras-1.patch b/src/qtwinextras-1.patch index e25dbfa..ebe93ee 100644 --- a/src/qtwinextras-1.patch +++ b/src/qtwinextras-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From bb7d4141f14dfd22365df4991a066e9b760b088d Mon Sep 17 00:00:00 2001 +From 45d94cc9d6d7a9e2e1349e826c44fa342149a867 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 24 Oct 2013 22:29:51 +0200 Subject: [PATCH] Fix MinGW-w64 GCC 4.8.2 compilation @@ -21,5 +21,5 @@ index 91faed5..352c405 100644 typedef struct SHARDAPPIDINFOLINK { -- -1.8.4 +1.8.4.5 diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index f04025e..647918f 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a2f77bd69666dedfb41402ab8ffb6f7c52673ad1 +$(PKG)_CHECKSUM := b2f4108dd419f4b0edc54023028f4d3dedf7f095 $(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-1.patch b/src/qtxmlpatterns-1.patch index 4a57473..bb86820 100644 --- a/src/qtxmlpatterns-1.patch +++ b/src/qtxmlpatterns-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From ec1bf00708e5aa804d392678bae5b32921ae0c2a Mon Sep 17 00:00:00 2001 +From 58ae17b18cea09c1fd3f8ec6912913e147f1f8f5 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 May 2013 17:03:55 +0200 Subject: [PATCH] mingw build fix: _fileno @@ -20,5 +20,5 @@ index 1fad197..2bbf5b5 100644 # with c++11 / __STRICT_ANSI__ mingw.org stdio.h doesn't declare e.g. _fileno -- -1.8.4 +1.8.4.5 diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index a821383..9a0be38 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := aaa115d6c23c9a00cb20115fde0fb899d2fe8135 +$(PKG)_CHECKSUM := ef3a60e38e8c871835497a4b63094b8543a547c4 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12