Mercurial > mxe-octave
changeset 6264:3eae40f95cc3
qt5: update to v5.15.5
* src/qtbase.mk: update version, checksum
* src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk,
src/qttranslations.mk: update checksum
* src/qtbase-2-gcc11.patch: deleted
* dist-files.mk: remove ref to deleted file
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Mon, 20 Jun 2022 07:36:53 -0400 |
| parents | a63a391d9e24 |
| children | 326fb0bb3f96 |
| files | dist-files.mk src/qtbase-2-gcc11.patch src/qtbase.mk src/qtimageformats.mk src/qtsvg.mk src/qttools.mk src/qttranslations.mk |
| diffstat | 7 files changed, 6 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Thu Jun 16 09:08:29 2022 -0400 +++ b/dist-files.mk Mon Jun 20 07:36:53 2022 -0400 @@ -635,7 +635,6 @@ qt.mk \ qt5.mk \ qtbase-1-fixes.patch \ - qtbase-2-gcc11.patch \ qtbase.mk \ qtimageformats.mk \ qtsvg.mk \
--- a/src/qtbase-2-gcc11.patch Thu Jun 16 09:08:29 2022 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -Description: include <limits> to fix some GCC 11 build issues -Origin: upstream, commits: - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 - https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 -Last-Update: 2021-01-26 - ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include <QtCore/qbytearray.h> - -+#include <limits> -+ - QT_BEGIN_NAMESPACE - - -$ diff -Naup ./src/corelib/tools/qoffsetstringarray_p.h.orig ./src/corelib/tools/qoffsetstringarray_p.h ---- ./src/corelib/tools/qoffsetstringarray_p.h.orig 2020-10-27 09:02:11.000000000 +0100 -+++ ./src/corelib/tools/qoffsetstringarray_p.h 2021-08-11 18:57:24.580782075 +0200 -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - -
--- a/src/qtbase.mk Thu Jun 16 09:08:29 2022 -0400 +++ b/src/qtbase.mk Mon Jun 20 07:36:53 2022 -0400 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.4 -$(PKG)_CHECKSUM := c3d655dc1d29599b5545ca206922275ec4ba9ae9 +$(PKG)_VERSION := 5.15.5 +$(PKG)_CHECKSUM := ee086a58451942e4ec190f4556d7248ec542658b $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats.mk Thu Jun 16 09:08:29 2022 -0400 +++ b/src/qtimageformats.mk Mon Jun 20 07:36:53 2022 -0400 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1fc4f7a88fcbb211250bf416619737f6c00cc47d +$(PKG)_CHECKSUM := a982b634845bf6384a40c8c65e987d35501f9f7b $(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 Thu Jun 16 09:08:29 2022 -0400 +++ b/src/qtsvg.mk Mon Jun 20 07:36:53 2022 -0400 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := e5931f7cd1efef3401d27dbb8aa53d0c52d4b7d6 +$(PKG)_CHECKSUM := 629f2f436accd8f46200d6b53153f9921e879f54 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Thu Jun 16 09:08:29 2022 -0400 +++ b/src/qttools.mk Mon Jun 20 07:36:53 2022 -0400 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 877bfb4c8c8ee6d826d11d55ccfb6c43efd6ab28 +$(PKG)_CHECKSUM := cc4dc55b74e21802f3fb12878814ff1c9993bbd1 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Thu Jun 16 09:08:29 2022 -0400 +++ b/src/qttranslations.mk Mon Jun 20 07:36:53 2022 -0400 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5fc78095f0ebc673ace7626eda516367ef1f86b8 +$(PKG)_CHECKSUM := 4ebffbf89e87ea19a01c35a91b96f5348375e1eb $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))