d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qt5 modules: update

This commit is contained in:
Mark Brand 2015-06-03 09:31:54 +02:00
parent aa36c59091
commit a46bb6eafa
24 changed files with 37 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qtactiveqt.mk
View File

@ -4,7 +4,7 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 5f37fd5316ebf8df45ff870b56320ff5be689ab0
$(PKG)_CHECKSUM := ff020cb348fd392209c1c7d87bdbf43cb4622a0b
$(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL))

68
src/qtbase-1.patch
View File

@ -1,10 +1,10 @@
This file is part of MXE.
See index.html for further information.
From 01ab4dd7d61a047c93164b8d8511ddb31d5740f1 Mon Sep 17 00:00:00 2001
From 90cd274c70f9532cfc58b1a741ccd480715f006d 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/5] use pkg-config for freetype
Subject: [PATCH 1/4] use pkg-config for freetype
Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
@ -21,13 +21,13 @@ index c2b882e..3834d83 100644
}
--
2.1.0
2.1.4
From a6a467a7d8e6aaec6197c77887cae7c06f3c8659 Mon Sep 17 00:00:00 2001
From f43e7ee33db38727c574cf14b42a1d377e91cfd1 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 18 May 2013 23:07:46 +0200
Subject: [PATCH 2/5] use pkgconfig for icu detection (MXE specific)
Subject: [PATCH 2/4] use pkgconfig for icu detection (MXE specific)
Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3
@ -55,13 +55,13 @@ index 16267ff..dd9fb6c 100644
+CONFIG += link_pkgconfig
+PKGCONFIG += icu-i18n
--
2.1.0
2.1.4
From eed2ebcf407f7e674447917f9657a689d0d2233f Mon Sep 17 00:00:00 2001
From 536262f746f5110edf5c50949a4ce1c94bd8b8e4 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 21 Jun 2014 13:12:49 +0200
Subject: [PATCH 3/5] use pkg-config for harfbuzz (MXE specific)
Subject: [PATCH 3/4] use pkg-config for harfbuzz (MXE specific)
Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
@ -88,13 +88,13 @@ index 7443368..c24e684 100644
+ PKGCONFIG += harfbuzz
}
--
2.1.0
2.1.4
From 315a827326804cd76b43aa01597dc761bb75268e Mon Sep 17 00:00:00 2001
From 8f057f09c41b12133643a3080cca0076b9153d05 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 8 Dec 2014 14:15:12 +0100
Subject: [PATCH 4/5] fix oci config test on windows
Subject: [PATCH 4/4] fix oci config test on windows
Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
@ -108,49 +108,5 @@ index 3ffda1d..39b6f3759 100644
-LIBS += -lclntsh
+!win32:LIBS += -lclntsh
--
2.1.0
From 22e870578fbf6d25178674fdc6ff032257459eb9 Mon Sep 17 00:00:00 2001
From: "Richard J. Moore" <rich@kde.org>
Date: Sat, 21 Feb 2015 17:43:21 +0000
Subject: [PATCH 5/5] Fix a division by zero when processing malformed BMP
files.
This fixes a division by 0 when processing a maliciously crafted BMP
file. No impact beyond DoS.
Task-number: QTBUG-44547
Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
(cherry picked from commit 661f6bfd032dacc62841037732816a583640e187)
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index 21c1a2f..df66499 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
}
} else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
red_shift = calc_shift(red_mask);
+ if (((red_mask >> red_shift) + 1) == 0)
+ return false;
red_scale = 256 / ((red_mask >> red_shift) + 1);
green_shift = calc_shift(green_mask);
+ if (((green_mask >> green_shift) + 1) == 0)
+ return false;
green_scale = 256 / ((green_mask >> green_shift) + 1);
blue_shift = calc_shift(blue_mask);
+ if (((blue_mask >> blue_shift) + 1) == 0)
+ return false;
blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
alpha_shift = calc_shift(alpha_mask);
+ if (((alpha_mask >> alpha_shift) + 1) == 0)
+ return false;
alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
} else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
blue_mask = 0x000000ff;
--
2.1.0
2.1.4

6
src/qtbase.mk
View File

@ -3,11 +3,11 @@
PKG := qtbase
$(PKG)_IGNORE :=
$(PKG)_VERSION := 5.4.1
$(PKG)_CHECKSUM := 134ec03371722cc31e2041a82c255cec708ca848
$(PKG)_VERSION := 5.4.2
$(PKG)_CHECKSUM := 3703c6a584193e759f5b9cbf0ea6022d685ab827
$(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)
$(PKG)_URL := http://download.qt.io/official_releases/qt/5.4/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc postgresql freetds openssl harfbuzz zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c
define $(PKG)_UPDATE

2
src/qtconnectivity.mk
View File

@ -4,7 +4,7 @@
PKG := qtconnectivity
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := b49f34507f2ebebd400391a48244828d4ff89fa3
$(PKG)_CHECKSUM := 66b9b3034b84cef7b21c71bafa755930d2f1e4ce
$(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL))

2
src/qtdeclarative.mk
View File

@ -4,7 +4,7 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := fb345784035caafef2d848bb29ad6bfce8ec2f8f
$(PKG)_CHECKSUM := 3d5f346e3dd377f66bf193316c259d21e3eccb8d
$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL))

2
src/qtenginio.mk
View File

@ -4,7 +4,7 @@
PKG := qtenginio
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 35da0343762a6aa7ded2c62aa4b36e77152a9240
$(PKG)_CHECKSUM := 3be31b3178801ddc258d9f381fe034d77d1da5a3
$(PKG)_SUBDIR = $(subst qtbase,qtenginio,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtenginio,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtenginio,$(qtbase_URL))

2
src/qtgraphicaleffects.mk
View File

@ -4,7 +4,7 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 9d0637176c9ce0006917dc52e6d20c975f0fb9a8
$(PKG)_CHECKSUM := 72abe24fe63d56ce2142cf7aeb43ad7f7ee06b39
$(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))

2
src/qtimageformats.mk
View File

@ -4,7 +4,7 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 6fb124e2f8c644c97b56d023fcd90cf70dd5b1ba
$(PKG)_CHECKSUM := 15dab37445225f979509a4d0a1cef776955ca01b
$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))

2
src/qtlocation.mk
View File

@ -4,7 +4,7 @@
PKG := qtlocation
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 9f37f03f2d15f1309567c1be284ddf91f89b5d20
$(PKG)_CHECKSUM := c3b49b1ae4eb4a02ae525b14a8096f0d1cac02e6
$(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL))

2
src/qtmultimedia.mk
View File

@ -4,7 +4,7 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 5e9f06cccc86608ab185fc31a338b7b215342288
$(PKG)_CHECKSUM := 4a76bfc2567de7a72ae22156e4d49e186d889848
$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL))

2
src/qtquick1.mk
View File

@ -4,7 +4,7 @@
PKG := qtquick1
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := f89cccdeac4c31157ac8b97fa96d426b5bb18630
$(PKG)_CHECKSUM := d47f8488f24e5de8328a844725afa6bd541a1699
$(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL))

2
src/qtquickcontrols.mk
View File

@ -4,7 +4,7 @@
PKG := qtquickcontrols
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 696ddb887bba366cb8132e53a94d571ac94666b8
$(PKG)_CHECKSUM := fdd3e0cafe69bcf27870b1d1b8a2c94e91c1aaff
$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL))

2
src/qtscript.mk
View File

@ -4,7 +4,7 @@
PKG := qtscript
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 1b9ede97f3120c95c2dce322b6140eeb20416044
$(PKG)_CHECKSUM := 91ca6d9c6a017ed47d9c731867a03c5be1f3ea88
$(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL))

2
src/qtsensors.mk
View File

@ -4,7 +4,7 @@
PKG := qtsensors
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := b02811264b6d6fd790d4f3b68f42d6162e73fc4f
$(PKG)_CHECKSUM := f585798e4620721224edc86220153de35077ccae
$(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL))

2
src/qtserialport.mk
View File

@ -4,7 +4,7 @@
PKG := qtserialport
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := c87b381d6a0b6445c7fab54ef2807a555bfbcb47
$(PKG)_CHECKSUM := aa843f96fe1a49d91eb7582d3be5035de5b5508e
$(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL))

2
src/qtsvg.mk
View File

@ -4,7 +4,7 @@
PKG := qtsvg
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := f5bcaa91bd20ba7cdf27006a5553a6f182b62994
$(PKG)_CHECKSUM := aaf98efe775cfba210b2a72281365f0612884f6a
$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))

2
src/qttools.mk
View File

@ -4,7 +4,7 @@
PKG := qttools
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 442820e4f2b9770595c7b8af402c497eaea72d51
$(PKG)_CHECKSUM := 346f0c000203623559a24e75a7808390721f35bb
$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))

2
src/qttranslations.mk
View File

@ -4,7 +4,7 @@
PKG := qttranslations
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := a66b5f6d81dddd82a6f328310a3ed3b1e513d948
$(PKG)_CHECKSUM := a7825e593526108e70bceaa274f184105a2bd465
$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))

2
src/qtwebchannel.mk
View File

@ -4,7 +4,7 @@
PKG := qtwebchannel
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 7a27eac0bead6e60b5faaf360a6236dd96013c12
$(PKG)_CHECKSUM := 6f5c15f50c45df6392ab0e01c47043fd0100a389
$(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL))

2
src/qtwebengine.mk
View File

@ -4,7 +4,7 @@
PKG := qtwebengine
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 69dcc1c00aa0fec596133bd25ea2c024af2d8592
$(PKG)_CHECKSUM := 5d6f4bfadc5e2aeca44266147b0e76a43feda987
$(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL))

2
src/qtwebkit.mk
View File

@ -4,7 +4,7 @@
PKG := qtwebkit
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 6cfebb74d334e77e26ecbe7d6609578eb46ab276
$(PKG)_CHECKSUM := 402cd585ed7fea63b338fa6f89aec8b21db3564a
$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL))

2
src/qtwebsockets.mk
View File

@ -4,7 +4,7 @@
PKG := qtwebsockets
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 3fb9be047b67673f40d272faab5ba0c8055e7717
$(PKG)_CHECKSUM := 726523b736d252f7ef2247456858e27ca92697b9
$(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL))

2
src/qtwinextras.mk
View File

@ -4,7 +4,7 @@
PKG := qtwinextras
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 99320b66e43ce6ef10d30974e06886a8e48c624b
$(PKG)_CHECKSUM := 884b7b99eb29f8540f0c0fb3c8dcb2ee66ed31f2
$(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL))

2
src/qtxmlpatterns.mk
View File

@ -4,7 +4,7 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := b25c2ec875fa1cbe0de20fd39bdd444c703540b4
$(PKG)_CHECKSUM := 6c98c6a5b8fd4f07bf709e0470f9988c86dfe15c
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))