summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qtactiveqt-1.patch23
-rw-r--r--src/qtactiveqt.mk4
-rw-r--r--src/qtbase-1-cherrypicks.patch302
-rw-r--r--src/qtbase.mk6
-rw-r--r--src/qtdeclarative.mk4
-rw-r--r--src/qtgraphicaleffects.mk4
-rw-r--r--src/qtimageformats-1-cherrypicks.patch46
-rw-r--r--src/qtimageformats.mk4
-rw-r--r--src/qtjsbackend.mk4
-rw-r--r--src/qtmultimedia.mk4
-rw-r--r--src/qtquick1.mk4
-rw-r--r--src/qtscript.mk4
-rw-r--r--src/qtsvg.mk4
-rw-r--r--src/qttools.mk4
-rw-r--r--src/qttranslations.mk4
-rw-r--r--src/qtxmlpatterns-1.patch22
-rw-r--r--src/qtxmlpatterns.mk4
17 files changed, 104 insertions, 343 deletions
diff --git a/src/qtactiveqt-1.patch b/src/qtactiveqt-1.patch
new file mode 100644
index 0000000..e6f7108
--- /dev/null
+++ b/src/qtactiveqt-1.patch
@@ -0,0 +1,23 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 8bf1da19f45922259b93d689240e73c147fe2426 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 18 May 2013 15:28:33 +0200
+Subject: [PATCH] Revert "idc is a host tool"
+
+This reverts commit a52db1a707f84eae74ce1cc3d1058f026e81ac13.
+
+diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro
+index b9d8dee..05a592a 100644
+--- a/src/tools/idc/idc.pro
++++ b/src/tools/idc/idc.pro
+@@ -1,5 +1,3 @@
+-option(host_build)
+-
+ QT = core
+
+ SOURCES = main.cpp
+--
+1.8.1.4
+
diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 4039f28..ad816e5 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -3,10 +3,10 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 04587ae9cf2a56b06f0acbfb2633745b4734b1e4
+$(PKG)_CHECKSUM := f1309c5efa8ab3800ab0e41f0323376f3f38bada
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
diff --git a/src/qtbase-1-cherrypicks.patch b/src/qtbase-1-cherrypicks.patch
index c63d45a..5b7c548 100644
--- a/src/qtbase-1-cherrypicks.patch
+++ b/src/qtbase-1-cherrypicks.patch
@@ -1,18 +1,18 @@
This file is part of MXE.
See index.html for further information.
-From d04c8e88266737b6fb7ed29780905b54ee68eb5e Mon Sep 17 00:00:00 2001
+From 0fea27fabd57150874b80deacdf9f12c4a1d5172 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 26 Feb 2013 13:23:33 +0100
-Subject: [PATCH 1/9] use pkg-config for freetype
+Subject: [PATCH 1/3] use pkg-config for freetype
Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri
-index 6b5f6d0..d21f4e3 100644
+index 88be809..8fc19d2 100644
--- a/src/platformsupport/fontdatabases/basic/basic.pri
+++ b/src/platformsupport/fontdatabases/basic/basic.pri
-@@ -83,5 +83,7 @@ contains(QT_CONFIG, freetype) {
+@@ -82,5 +82,7 @@ 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)
@@ -24,10 +24,10 @@ index 6b5f6d0..d21f4e3 100644
1.8.1.4
-From b96f92ed207c7039d753e0ba8fffda4d676c3f38 Mon Sep 17 00:00:00 2001
+From 7d17dc925a6d038be6689f2bd01dfe6a5af2f91d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 22 Dec 2012 17:45:34 +0100
-Subject: [PATCH 2/9] WIP: qmake writeFile(): work around concurrent
+Subject: [PATCH 2/3] WIP: qmake writeFile(): work around concurrent
QDir::mkpath() failure
This actually happened when building qtimageformats with make -j4.
@@ -37,7 +37,7 @@ Failure in mkspecs/features/qt_plugin.prf:
Change-Id: Ibc685f613d721e178e6aff408905d77b0ce1740a
diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp
-index f46d66b..4632cf7 100644
+index be0d8ea..6306235 100644
--- a/qmake/library/qmakebuiltins.cpp
+++ b/qmake/library/qmakebuiltins.cpp
@@ -310,9 +310,17 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open
@@ -65,294 +65,10 @@ index f46d66b..4632cf7 100644
1.8.1.4
-From 63f1f49850ac741eb604d6cae959546d73ea9a7d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org>
-Date: Sat, 23 Feb 2013 23:14:50 -0500
-Subject: [PATCH 3/9] Rename qAbs Function for timeval
-
-This decouples it from qAbs which is declared as a constexpr under
-certain compilation flags and enables for qtbase to be compiled with
-GCC 4.8
-
-Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit d9ff510f02bba63dabe7a081a68296056a89ae4c)
-
-diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
-index 0eee425..7a29247 100644
---- a/src/corelib/kernel/qtimerinfo_unix.cpp
-+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
-@@ -94,8 +94,7 @@ timeval QTimerInfoList::updateCurrentTime()
-
- #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)
-
--template <>
--timeval qAbs(const timeval &t)
-+timeval qAbsTimeval(const timeval &t)
- {
- timeval tmp = t;
- if (tmp.tv_sec < 0) {
-@@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timeval *delta)
- timeval tickGranularity;
- tickGranularity.tv_sec = 0;
- tickGranularity.tv_usec = msPerTick * 1000;
-- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
-+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
- }
-
- /*
---
-1.8.1.4
-
-
-From 1b78b16a6544a5002ce2dbc10c87c6195d7a0a01 Mon Sep 17 00:00:00 2001
-From: Israel Lins <israelins85@yahoo.com.br>
-Date: Mon, 11 Feb 2013 16:13:24 -0300
-Subject: [PATCH 4/9] ODBC: fix loss of milliseconds when binding QDateTime
-
-Caused by operator precedence error.
-
-Follow-up to commit b8b79a0f37ec74fd5b4ad829e522a384ba3622ae
-
-Task-number: QTBUG-2192
-Change-Id: I17decd18c469b48a0bc938ae05c16cced8042219
-Reviewed-by: Mark Brand <mabrand@mabrand.nl>
-(cherry picked from commit 36b6d4afc970a328cced87af3d39b70d327eb3ad)
-
-diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
-index 9517d95..5fa4779 100644
---- a/src/sql/drivers/odbc/qsql_odbc.cpp
-+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -1407,7 +1407,7 @@ bool QODBCResult::exec()
-
- // (How many leading digits do we want to keep? With SQL Server 2005, this should be 3: 123000000)
- int keep = (int)qPow(10.0, 9 - qMin(9, precision));
-- dt->fraction /= keep * keep;
-+ dt->fraction = (dt->fraction / keep) * keep;
- }
-
- r = SQLBindParameter(d->hStmt,
-diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
-index 1d2a605..951d6d7 100644
---- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
-+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
-@@ -3419,14 +3419,19 @@ void tst_QSqlQuery::QTBUG_2192()
- QSqlQuery q(db);
- QVERIFY_SQL(q, exec(QString("CREATE TABLE " + tableName + " (dt %1)").arg(tst_Databases::dateTimeTypeName(db))));
-
-+ QDateTime dt = QDateTime(QDate(2012, 7, 4), QTime(23, 59, 59, 999));
- QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (dt) VALUES (?)"));
-- q.bindValue(0, QVariant(QDateTime(QDate(2012, 7, 4), QTime(23, 59, 59, 999))));
-+ q.bindValue(0, dt);
- QVERIFY_SQL(q, exec());
-
-- // Check if value was stored with at least second precision.
- QVERIFY_SQL(q, exec("SELECT dt FROM " + tableName));
- QVERIFY_SQL(q, next());
-- QVERIFY(q.value(0).toDateTime().msecsTo(QDateTime(QDate(2012, 7, 4), QTime(23, 59, 59, 999))) < 1000 );
-+
-+ // Check if retrieved value preserves reported precision
-+ int precision = qMax(0, q.record().field("dt").precision());
-+ int diff = qAbs(q.value(0).toDateTime().msecsTo(dt));
-+ int keep = qMin(1000, (int)qPow(10.0, precision));
-+ QVERIFY(diff <= 1000 - keep);
- }
- }
-
---
-1.8.1.4
-
-
-From c80f315f5e21d1550140e8ac6dd682fcdf50889c Mon Sep 17 00:00:00 2001
-From: Israel Lins <israelins85@yahoo.com.br>
-Date: Sun, 17 Mar 2013 23:23:15 -0300
-Subject: [PATCH 5/9] ODBC: fixed consistence of return of QODBCResult::exec()
-
-The QODBCResult::exec() returns false when query is an delete
-with no data do delete caused by SQLExecute function returning
-SQL_NO_DATA, but the false return means error on execution.
-
-Task-number: QTBUG-10569
-Change-Id: I6c7ebadcf62ab404b60c7bcccdab6a10bf16a923
-Reviewed-by: Mark Brand <mabrand@mabrand.nl>
-(cherry picked from commit 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df)
-
-diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
-index 5fa4779..c6fd49d 100644
---- a/src/sql/drivers/odbc/qsql_odbc.cpp
-+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -1592,7 +1592,7 @@ bool QODBCResult::exec()
- }
- }
- r = SQLExecute(d->hStmt);
-- if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
-+ if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r != SQL_NO_DATA) {
- qWarning() << "QODBCResult::exec: Unable to execute statement:" << qODBCWarn(d);
- setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
- "Unable to execute statement"), QSqlError::StatementError, d));
-diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
-index 951d6d7..eb5c309 100644
---- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
-+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
-@@ -1027,6 +1027,10 @@ void tst_QSqlQuery::isActive()
- QVERIFY_SQL( q, exec( "delete from " + qtest + " where id = 42" ) );
-
- QVERIFY( q.isActive() );
-+
-+ QVERIFY_SQL( q, exec( "delete from " + qtest + " where id = 42" ) );
-+
-+ QVERIFY( q.isActive() );
- }
-
- void tst_QSqlQuery::numRowsAffected()
---
-1.8.1.4
-
-
-From c31329e0d735e1c36c1762d0a05764c9e4a52ca2 Mon Sep 17 00:00:00 2001
-From: Israel Lins <israelins85@yahoo.com.br>
-Date: Sun, 17 Mar 2013 23:20:55 -0300
-Subject: [PATCH 6/9] ODBC: lost info about column metadata on SQL_NO_DATA
-
-In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata
-is ignored.
-
-Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53
-Reviewed-by: Mark Brand <mabrand@mabrand.nl>
-(cherry picked from commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf)
-
-diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
-index c6fd49d..5932b57 100644
---- a/src/sql/drivers/odbc/qsql_odbc.cpp
-+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -960,11 +960,6 @@ bool QODBCResult::reset (const QString& query)
- return false;
- }
-
-- if(r == SQL_NO_DATA) {
-- setSelect(false);
-- return true;
-- }
--
- SQLINTEGER bufferLength;
- SQLULEN isScrollable;
- r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
---
-1.8.1.4
-
-
-From 8f8677970ed5ca7e333095ab48a9b2bccbfd3eb5 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 23 Apr 2013 22:46:43 +0200
-Subject: [PATCH 7/9] qsql_odbc: fix SQLGetStmtAtt usage
-
-Failure to initialize the variable can cause spurious non-zero
-values.
-
-http://msdn.microsoft.com/en-us/library/windows/desktop/ms715438(v=vs.85).aspx
-
-"..value can either be a SQLULEN value or a null-terminated character
-string. If the value is a SQLULEN value, some drivers may only write the
-lower 32-bit or 16-bit of a buffer and leave the higher-order
-bit unchanged. Therefore, applications should use a buffer of SQLULEN
-and initialize the value to 0 before calling this function. Also, the
-BufferLength and StringLengthPtr arguments are not used."
-
-Follow-up to 1509316a37fb2d365230d020d1dfc251c830fd56
-
-Change-Id: I2e92eb845a2590bea0849c52bde8902adff1b419
-Reviewed-by: Andy Shaw <andy.shaw@digia.com>
-(cherry picked from commit af35ee291a1bbbc8627f9a17f7e104898d49b138)
-
-diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
-index 5932b57..b05cd4d 100644
---- a/src/sql/drivers/odbc/qsql_odbc.cpp
-+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -960,9 +960,8 @@ bool QODBCResult::reset (const QString& query)
- return false;
- }
-
-- SQLINTEGER bufferLength;
-- SQLULEN isScrollable;
-- r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
-+ SQLULEN isScrollable = 0;
-+ r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, 0);
- if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
- QSqlResult::setForwardOnly(isScrollable==SQL_NONSCROLLABLE);
-
-@@ -1108,7 +1107,7 @@ bool QODBCResult::fetchLast()
- "Unable to fetch last"), QSqlError::ConnectionError, d));
- return false;
- }
-- SQLINTEGER currRow;
-+ SQLULEN currRow = 0;
- r = SQLGetStmtAttr(d->hStmt,
- SQL_ROW_NUMBER,
- &currRow,
-@@ -1594,9 +1593,8 @@ bool QODBCResult::exec()
- return false;
- }
-
-- SQLINTEGER bufferLength;
-- SQLULEN isScrollable;
-- r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
-+ SQLULEN isScrollable = 0;
-+ r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, 0);
- if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
- QSqlResult::setForwardOnly(isScrollable==SQL_NONSCROLLABLE);
-
---
-1.8.1.4
-
-
-From 4f46ba28ffdb15a18c2ec77ed8bd81e90883c972 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 8/9] 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 commit c82b0815ec80b3750a110d47c68142bb448ddf56)
-
-diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
-index 5ad77dd..2e4119b 100644
---- a/src/dbus/dbus.pro
-+++ b/src/dbus/dbus.pro
-@@ -6,6 +6,8 @@ MODULE_CONFIG = dbusadaptors dbusinterfaces
- !isEmpty(DBUS_PATH) {
- INCLUDEPATH += $$DBUS_PATH/include
- QMAKE_LIBDIR += $$DBUS_PATH/lib
-+ win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d
-+ else:QT_LIBS_DBUS += -ldbus-1
- }
-
- DEFINES += DBUS_API_SUBJECT_TO_CHANGE
-@@ -21,8 +23,6 @@ win32 {
- -ladvapi32 \
- -lnetapi32 \
- -luser32
-- CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d
-- else:LIBS_PRIVATE += -ldbus-1
- }
-
- QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf
---
-1.8.1.4
-
-
-From 583ca93da5936dccb8fde5d47313774684cd8c41 Mon Sep 17 00:00:00 2001
+From f758fbacac30a7c4b5e44fb6d5cbe16383d5d269 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 18 May 2013 23:07:46 +0200
-Subject: [PATCH 9/9] use pkgconfig for icu detection (MXE specific)
+Subject: [PATCH 3/3] use pkgconfig for icu detection (MXE specific)
Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3
diff --git a/src/qtbase.mk b/src/qtbase.mk
index b7fa936..aaf2507 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -3,14 +3,14 @@
PKG := qtbase
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 1220c88ad7f50bf1c08208e1eb05ee5d56635361
+$(PKG)_CHECKSUM := 6970f7c2cb8475abc14aba1f23478949d0ebd294
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c
define $(PKG)_UPDATE
- $(WGET) -q -O- http://origin.releases.qt-project.org/qt5/ | \
+ $(WGET) -q -O- http://download.qt-project.org/snapshots/qt/5.1/ | \
$(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \
grep -iv -- '-rc' | \
tail -1
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 2774a75..0f38218 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -3,10 +3,10 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 7d5db72e455a264e93181e3864d00d51f5b73973
+$(PKG)_CHECKSUM := e8b51e4a75a5b56a31da9e5c2175927426f7ad5f
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase qtjsbackend qtsvg qtxmlpatterns
define $(PKG)_UPDATE
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index 5428b4f..dd01d64 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -3,10 +3,10 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := ac0e12763a19d7ce289ee976e8e7da8689b81bd5
+$(PKG)_CHECKSUM := 82c26f3d7f6f329cf7231d0609fbea55170a0c24
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase qtdeclarative
define $(PKG)_UPDATE
diff --git a/src/qtimageformats-1-cherrypicks.patch b/src/qtimageformats-1-cherrypicks.patch
index 5aab225..4b7e150 100644
--- a/src/qtimageformats-1-cherrypicks.patch
+++ b/src/qtimageformats-1-cherrypicks.patch
@@ -1,7 +1,7 @@
This file is part of MXE.
See index.html for further information.
-From 7454a10238d663e048aec1e1a1871a76da646345 Mon Sep 17 00:00:00 2001
+From f6906f5cb744554a985f6ecbb55a49dd2883d531 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 3 Nov 2011 14:11:02 +0100
Subject: [PATCH 1/2] add pkg-config support for libtiff-4
@@ -9,23 +9,23 @@ 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 60ba7d1..0544f55 100644
+index 47a8437..bd2c6b0 100644
--- a/config.tests/libtiff/libtiff.pro
+++ b/config.tests/libtiff/libtiff.pro
-@@ -1,4 +1,7 @@
- SOURCES = libtiff.cpp
+@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
--LIBS += -ltiff
+ win32:CONFIG += console
+-unix|win32-g++*: LIBS += -ltiff
+CONFIG += link_pkgconfig
+packagesExist(libtiff-4):PKGCONFIG += libtiff-4
+else:if(unix|win32-g++*): LIBS += -ltiff
-+else:win32: LIBS += libtiff.lib
+ else:win32: LIBS += libtiff.lib
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
-index 66eea8c..8582740 100644
+index 353e3f3..fa22141 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
-@@ -9,7 +9,9 @@ SOURCES += main.cpp qtiffhandler.cpp
+@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp
OTHER_FILES += tiff.json
config_libtiff {
@@ -37,10 +37,10 @@ index 66eea8c..8582740 100644
} else {
include($$PWD/../../../3rdparty/libtiff.pri)
--
-1.7.10.4
+1.8.1.4
-From 4356a1b1d7dfd3391688ab08ba667465121e34b3 Mon Sep 17 00:00:00 2001
+From 3c300d849fbe41368aedbf8d9c8052a170dfd108 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 19 Dec 2012 23:29:52 +0100
Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific)
@@ -48,25 +48,25 @@ 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 ee57ecd..4c2d305 100644
+index 7a45825..a20a0a0 100644
--- a/config.tests/libmng/libmng.pro
+++ b/config.tests/libmng/libmng.pro
-@@ -1,4 +1,7 @@
- SOURCES = libmng.cpp
+@@ -2,5 +2,7 @@ SOURCES = libmng.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
--LIBS += -lmng
+ win32:CONFIG += console
+-unix|win32-g++*: 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/mng.pro b/src/plugins/imageformats/mng/mng.pro
-index 9890c11..7cfcff0 100644
---- a/src/plugins/imageformats/mng/mng.pro
-+++ b/src/plugins/imageformats/mng/mng.pro
-@@ -8,7 +8,9 @@ HEADERS += qmnghandler_p.h
- SOURCES += qmnghandler.cpp
- OTHER_FILES += mng.json
+ 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
+--- 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
+ CONFIG += link_pkgconfig
@@ -76,5 +76,5 @@ index 9890c11..7cfcff0 100644
} else {
include($$PWD/../../../3rdparty/libmng.pri)
--
-1.7.10.4
+1.8.1.4
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index a8fe06a..323da43 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -3,10 +3,10 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 2d5af3f866129f7b1da76b967e2297c805540ce7
+$(PKG)_CHECKSUM := 2861cc1f3b8e95e486d77f5230c6b0bac4bdeec0
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase libmng tiff
define $(PKG)_UPDATE
diff --git a/src/qtjsbackend.mk b/src/qtjsbackend.mk
index 04b4c6e..5088433 100644
--- a/src/qtjsbackend.mk
+++ b/src/qtjsbackend.mk
@@ -3,10 +3,10 @@
PKG := qtjsbackend
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 83dd0976a350ff877f7df3a113c2a2ffb0ffc006
+$(PKG)_CHECKSUM := 41368f4726ef1b4241c426fc787f4ed084c077ab
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index ea6d74e..476eff3 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -3,10 +3,10 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 1bf371d724bffe5e586ac01d279afabb8771bd73
+$(PKG)_CHECKSUM := 3d88a961c7d1967ecfe6b67171fcd73877ac4ad4
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 0d4e944..bf5b41e 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -3,10 +3,10 @@
PKG := qtquick1
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 92c8515273b449d325077e881b189eb2523b4386
+$(PKG)_CHECKSUM := 5436ba3191437280da905bf92f47f2628541011f
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase qtscript qtsvg qttools qtxmlpatterns
define $(PKG)_UPDATE
diff --git a/src/qtscript.mk b/src/qtscript.mk
index 297d834..c887efe 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -3,10 +3,10 @@
PKG := qtscript
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := ac151eef93a849fe7a7a70401f8cc72641b07fc1
+$(PKG)_CHECKSUM := 58b8e10c504a6b2c2c671072a3e2446471c06b77
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index fa899ae..e4e2acb 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -3,10 +3,10 @@
PKG := qtsvg
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 5c08f333b14ebbc728867edd49c25e48ada3ea05
+$(PKG)_CHECKSUM := 147e47958cfaa42b9b330b94a043715249230ade
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
diff --git a/src/qttools.mk b/src/qttools.mk
index 075748e..6ca6325 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -3,10 +3,10 @@
PKG := qttools
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := a2b980a0ee04ce17ff7617245b2a56240dca32d7
+$(PKG)_CHECKSUM := 38b71f3e9469ccba46e43ee5a6202b2c834a6c60
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase qtactiveqt qtdeclarative
define $(PKG)_UPDATE
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index 05c1358..3042411 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -3,10 +3,10 @@
PKG := qttranslations
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 3f31c4ebeb0ff4fc610088499aa162733c653af4
+$(PKG)_CHECKSUM := 42772753a6fc0853b87965b7b936473009ec5a7d
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase qttools
define $(PKG)_UPDATE
diff --git a/src/qtxmlpatterns-1.patch b/src/qtxmlpatterns-1.patch
new file mode 100644
index 0000000..2f4845c
--- /dev/null
+++ b/src/qtxmlpatterns-1.patch
@@ -0,0 +1,22 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 910b5fc6c65e2a4508077821a1d31e080d738766 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 18 May 2013 17:03:55 +0200
+Subject: [PATCH] mingw build fix: _fileno
+
+
+diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro
+index d349a91..13a70ae 100644
+--- a/tools/xmlpatterns/xmlpatterns.pro
++++ b/tools/xmlpatterns/xmlpatterns.pro
+@@ -11,4 +11,5 @@ HEADERS = main.h \
+ qapplicationargument.cpp \
+ qapplicationargumentparser.cpp
+
++win32-g++*:QMAKE_CXXFLAGS += -U__STRICT_ANSI__
+ load(qt_tool)
+--
+1.8.1.4
+
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index 5d98fca..d134b33 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -3,10 +3,10 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := a234427a0b9172aa8d1064577a5a1e9f4a86c839
+$(PKG)_CHECKSUM := e2f0cf5cc2337e0269749fc273e5c08ca9ce5848
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
+$(PKG)_URL := http://download.qt-project.org/snapshots/qt/5.1/$($(PKG)_VERSION)/backups/2013-05-31-45/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc qtbase
define $(PKG)_UPDATE
generated by cgit v0.12 at 2024-11-05 02:53:16 (GMT)