Mercurial > mxe-octave
changeset 5859:6821341b80cb release
Update qt5 to v5.15.2
* src/qtbase.mk: update version, checksum
* src/qtimageformats.mk, src/qtsvg.mk,
src/qttools.mk, src/qttranslations.mk: update checksum
* src/qtbase-1-fixes.patch: update patch
(grafted from 38be0ef93ce30264f5176dfb2d148d92a7861a36)
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sun, 29 Nov 2020 13:59:42 -0500 |
| parents | 8cfad4a44884 |
| children | 0474c7d212f6 337390a0c7e2 |
| files | src/qtbase-1-fixes.patch src/qtbase.mk src/qtimageformats.mk src/qtsvg.mk src/qttools.mk src/qttranslations.mk |
| diffstat | 6 files changed, 6 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qtbase-1-fixes.patch Fri Nov 27 13:54:56 2020 -0500 +++ b/src/qtbase-1-fixes.patch Sun Nov 29 13:59:42 2020 -0500 @@ -63,18 +63,6 @@ -- 2.25.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 -@@ -46,7 +46,7 @@ - QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC - QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC - QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC --QMAKE_CFLAGS_ISYSTEM = -isystem -+QMAKE_CFLAGS_ISYSTEM = -I - QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden - QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions diff -ur qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp --- qtbase-everywhere-src-5.13.0.orig/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:24:11.167038403 -0400 +++ qtbase-everywhere-src-5.13.0/src/plugins/platforms/minimal/qminimalintegration.cpp 2019-06-21 13:31:33.734199370 -0400
--- a/src/qtbase.mk Fri Nov 27 13:54:56 2020 -0500 +++ b/src/qtbase.mk Sun Nov 29 13:59:42 2020 -0500 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.15.0 -$(PKG)_CHECKSUM := f5191757d1125aa7750a3f5d39321490477cfb65 +$(PKG)_VERSION := 5.15.2 +$(PKG)_CHECKSUM := b5ad67fc6381ad7fae0296944734198488d096a3 $(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 Fri Nov 27 13:54:56 2020 -0500 +++ b/src/qtimageformats.mk Sun Nov 29 13:59:42 2020 -0500 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := e7c816cb8f06c8e88d4b59d084db29dc5fe45a26 +$(PKG)_CHECKSUM := c17b57cec197d721b3c844ff1dd68ab9996f4603 $(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 Nov 27 13:54:56 2020 -0500 +++ b/src/qtsvg.mk Sun Nov 29 13:59:42 2020 -0500 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6da4345fcb676f8483c282dee1366db31370775b +$(PKG)_CHECKSUM := 08531b47924078cbde6dfbf56da83651d58f6a13 $(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 Nov 27 13:54:56 2020 -0500 +++ b/src/qttools.mk Sun Nov 29 13:59:42 2020 -0500 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9b5ea97ebe7e3e3be118060b42293c4237a465de +$(PKG)_CHECKSUM := ae92f651b1b029bd6f55fc8888134d73d8ad19be $(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 Nov 27 13:54:56 2020 -0500 +++ b/src/qttranslations.mk Sun Nov 29 13:59:42 2020 -0500 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := fb7b76c23df5ececfbce35a8f5ffba987807194a +$(PKG)_CHECKSUM := 980350bcbf680697bb2903955e2568ee9b5b365f $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))