fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5: Update to 5.15.2

Browse Source 
Removed upstreamed patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-03-11 16:46:23 +08:00
parent cd48c34584
commit 9efa24c19f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/lean/qt5/Makefile
View File

@ -10,19 +10,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
QT5_VERSION_MAJOR_MINOR:=5.13 QT5_VERSION_MAJOR_MINOR:=5.15
QT5_VERSION_PATCH:=2 QT5_VERSION_PATCH:=2
PKG_NAME:=qt5 PKG_NAME:=qt5
PKG_VERSION:=$(QT5_VERSION_MAJOR_MINOR)$(if $(QT5_VERSION_PATCH),.$(QT5_VERSION_PATCH)) PKG_VERSION:=$(QT5_VERSION_MAJOR_MINOR)$(if $(QT5_VERSION_PATCH),.$(QT5_VERSION_PATCH))
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).tar.xz PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://mirrors.cloud.tencent.com/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ PKG_SOURCE_URL:=https://mirrors.tencent.com/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \
https://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ https://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \
https://mirrors.ustc.edu.cn/qtproject/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ https://mirrors.ustc.edu.cn/qtproject/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \
http://download.qt-project.org/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ http://download.qt-project.org/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/
PKG_HASH:=55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08 PKG_HASH:=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION) PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION)
@ -66,7 +66,7 @@ endef
define Package/qt5-sql define Package/qt5-sql
$(call Package/qt5/Default) $(call Package/qt5/Default)
TITLE+=sql TITLE+=sql
DEPENDS+=+qt5-core DEPENDS+=+qt5-core +libsqlite3
endef endef
define Package/qt5-xml define Package/qt5-xml
@ -90,6 +90,8 @@ CONFIGURE_ARGS = \
-system-pcre \ -system-pcre \
-system-zlib \ -system-zlib \
-openssl-runtime \ -openssl-runtime \
-sql-sqlite \
-sqlite \
-no-cups \ -no-cups \
-no-freetype \ -no-freetype \
-no-harfbuzz \ -no-harfbuzz \
@ -116,9 +118,7 @@ CONFIGURE_ARGS = \
-no-sql-oci \ -no-sql-oci \
-no-sql-odbc \ -no-sql-odbc \
-no-sql-psql \ -no-sql-psql \
-no-sql-sqlite \
-no-sql-sqlite2 \ -no-sql-sqlite2 \
-no-sqlite \
-no-sql-tds \ -no-sql-tds \
-no-strip \ -no-strip \
-no-xcb \ -no-xcb \
@ -186,8 +186,9 @@ define Package/qt5-network/install
endef endef
define Package/qt5-sql/install define Package/qt5-sql/install
$(INSTALL_DIR) $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/Qt/plugins/sqldrivers
$(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Sql.so* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Sql.so* $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/qtbase/plugins/sqldrivers/*.so $(1)/usr/lib/Qt/plugins/sqldrivers/
endef endef
define Package/qt5-xml/install define Package/qt5-xml/install

19
package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch
View File

@ -1,19 +0,0 @@
--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-10-25 15:16:48.000000000 +0800
+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-02-06 23:29:33.072453568 +0800
@@ -1376,12 +1376,12 @@
RESOLVEFUNC(SSL_select_next_proto)
RESOLVEFUNC(SSL_CTX_set_next_proto_select_cb)
RESOLVEFUNC(SSL_get0_next_proto_negotiated)
-#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ...
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
- RESOLVEFUNC(SSL_set_alpn_protos)
- RESOLVEFUNC(SSL_CTX_set_alpn_select_cb)
- RESOLVEFUNC(SSL_get0_alpn_selected)
+ RESOLVEFUNC(SSL_set_alpn_protos)
+ RESOLVEFUNC(SSL_CTX_set_alpn_select_cb)
+ RESOLVEFUNC(SSL_get0_alpn_selected)
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ...
+#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ...
#if QT_CONFIG(dtls)
RESOLVEFUNC(SSL_CTX_set_cookie_generate_cb)
RESOLVEFUNC(SSL_CTX_set_cookie_verify_cb)