From 736bbb481c49b8fb7cac9f4886fc8bfa822c282a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 25 Jun 2014 17:30:24 +0200 Subject: update qt5 modules --- src/qtactiveqt.mk | 2 +- src/qtbase-1.patch | 16 ++++++++-------- src/qtbase.mk | 4 ++-- src/qtconnectivity.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtenginio.mk | 2 +- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- 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-1.patch | 6 +++--- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns-1.patch | 6 +++--- src/qtxmlpatterns.mk | 2 +- 24 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index d84ab91..b934f51 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 573957a004c5d9af3267a77f958e18da5330994c +$(PKG)_CHECKSUM := faa40b01359e32dbcfaf7b0f4cb71c55d0883e9c $(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 0968913..2a88ef7 100644 --- a/src/qtbase-1.patch +++ b/src/qtbase-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 4c5a88298629d81d899b6748db482bb35b15fc2a Mon Sep 17 00:00:00 2001 +From bb7faded84765ec9b86542a14d150af221dbd022 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 26 Feb 2013 13:23:33 +0100 Subject: [PATCH 1/3] use pkg-config for freetype @@ -24,7 +24,7 @@ index 88be809..8fc19d2 100644 1.8.4.5 -From 0d6f714d5a283429df603ea1898a73527ebdd71c Mon Sep 17 00:00:00 2001 +From f80e3d3941d742449b558ba3ecbd44053ea4debd Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 May 2013 23:07:46 +0200 Subject: [PATCH 2/3] use pkgconfig for icu detection (MXE specific) @@ -32,13 +32,13 @@ Subject: [PATCH 2/3] use pkgconfig for icu detection (MXE specific) Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3 diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro -index 2c1b431..e29798b 100644 +index 16267ff..dd9fb6c 100644 --- a/config.tests/unix/icu/icu.pro +++ b/config.tests/unix/icu/icu.pro -@@ -1,16 +1,5 @@ - SOURCES = icu.cpp +@@ -2,16 +2,5 @@ SOURCES = icu.cpp CONFIG += console CONFIG -= qt dylib + -win32 { - CONFIG(static, static|shared) { - CONFIG(debug, debug|release) { @@ -47,10 +47,10 @@ index 2c1b431..e29798b 100644 - LIBS += -lsicuin -lsicuuc -lsicudt - } - } else { -- LIBS += -licuin -licuuc +- LIBS += -licuin -licuuc -licudt - } -} else { -- LIBS += -licui18n -licuuc +- LIBS += -licui18n -licuuc -licudata -} +CONFIG += link_pkgconfig +PKGCONFIG += icu-i18n @@ -58,7 +58,7 @@ index 2c1b431..e29798b 100644 1.8.4.5 -From ab88cc720914a7d472553b98259c9f1b7f26adcc Mon Sep 17 00:00:00 2001 +From 91eac8ada1efdbe642f39a253a7438fd783faad2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 Subject: [PATCH 3/3] use pkg-config for harfbuzz (MXE specific) diff --git a/src/qtbase.mk b/src/qtbase.mk index 941df9c..1503f40 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.0 -$(PKG)_CHECKSUM := d4344110677cceb5f39819d1ea490ef397f5e4be +$(PKG)_VERSION := 5.3.1 +$(PKG)_CHECKSUM := 4496edb8377e303f09145a1215f79e62e3a7ba11 $(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.3/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 1a50c52..c5f7a5b 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b6ad220194dac278bb63fdfbed35f37fd3e88cb3 +$(PKG)_CHECKSUM := 5985dd36efa26ad1602923304c457c1aea663fca $(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 f722c5a..a803d9a 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2cc91a01804fec2eb49d814c82e85fc33fa7c52e +$(PKG)_CHECKSUM := 8b22ade7d079af57237b833e798c6c7a51cc71ce $(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 index f7e946c..fcb1718 100644 --- a/src/qtenginio.mk +++ b/src/qtenginio.mk @@ -4,7 +4,7 @@ PKG := qtenginio $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5f977761a90e19aa36d2ea1770f0cbb1fe2ac087 +$(PKG)_CHECKSUM := ec22c4402aaed610ac7bb684b69d0a27123d648d $(PKG)_SUBDIR = $(subst qtbase,qtenginio,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtenginio,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtenginio,$(qtbase_URL)) diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index c446006..a3a084c 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a13cba42e436ac4bd5fd83e4567474f350b6a940 +$(PKG)_CHECKSUM := 94ae5864854b21d5c5242c6f1d5aab07fa9b0cfe $(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.mk b/src/qtimageformats.mk index 936a550..ff8e01a 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9ab03e5744adea185f92af5bf5c99c51bbefc438 +$(PKG)_CHECKSUM := f32c76ebf35e66ee2634638ab8c992e4100e591e $(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 2215e7f..7f64905 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 19d8b2221b4a048998c51b8ab508ec0b26bd391c +$(PKG)_CHECKSUM := 9609c5998bb446908354ee3da42a4cde97128cd4 $(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.mk b/src/qtmultimedia.mk index 7f3d0e6..de46b19 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := dfe2adf633321d000fa75d59bb6924e050bd3e6b +$(PKG)_CHECKSUM := 61a9b5c3234db0291c86d51ca0d182047c5d517c $(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 0575480..48bd616 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -4,7 +4,7 @@ PKG := qtquick1 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 97d9204d4ca8f2baa3fb2601d16e48596df86284 +$(PKG)_CHECKSUM := 3fe4b64291fc8d1f4ef114bbb18ffb7904844455 $(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 6ca2210..4fd00e7 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 4ee9ad4dc0136b022d1d818e5ec8fca9f9d450ae +$(PKG)_CHECKSUM := ac5915fada5828ce51e1f3123264135cb7ae3803 $(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 a4a4240..a7fafb7 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7a4d5e78874f1a4ecaa5eee29aeb9e9baf8e430a +$(PKG)_CHECKSUM := 4cfa13724e9957dbbee19c6dffa8a5b1c33d0e05 $(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 fd341bf..01da873 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c7965141ae46cad604afb39f805f94af9813a03c +$(PKG)_CHECKSUM := 4e5b3ca414db68036413b764a0241d96cc569488 $(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 fced262..ceb1383 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := f69a44a80de514ef002104b1f1e9dd4f7629ffc0 +$(PKG)_CHECKSUM := 0161bc052a16c06aed4d539bfdef74d2f43b728c $(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 e94d987..34cf902 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 28d140bea1a46dca962e5708ef12dba61a391414 +$(PKG)_CHECKSUM := 81d2e97082f9bd59b6a644bd3207e7cb5a07831a $(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 index 8e4dc9f..0eb6163 100644 --- a/src/qttools-1.patch +++ b/src/qttools-1.patch @@ -1,14 +1,14 @@ # This file is part of MXE. # See index.html for further information. -From 5598f4297656326fd8a50fad2323fd5fe7e48653 Mon Sep 17 00:00:00 2001 +From 18cd79f0f377dff53720742a946123ea9800b164 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 +index a486d65..34416c9 100644 --- a/src/src.pro +++ b/src/src.pro @@ -27,7 +27,7 @@ android { @@ -18,8 +18,8 @@ index a07a3bb..bfbf722 100644 -win32|winrt:SUBDIRS += windeployqt +#win32|winrt:SUBDIRS += windeployqt winrt:SUBDIRS += winrtrunner qtd3dservice + qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag - qtNomakeTools( \ -- 1.8.4.5 diff --git a/src/qttools.mk b/src/qttools.mk index f16f795..52d9f11 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 25f79ef4f24930f0335e75eb2e8584ea27d51a54 +$(PKG)_CHECKSUM := 6b8a31f68c9827afb9a02121c581d910ad3488c8 $(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 609ca59..17790f0 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := dfb1afda34202089fbb12ca372e8c10766a5ad8c +$(PKG)_CHECKSUM := d4af85d6a2e6c5a1ebab425e1d55e3ddd4d084e8 $(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 35c42db..e643edf 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -4,7 +4,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b534de070519906a915682b9bf5216aa1a907049 +$(PKG)_CHECKSUM := 70d42197b81a19980916f2175189dc626bdfa0eb $(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 index 297b935..3a52288 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -4,7 +4,7 @@ PKG := qtwebsockets $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c21b04b7057b68fcd6b8b4cd74255899ec518202 +$(PKG)_CHECKSUM := 855b22cc6a532808e337c58bdcbc7d6d155b198c $(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL)) diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index ab2bfad..c15729a 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1aa4bbd9954f701c6d497b70729ad71015add287 +$(PKG)_CHECKSUM := 99330ce86e0a706f0b9328e44f4101acddbaa81a $(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 bb86820..c78d7e3 100644 --- a/src/qtxmlpatterns-1.patch +++ b/src/qtxmlpatterns-1.patch @@ -1,19 +1,19 @@ This file is part of MXE. See index.html for further information. -From 58ae17b18cea09c1fd3f8ec6912913e147f1f8f5 Mon Sep 17 00:00:00 2001 +From 5a2c60539f7cf6626bbeef3cca44aa172a64cc23 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 diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro -index 1fad197..2bbf5b5 100644 +index 0f1ee4f..2fdebb1 100644 --- a/tools/xmlpatterns/xmlpatterns.pro +++ b/tools/xmlpatterns/xmlpatterns.pro @@ -11,6 +11,7 @@ HEADERS = main.h \ qapplicationargument.cpp \ - qapplicationargumentparser.cpp + qapplicationargumentparser.cpp +win32-g++*:QMAKE_CXXFLAGS += -U__STRICT_ANSI__ load(qt_tool) diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index 5b0f489..b9c5a36 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7f0af98fe96c5bad677eb52a8070ad3913281b1a +$(PKG)_CHECKSUM := 5ae55208ffd170fcbdbdc560cf619415b6b06b7b $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12