From ab90b203ba2a76184d2ee510eed35a39c1cefaaa Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Mon, 3 Jul 2017 16:01:14 +0200 Subject: [PATCH] upgrade Qt5 to version 5.9.1 5.9 is a LTS tree so we're gonna stick to that version for a while now. WARNING: This upgrade introduces a new dependency to pcre2 which is not available in the lede-17.01 release branch! --- frameworks/qt5base/Makefile | 6 +-- frameworks/qt5graphicaleffects/Makefile | 4 +- frameworks/qt5quick2-controls2/Makefile | 4 +- frameworks/qt5quick2/Makefile | 4 +- .../patches/000-do-not-build-hosttools.patch | 40 ------------------- frameworks/qt5script/Makefile | 4 +- frameworks/qt5tools/Makefile | 4 +- 7 files changed, 13 insertions(+), 53 deletions(-) delete mode 100644 frameworks/qt5quick2/patches/000-do-not-build-hosttools.patch diff --git a/frameworks/qt5base/Makefile b/frameworks/qt5base/Makefile index 9f307e1..ee6a141 100644 --- a/frameworks/qt5base/Makefile +++ b/frameworks/qt5base/Makefile @@ -12,9 +12,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5base -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.1 PKG_RELEASE:=1 -PKG_HASH:=c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005 +PKG_HASH:=bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6 PKG_SYS_NAME:=qtbase-opensource-src-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz @@ -102,7 +102,7 @@ endef define Package/qt5base-core $(call Package/qt5base/Default) TITLE+=core - DEPENDS+=+libpthread +zlib +libpcre16 +libstdcpp +librt +libdouble-conversion $(ICONV_DEPENDS) #+icu + DEPENDS+=+libpthread +zlib +libpcre2-16 +libstdcpp +librt +libdouble-conversion $(ICONV_DEPENDS) #+icu endef define Package/qt5base-gui diff --git a/frameworks/qt5graphicaleffects/Makefile b/frameworks/qt5graphicaleffects/Makefile index 0129129..d1dedef 100644 --- a/frameworks/qt5graphicaleffects/Makefile +++ b/frameworks/qt5graphicaleffects/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5graphicaleffects -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.1 PKG_RELEASE:=1 -PKG_HASH:=5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919 +PKG_HASH:=5f86c38e36d9553049cfbe56d4869e73cf8ab920905402cbcafb56dd8a1a59ff PKG_SYS_NAME:=qtgraphicaleffects-opensource-src-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz diff --git a/frameworks/qt5quick2-controls2/Makefile b/frameworks/qt5quick2-controls2/Makefile index c163418..ce36e87 100644 --- a/frameworks/qt5quick2-controls2/Makefile +++ b/frameworks/qt5quick2-controls2/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5quick2-controls2 -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.1 PKG_RELEASE:=1 -PKG_HASH:=b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b +PKG_HASH:=203be0321112d1513b722fce463f9e30d7d00befb33349901d9517f4f13408ff PKG_SYS_NAME:=qtquickcontrols2-opensource-src-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz diff --git a/frameworks/qt5quick2/Makefile b/frameworks/qt5quick2/Makefile index c7f6028..e49291a 100644 --- a/frameworks/qt5quick2/Makefile +++ b/frameworks/qt5quick2/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5quick2 -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.1 PKG_RELEASE:=1 -PKG_HASH:=32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46 +PKG_HASH:=d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff PKG_SYS_NAME:=qtdeclarative-opensource-src-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz diff --git a/frameworks/qt5quick2/patches/000-do-not-build-hosttools.patch b/frameworks/qt5quick2/patches/000-do-not-build-hosttools.patch deleted file mode 100644 index 194aa8d..0000000 --- a/frameworks/qt5quick2/patches/000-do-not-build-hosttools.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/tools/tools.pro 2016-06-11 14:05:08.000000000 +0200 -+++ b/tools/tools.pro 2016-08-26 14:21:46.134171309 +0200 -@@ -1,15 +1,15 @@ - TEMPLATE = subdirs - SUBDIRS += \ -- qmlmin \ -- qmlimportscanner -+# qmlmin \ -+# qmlimportscanner - - qmlmin.CONFIG = host_build - qmlimportscanner.CONFIG = host_build - - !android|android_app { - SUBDIRS += \ -- qml \ -- qmllint -+# qml \ -+# qmllint - - !contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmlprofiler - ---- a/src/qmldevtools/qmldevtools.pro 2016-06-11 14:05:08.000000000 +0200 -+++ b/src/qmldevtools/qmldevtools.pro 2016-08-26 14:20:10.322580100 +0200 -@@ -13,10 +13,10 @@ - clang:if(greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)): \ - WERROR += -Wno-error=unused-const-variable - --include(../3rdparty/masm/masm-defs.pri) --include(../qml/parser/parser.pri) --include(../qml/jsruntime/jsruntime.pri) --include(../qml/compiler/compiler.pri) --include(../qml/memory/memory.pri) -+#include(../3rdparty/masm/masm-defs.pri) -+#include(../qml/parser/parser.pri) -+#include(../qml/jsruntime/jsruntime.pri) -+#include(../qml/compiler/compiler.pri) -+#include(../qml/memory/memory.pri) - - load(qt_module) diff --git a/frameworks/qt5script/Makefile b/frameworks/qt5script/Makefile index 7c796d7..3464cbf 100644 --- a/frameworks/qt5script/Makefile +++ b/frameworks/qt5script/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5script -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.1 PKG_RELEASE:=1 -PKG_HASH:=293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3 +PKG_HASH:=176a08865d5f66437b0f279fc5d7f381f359f20bafbffcebdcac61e86415188f PKG_SYS_NAME:=qtscript-opensource-src-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz diff --git a/frameworks/qt5tools/Makefile b/frameworks/qt5tools/Makefile index eaf70bb..073fd34 100644 --- a/frameworks/qt5tools/Makefile +++ b/frameworks/qt5tools/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5tools -PKG_VERSION:=5.8.0 +PKG_VERSION:=5.9.1 PKG_RELEASE:=1 -PKG_HASH:=95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83 +PKG_HASH:=c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8, PKG_SYS_NAME:=qttools-opensource-src-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SYS_NAME).tar.xz -- 2.30.2