From 8426d8f162a8ae7257e4124032d7f1bd3cae02a3 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 10 Apr 2013 15:41:47 +0200
Subject: update qt5 module packages to 5.0.2

---
 src/qtactiveqt.mk              |  4 ++--
 src/qtbase-1-cherrypicks.patch | 47 ++++++------------------------------------
 src/qtbase.mk                  |  2 +-
 src/qtdeclarative.mk           |  4 ++--
 src/qtgraphicaleffects.mk      |  4 ++--
 src/qtimageformats.mk          |  4 ++--
 src/qtjsbackend.mk             |  4 ++--
 src/qtmultimedia.mk            |  4 ++--
 src/qtquick1.mk                |  4 ++--
 src/qtscript.mk                |  4 ++--
 src/qtsvg.mk                   |  4 ++--
 src/qttools.mk                 |  4 ++--
 src/qttranslations.mk          |  4 ++--
 src/qtxmlpatterns.mk           |  4 ++--
 14 files changed, 31 insertions(+), 66 deletions(-)

diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk
index 3644cf4..4039f28 100644
--- a/src/qtactiveqt.mk
+++ b/src/qtactiveqt.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtactiveqt
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 36b8a8ae579cbcec517a8c5b1578425c82da52c2
+$(PKG)_CHECKSUM := 04587ae9cf2a56b06f0acbfb2633745b4734b1e4
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/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 fbe4d2e..db6afd3 100644
--- a/src/qtbase-1-cherrypicks.patch
+++ b/src/qtbase-1-cherrypicks.patch
@@ -1,10 +1,10 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 6b0f024e4fa9e227a2c2da41f189add55f3225a9 Mon Sep 17 00:00:00 2001
+From d04c8e88266737b6fb7ed29780905b54ee68eb5e 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/4] use pkg-config for freetype
+Subject: [PATCH 1/3] use pkg-config for freetype
 
 Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
 
@@ -24,10 +24,10 @@ index 6b5f6d0..d21f4e3 100644
 1.8.1.4
 
 
-From 4928a5d5d09199996567595a91498aa151df9773 Mon Sep 17 00:00:00 2001
+From b96f92ed207c7039d753e0ba8fffda4d676c3f38 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/4] 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.
@@ -65,10 +65,10 @@ index f46d66b..4632cf7 100644
 1.8.1.4
 
 
-From cfbe1ce777abb153d1b03b23c777b773498e2a3c Mon Sep 17 00:00:00 2001
+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/4] Rename qAbs Function for timeval
+Subject: [PATCH 3/3] 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
@@ -104,38 +104,3 @@ index 0eee425..7a29247 100644
 -- 
 1.8.1.4
 
-
-From dad4c7019a14eeee37ec168501b883c1ebfaeff6 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 27 Mar 2013 22:40:39 +0100
-Subject: [PATCH 4/4] fix QT_NO_ACCESSIBILITY build
-
-Follow-up to ad05af534dc61b0c07b2c676d8f1ff040d9fbf7b
-
-Change-Id: I561b0b0b1a098556f9de909241b448307a271985
-
-diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
-index 48d2027..93c2065 100644
---- a/src/widgets/styles/qwindowsvistastyle.cpp
-+++ b/src/widgets/styles/qwindowsvistastyle.cpp
-@@ -520,6 +520,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
-         }
-         break;
-     case PE_Frame: {
-+#ifndef QT_NO_ACCESSIBILITY
-         if (QStyleHelper::isInstanceOf(option->styleObject, QAccessible::EditableText)) {
-             painter->save();
-             int stateId = ETS_NORMAL;
-@@ -545,6 +546,9 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
-             d->drawBackground(theme);
-             painter->restore();
-         } else {
-+#else
-+        {
-+#endif
-             QWindowsXPStyle::drawPrimitive(element, option, painter, widget);
-         }
-     }
--- 
-1.8.1.4
-
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 0f893c8..2f5cd7e 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -6,7 +6,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_CHECKSUM := cdf97dc5934e642c3f64e81c74ce5cace97ff25c
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus
 
 define $(PKG)_UPDATE
diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk
index 9cdd196..2774a75 100644
--- a/src/qtdeclarative.mk
+++ b/src/qtdeclarative.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtdeclarative
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 4c2d24824463b3cbd147b2e49941187c44741fed
+$(PKG)_CHECKSUM := 7d5db72e455a264e93181e3864d00d51f5b73973
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase qtjsbackend qtsvg qtxmlpatterns
 
 define $(PKG)_UPDATE
diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk
index 4de062c..5428b4f 100644
--- a/src/qtgraphicaleffects.mk
+++ b/src/qtgraphicaleffects.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtgraphicaleffects
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 862d26c7f2c45bb8eadc5bfa03ce90093b5e3288
+$(PKG)_CHECKSUM := ac0e12763a19d7ce289ee976e8e7da8689b81bd5
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase qtdeclarative
 
 define $(PKG)_UPDATE
diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk
index 0cbd5f2..a8fe06a 100644
--- a/src/qtimageformats.mk
+++ b/src/qtimageformats.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtimageformats
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 79b90580b2d7c5ed6e7d45149bbaa7062f1a369f
+$(PKG)_CHECKSUM := 2d5af3f866129f7b1da76b967e2297c805540ce7
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase libmng tiff
 
 define $(PKG)_UPDATE
diff --git a/src/qtjsbackend.mk b/src/qtjsbackend.mk
index 116698b..04b4c6e 100644
--- a/src/qtjsbackend.mk
+++ b/src/qtjsbackend.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtjsbackend
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 78f4eb2383460544f52a294ae57f284f3424a109
+$(PKG)_CHECKSUM := 83dd0976a350ff877f7df3a113c2a2ffb0ffc006
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk
index c2d3040..ea6d74e 100644
--- a/src/qtmultimedia.mk
+++ b/src/qtmultimedia.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtmultimedia
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 58b33252b0c93ffd5b11151d600f90f8ce084527
+$(PKG)_CHECKSUM := 1bf371d724bffe5e586ac01d279afabb8771bd73
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtquick1.mk b/src/qtquick1.mk
index 7acea3c..0d4e944 100644
--- a/src/qtquick1.mk
+++ b/src/qtquick1.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtquick1
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := edd30e2da9c66cecc265bf0204b865bcd02945c3
+$(PKG)_CHECKSUM := 92c8515273b449d325077e881b189eb2523b4386
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/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 7fa6e43..297d834 100644
--- a/src/qtscript.mk
+++ b/src/qtscript.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtscript
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := e2f74cc511338038ec4626522fe8c88e9f626af0
+$(PKG)_CHECKSUM := ac151eef93a849fe7a7a70401f8cc72641b07fc1
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qtsvg.mk b/src/qtsvg.mk
index d35bc48..fa899ae 100644
--- a/src/qtsvg.mk
+++ b/src/qtsvg.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtsvg
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 65e960d7ef6963beb222ce2356792d20907b2993
+$(PKG)_CHECKSUM := 5c08f333b14ebbc728867edd49c25e48ada3ea05
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
diff --git a/src/qttools.mk b/src/qttools.mk
index adfb772..075748e 100644
--- a/src/qttools.mk
+++ b/src/qttools.mk
@@ -3,10 +3,10 @@
 
 PKG             := qttools
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := d8d77b8b9532634e453209deca3ee621463a2300
+$(PKG)_CHECKSUM := a2b980a0ee04ce17ff7617245b2a56240dca32d7
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase qtactiveqt qtdeclarative
 
 define $(PKG)_UPDATE
diff --git a/src/qttranslations.mk b/src/qttranslations.mk
index 5c2c811..05c1358 100644
--- a/src/qttranslations.mk
+++ b/src/qttranslations.mk
@@ -3,10 +3,10 @@
 
 PKG             := qttranslations
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 16935409b4eea4de6c03481d60f35bcc15162e17
+$(PKG)_CHECKSUM := 3f31c4ebeb0ff4fc610088499aa162733c653af4
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase qttools
 
 define $(PKG)_UPDATE
diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk
index da5ccbe..5d98fca 100644
--- a/src/qtxmlpatterns.mk
+++ b/src/qtxmlpatterns.mk
@@ -3,10 +3,10 @@
 
 PKG             := qtxmlpatterns
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 937ef3194915b02166be86d556330839de656ab9
+$(PKG)_CHECKSUM := a234427a0b9172aa8d1064577a5a1e9f4a86c839
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://releases.qt-project.org/qt5/$($(PKG)_VERSION)-rc1/submodules_tar/$($(PKG)_FILE)
+$(PKG)_URL      := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc qtbase
 
 define $(PKG)_UPDATE
-- 
cgit v0.12