openwrt/video
1
0
Fork 0
mirror of https://github.com/openwrt/video.git synced 2026-04-15 10:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrade Qt5 to version 5.9.1

Browse Source 
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!
This commit is contained in:
Mirko Vogt
2017-07-03 16:01:14 +02:00
parent fa3789dae6
commit ab90b203ba
7 changed files with 13 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frameworks/qt5base/Makefile
View File

@@ -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

4
frameworks/qt5graphicaleffects/Makefile
View File

@@ -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

4
frameworks/qt5quick2-controls2/Makefile
View File

@@ -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

4
frameworks/qt5quick2/Makefile
View File

@@ -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

40
frameworks/qt5quick2/patches/000-do-not-build-hosttools.patch
View File

@@ -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)

4
frameworks/qt5script/Makefile
View File

@@ -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

4
frameworks/qt5tools/Makefile
View File

@@ -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