Mercurial > mxe-octave
changeset 4956:ddd66d48a646
Update qt5 to v5.12.1
* src/qtbase-1-fixes.patch: updated patch
* src/qtbase.mk: update version, checksum
* src/qtimageformats.mk: update checksum
* src/qtsvg.mk: update checksum
* src/qttools-1.patch: update patch
* src/qttools.mk: update checksum
| author | John D |
|---|---|
| date | Sun, 10 Feb 2019 07:58:15 -0500 |
| parents | 82da3c312020 |
| children | 6a321b868d57 |
| files | src/qtbase-1-fixes.patch src/qtbase.mk src/qtimageformats.mk src/qtsvg.mk src/qttools-1.patch src/qttools.mk |
| diffstat | 6 files changed, 18 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch Wed Feb 06 14:03:19 2019 -0500 +++ b/src/qtbase-1-fixes.patch Sun Feb 10 07:58:15 2019 -0500 @@ -1,8 +1,6 @@ This file is part of MXE. See LICENSE.md for licensing information. -Contains ad hoc patches for cross building. - -From f1dbf592c625533c9f8a704e4d5f12f3111a1fb3 Mon Sep 17 00:00:00 2001 +From 01ee0b5260f1b83a81769132c0705aab05481641 Mon Sep 17 00:00:00 2001 From: Ray Donnelly <mingw.android@gmail.com> Date: Wed, 26 Aug 2015 12:45:43 +0100 Subject: [PATCH 1/5] cmake: Rearrange STATIC vs INTERFACE targets @@ -37,7 +35,7 @@ 2.19.1 -From b822f7ff799d10297b0b36408e7cfa44fd416118 Mon Sep 17 00:00:00 2001 +From 48723a27c10322a9beff2f84422c757df2639edd Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sat, 16 Jul 2016 20:31:07 +1000 Subject: [PATCH 2/5] Fix pkgconfig file and library naming @@ -106,7 +104,7 @@ 2.19.1 -From 7773e45dfdd82ede2415a6818332de3e36e7c824 Mon Sep 17 00:00:00 2001 +From 6a7989a069a7aa88e898c4f68bd753b480af0cdf Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 29 Jan 2017 13:02:16 +0100 Subject: [PATCH 3/5] reenable fontconfig for win32 (MXE-specific) @@ -114,10 +112,10 @@ Change-Id: I05b036366bd402e43309742412bcf8ca91fe125f diff --git a/src/gui/configure.json b/src/gui/configure.json -index 0332631ec8..e2d87e77b3 100644 +index 89934c8f1d..456643a22c 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -1003,7 +1003,7 @@ +@@ -1209,7 +1209,7 @@ "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", @@ -147,7 +145,7 @@ 2.19.1 -From 82d08b0378db0a30007ca5ee965ffa034859af5c Mon Sep 17 00:00:00 2001 +From dbe7086a860dc8aac17ed5d76bc45d605a19ac02 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 11 Jun 2017 00:27:41 +0200 Subject: [PATCH 4/5] use pkg-config for harfbuzz @@ -155,12 +153,12 @@ Change-Id: Ia65cbb90fd180f1bc10ce077a9a8323a48e51421 diff --git a/src/gui/configure.json b/src/gui/configure.json -index e2d87e77b3..4eb37aea17 100644 +index 456643a22c..f36e15603b 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -224,7 +224,8 @@ - ] +@@ -301,7 +301,8 @@ }, + "headers": "harfbuzz/hb.h", "sources": [ - "-lharfbuzz" + { "type": "pkgConfig", "args": "harfbuzz" }, @@ -172,7 +170,7 @@ 2.19.1 -From 8ea9633854e8c2ad94df00866a9b9e3a4394d161 Mon Sep 17 00:00:00 2001 +From 2f96f49ffa2e4b42bb35da9304bba971cfcc1475 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 23 Nov 2017 11:28:47 +0200 Subject: [PATCH 5/5] disable qt_random_cpu for i686-w64-mingw32 @@ -193,7 +191,7 @@ Change-Id: Ia1c902e7b147bdda2b8d7904b40a3b968b8d0369 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 23e5e499b2..d0b3159c0d 100644 +index 6195c324e7..94902bcfc2 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -209,8 +207,8 @@ 2.19.1 diff -ur qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf ---- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 -+++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400 +--- qtbase-everywhere-src-5.11.0.orig/mkspecs/common/gcc-base.conf 2018-06-12 07:47:54.488874295 -0400 ++++ qtbase-everywhere-src-5.11.0/mkspecs/common/gcc-base.conf 2018-06-12 07:48:46.550096817 -0400 @@ -46,7 +46,7 @@ QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
--- a/src/qtbase.mk Wed Feb 06 14:03:19 2019 -0500 +++ b/src/qtbase.mk Sun Feb 10 07:58:15 2019 -0500 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.12.0 -$(PKG)_CHECKSUM := 67ea0cdbe65d9406dcef36b3a6899cb17c812678 +$(PKG)_VERSION := 5.12.1 +$(PKG)_CHECKSUM := e48e91f343a7b02dc7012c787a2e3fcb3589f16d $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats.mk Wed Feb 06 14:03:19 2019 -0500 +++ b/src/qtimageformats.mk Sun Feb 10 07:58:15 2019 -0500 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 078f96837498528ba2a70c946e608786e902461c +$(PKG)_CHECKSUM := f28b8715c7cd1390f4ea3a45ac68ee1901a242a5 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Wed Feb 06 14:03:19 2019 -0500 +++ b/src/qtsvg.mk Sun Feb 10 07:58:15 2019 -0500 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 74e571329b92e0371df9cfa349c3b91d7f65011b +$(PKG)_CHECKSUM := 2370c5913f95bcf1ec73397f1bfdea0a812fb60d $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools-1.patch Wed Feb 06 14:03:19 2019 -0500 +++ b/src/qttools-1.patch Sun Feb 10 07:58:15 2019 -0500 @@ -22,9 +22,3 @@ -- 2.1.2 -diff -ur qttools-everywhere-src-5.12.0.orig/qttools.pro qttools-everywhere-src-5.12.0/qttools.pro ---- qttools-everywhere-src-5.12.0.orig/qttools.pro 2018-12-18 15:49:35.257716175 -0500 -+++ qttools-everywhere-src-5.12.0/qttools.pro 2018-12-18 15:56:24.812146947 -0500 -@@ -1,2 +1 @@ --load(qt_find_clang) - load(qt_parts)
--- a/src/qttools.mk Wed Feb 06 14:03:19 2019 -0500 +++ b/src/qttools.mk Sun Feb 10 07:58:15 2019 -0500 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 25b37861ebbf3102baaed3c341aefb01056aa123 +$(PKG)_CHECKSUM := 134a0de2d0393e80fc13a5937f40144adaa9c312 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))