From e91ec3826cd7b220e061aaf89743710db67627f0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 27 Feb 2015 21:30:52 +0100 Subject: qt5 modules: update --- src/qtactiveqt.mk | 2 +- src/qtbase-1.patch | 20 ++++++++++---------- 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.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebengine.mk | 2 +- src/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 24 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index afafa87..42f4fa0 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9a2dd4789ef87ba988f1b66d2cc7e6170cd75834 +$(PKG)_CHECKSUM := 5f37fd5316ebf8df45ff870b56320ff5be689ab0 $(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 4607570..1609768 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 a94aaf9332ef7f049e785ed8bc391539b66da69a Mon Sep 17 00:00:00 2001 +From 01ab4dd7d61a047c93164b8d8511ddb31d5740f1 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 26 Feb 2013 13:23:33 +0100 Subject: [PATCH 1/4] use pkg-config for freetype @@ -9,10 +9,10 @@ Subject: [PATCH 1/4] 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 88be809..8fc19d2 100644 +index c2b882e..3834d83 100644 --- a/src/platformsupport/fontdatabases/basic/basic.pri +++ b/src/platformsupport/fontdatabases/basic/basic.pri -@@ -82,5 +82,7 @@ contains(QT_CONFIG, freetype) { +@@ -83,5 +83,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) @@ -21,10 +21,10 @@ index 88be809..8fc19d2 100644 } -- -2.1.2 +2.1.0 -From 3ba546637346cdbcfe0224dfebdbfb429d293bf5 Mon Sep 17 00:00:00 2001 +From a6a467a7d8e6aaec6197c77887cae7c06f3c8659 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 May 2013 23:07:46 +0200 Subject: [PATCH 2/4] use pkgconfig for icu detection (MXE specific) @@ -55,10 +55,10 @@ index 16267ff..dd9fb6c 100644 +CONFIG += link_pkgconfig +PKGCONFIG += icu-i18n -- -2.1.2 +2.1.0 -From ac8761c959279f151f4fcfdf0ac08ceacbab9cc7 Mon Sep 17 00:00:00 2001 +From eed2ebcf407f7e674447917f9657a689d0d2233f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 Subject: [PATCH 3/4] use pkg-config for harfbuzz (MXE specific) @@ -88,10 +88,10 @@ index 7443368..c24e684 100644 + PKGCONFIG += harfbuzz } -- -2.1.2 +2.1.0 -From e7cfc640b13a73b2f4097714e1863e02affb2088 Mon Sep 17 00:00:00 2001 +From 315a827326804cd76b43aa01597dc761bb75268e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 Subject: [PATCH 4/4] fix oci config test on windows @@ -108,5 +108,5 @@ index 3ffda1d..39b6f3759 100644 -LIBS += -lclntsh +!win32:LIBS += -lclntsh -- -2.1.2 +2.1.0 diff --git a/src/qtbase.mk b/src/qtbase.mk index 55c9680..471401d 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.0 -$(PKG)_CHECKSUM := 2e3d32f32e36a92782ca66c260940824746900bd +$(PKG)_VERSION := 5.4.1 +$(PKG)_CHECKSUM := 134ec03371722cc31e2041a82c255cec708ca848 $(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.4/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 6518a69..51e67f5 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 08b1e365195cf0ed2d35d5f7fb3d6bda9a9e1dbe +$(PKG)_CHECKSUM := b49f34507f2ebebd400391a48244828d4ff89fa3 $(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 98c59e2..55a1195 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 12c12d50c71cfb1f18c7fabfabe4ad4b364b09fe +$(PKG)_CHECKSUM := fb345784035caafef2d848bb29ad6bfce8ec2f8f $(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 b43b0ea..6fe8348 100644 --- a/src/qtenginio.mk +++ b/src/qtenginio.mk @@ -4,7 +4,7 @@ PKG := qtenginio $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ec754e21ee461f9a41d66343fb24dcaa358a4a05 +$(PKG)_CHECKSUM := 35da0343762a6aa7ded2c62aa4b36e77152a9240 $(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 e21411e..c3182a0 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b83755ae9457d7a43691e6668a7f7330ff373bdf +$(PKG)_CHECKSUM := 9d0637176c9ce0006917dc52e6d20c975f0fb9a8 $(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 192f001..a18879c 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6590b61c51a186837c3d2058d8192886d970f92a +$(PKG)_CHECKSUM := 6fb124e2f8c644c97b56d023fcd90cf70dd5b1ba $(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 4e90cce..309b82d 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c47e80c4282f96de843d90341f93cd0f48333284 +$(PKG)_CHECKSUM := 9f37f03f2d15f1309567c1be284ddf91f89b5d20 $(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 3586495..85129c9 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a66fe5538f554957f60fc160121a3b0e7e72753b +$(PKG)_CHECKSUM := 5e9f06cccc86608ab185fc31a338b7b215342288 $(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 4fc9731..f833c69 100644 --- a/src/qtquick1.mk +++ b/src/qtquick1.mk @@ -4,7 +4,7 @@ PKG := qtquick1 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d4af107f1227f111b7a65924d2ce5e3c08c7ee20 +$(PKG)_CHECKSUM := f89cccdeac4c31157ac8b97fa96d426b5bb18630 $(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 bd66fbc..9e0884a 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1d8dd4a0b1c69e14805c59d4676c8406c65a4114 +$(PKG)_CHECKSUM := 696ddb887bba366cb8132e53a94d571ac94666b8 $(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 84220fa..c9b7e8e 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7ca8d6ccbc97fb24a9e76b69eeaa5e7e9c321955 +$(PKG)_CHECKSUM := 1b9ede97f3120c95c2dce322b6140eeb20416044 $(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 e83ef5f..f013581 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5fe798541707acfe7a4955076a0d27d8d58f4d15 +$(PKG)_CHECKSUM := b02811264b6d6fd790d4f3b68f42d6162e73fc4f $(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 92804e5..6681975 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ccfc39045d803405ec36bcfdbf281417dd96663a +$(PKG)_CHECKSUM := c87b381d6a0b6445c7fab54ef2807a555bfbcb47 $(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 5e10a14..951aee5 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b49d9974dd83c82887a076f9093250cb9fcceea7 +$(PKG)_CHECKSUM := f5bcaa91bd20ba7cdf27006a5553a6f182b62994 $(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 1b9e225..11a313b 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := e923f9f7b2696bc7f451325599d55739dd5aa88a +$(PKG)_CHECKSUM := 442820e4f2b9770595c7b8af402c497eaea72d51 $(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 6f5111a..7bcfc35 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7649c41015efd4d111b16866aaacb5ee475e0137 +$(PKG)_CHECKSUM := a66b5f6d81dddd82a6f328310a3ed3b1e513d948 $(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/qtwebchannel.mk b/src/qtwebchannel.mk index e5627bb..d3ef303 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -4,7 +4,7 @@ PKG := qtwebchannel $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := bd278ea77f689c3bf4bc1462cbcf0302004cf040 +$(PKG)_CHECKSUM := 7a27eac0bead6e60b5faaf360a6236dd96013c12 $(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL)) diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk index d951cc7..a8bd701 100644 --- a/src/qtwebengine.mk +++ b/src/qtwebengine.mk @@ -4,7 +4,7 @@ PKG := qtwebengine $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a98b0223ec941ac278b3a6b622d6877929c05185 +$(PKG)_CHECKSUM := 69dcc1c00aa0fec596133bd25ea2c024af2d8592 $(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL)) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 0e74f7d..c769e90 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -4,7 +4,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := e5e92e126bb673dadc329bc726c21bf4f994d829 +$(PKG)_CHECKSUM := 6cfebb74d334e77e26ecbe7d6609578eb46ab276 $(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 6bea02b..381a720 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -4,7 +4,7 @@ PKG := qtwebsockets $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d0b7e62bbdd634de01d5321f94a4bdff8b228cf5 +$(PKG)_CHECKSUM := 3fb9be047b67673f40d272faab5ba0c8055e7717 $(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 df78897..5ba619c 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := e6960d420a76d83fda6d9301ada8c7df314396f7 +$(PKG)_CHECKSUM := 99320b66e43ce6ef10d30974e06886a8e48c624b $(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 5cd539b..5be8ca6 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := e6d08bca4186b8c10e669836e5f6133ad59c9cce +$(PKG)_CHECKSUM := b25c2ec875fa1cbe0de20fd39bdd444c703540b4 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) -- cgit v0.12