Mercurial > mxe-octave
changeset 6113:24e29dcb2e64
Qt5: Update to version 5.15.3.
* src/qtbase.mk: Update version and checksum.
* src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied
upstream.
* src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk:
Update checksum.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 05 Mar 2022 10:59:53 +0100 |
| parents | 696446c9c4f4 |
| children | ae6a2bba873d |
| files | src/qtbase-2-gcc11.patch src/qtbase.mk src/qtimageformats.mk src/qtsvg.mk src/qttools.mk src/qttranslations.mk |
| diffstat | 6 files changed, 8 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-2-gcc11.patch Fri Mar 04 17:09:59 2022 +0100 +++ b/src/qtbase-2-gcc11.patch Sat Mar 05 10:59:53 2022 +0100 @@ -4,27 +4,6 @@ https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 Last-Update: 2021-01-26 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -44,6 +44,8 @@ - #include <QtCore/qfloat16.h> - #include <QtCore/qglobal.h> - -+#include <limits> -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include <stdlib.h> - #include <string.h> ---- a/src/corelib/global/qfloat16.h -+++ b/src/corelib/global/qfloat16.h -@@ -43,6 +43,7 @@ - - #include <QtCore/qglobal.h> - #include <QtCore/qmetatype.h> -+#include <limits> - #include <string.h> - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) --- a/src/corelib/text/qbytearraymatcher.h +++ b/src/corelib/text/qbytearraymatcher.h @@ -42,6 +42,8 @@
--- a/src/qtbase.mk Fri Mar 04 17:09:59 2022 +0100 +++ b/src/qtbase.mk Sat Mar 05 10:59:53 2022 +0100 @@ -3,11 +3,11 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.2 -$(PKG)_CHECKSUM := b5ad67fc6381ad7fae0296944734198488d096a3 +$(PKG)_VERSION := 5.15.3 +$(PKG)_CHECKSUM := d7383126e1f412ef26096692b9e50a1887eb11f7 $(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) +$(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) ifeq ($(USE_SYSTEM_FONTCONFIG),no) $(PKG)_FONTCONFIG := fontconfig endif
--- a/src/qtimageformats.mk Fri Mar 04 17:09:59 2022 +0100 +++ b/src/qtimageformats.mk Sat Mar 05 10:59:53 2022 +0100 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c17b57cec197d721b3c844ff1dd68ab9996f4603 +$(PKG)_CHECKSUM := 10487de5c9c6240847c1b860567e6a4fb12c3f41 $(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 Fri Mar 04 17:09:59 2022 +0100 +++ b/src/qtsvg.mk Sat Mar 05 10:59:53 2022 +0100 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 08531b47924078cbde6dfbf56da83651d58f6a13 +$(PKG)_CHECKSUM := 098a144b80997400be2f13ef5b9ddb286e0274c7 $(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 Fri Mar 04 17:09:59 2022 +0100 +++ b/src/qttools.mk Sat Mar 05 10:59:53 2022 +0100 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ae92f651b1b029bd6f55fc8888134d73d8ad19be +$(PKG)_CHECKSUM := 5ebd5b921ab4133f00eaf786e7d3ef79f9a1442c $(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 Fri Mar 04 17:09:59 2022 +0100 +++ b/src/qttranslations.mk Sat Mar 05 10:59:53 2022 +0100 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 980350bcbf680697bb2903955e2568ee9b5b365f +$(PKG)_CHECKSUM := e2a8e3521e27def226fc52bf040463e403a8a39f $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))