298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-17 21:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt5: bump to v5.13.2 (#2971)

Browse Source 
Fix Qt5Network "Segmentation fault" error when running qBittorrent

Compile-tested on: x86_64, ipq40xx
Runtime-tested on: x86_64
This commit is contained in:
CN_SZTL 2020-02-07 03:24:14 +08:00 committed by GitHub
parent b71ae2d610
commit 0fa35495ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 4212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
package/lean/qt5/Makefile
View File

@ -11,17 +11,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5
PKG_VERSION:=5.9.8
PKG_RELEASE:=1
PKG_VERSION:=5.13
PKG_RELEASE:=2
PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/5.9/$(PKG_VERSION)/single
PKG_HASH:=86aca7dc37f161fc730a9d4f6bddf684962ca560327682e282ff61bf8b859c36
PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz
PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single/
PKG_HASH:=55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION)
PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE)
include $(INCLUDE_DIR)/package.mk
@ -47,7 +47,7 @@ endef
define Package/qt5-core
$(call Package/qt5/Default)
TITLE+=core
DEPENDS+=+libatomic +zlib +libpcre2-16 +libdouble-conversion
DEPENDS+=+libatomic +libzstd +zlib +libpcre2-16 +libdouble-conversion +icu
endef
define Package/qt5-network
@ -64,27 +64,19 @@ endef
CONFIGURE_ARGS = \
-prefix /usr \
-extprefix $(TOOLCHAIN_DIR) \
-sysroot $(STAGING_DIR) \
-plugindir /usr/lib/Qt/plugins \
-R /usr/lib \
-I $(STAGING_DIR)/usr/include \
-L $(STAGING_DIR)/usr/lib \
-xplatform linux-openwrt-g++ \
-release \
-shared \
-opensource \
-confirm-license \
-no-use-gold-linker \
-strip \
-ltcg \
-optimized-qmake \
-system-doubleconversion \
-no-glib \
-no-icu \
-system-pcre \
-system-zlib \
-no-slog2 \
-openssl-linked \
-openssl-runtime \
-no-cups \
-no-freetype \
-no-harfbuzz \
@ -93,18 +85,16 @@ CONFIGURE_ARGS = \
-no-opengles3 \
-no-angle \
-no-openvg \
-no-dbus \
-no-directfb \
-no-eglfs \
-no-egl \
-no-feature-getentropy \
-no-iconv \
-no-gbm \
-no-kms \
-no-xcb \
-no-pch \
-no-libudev \
-no-mtdev \
-no-tslib \
-no-xkbcommon-evdev \
-no-libpng \
-no-libjpeg \
-no-sql-db2 \
@ -117,53 +107,41 @@ CONFIGURE_ARGS = \
-no-sql-sqlite2 \
-no-sqlite \
-no-sql-tds \
-no-strip \
-no-xcb \
-no-gui \
-no-widgets \
-no-dbus \
-no-qml-debug \
-no-glib \
-make libs \
-nomake examples \
-nomake tests \
-nomake tools \
-no-compile-examples \
-skip qt3d \
-skip qtactiveqt \
-skip qtandroidextras \
-skip qtcanvas3d \
-skip qtcharts \
-skip qtconnectivity \
-skip qtdatavis3d \
-skip qtdeclarative \
-skip qtdoc \
-skip qtgamepad \
-skip qtgraphicaleffects \
-skip qtimageformats \
-skip qtlocation \
-skip qtmacextras \
-skip qtmultimedia \
-skip qtnetworkauth \
-skip qtpurchasing \
-skip qtquickcontrols \
-skip qtquickcontrols2 \
-skip qtremoteobjects \
-skip qtscript \
-skip qtscxml \
-skip qtsensors \
-skip qtserialbus \
-skip qtserialport \
-skip qtspeech \
-skip qtsvg \
-skip qttranslations \
-skip qtvirtualkeyboard \
-skip qtwayland \
-skip qtwebchannel \
-skip qtwebengine \
-skip qtwebsockets \
-skip qtwebview \
-skip qtwinextras \
-skip qtx11extras \
-skip qtxmlpatterns \
-v
-skip 3d \
-skip activeqt \
-skip charts \
-skip connectivity \
-skip datavis3d \
-skip declarative \
-skip doc \
-skip gamepad \
-skip imageformats \
-skip location \
-skip networkauth \
-skip multimedia \
-skip purchasing \
-skip remoteobjects \
-skip script \
-skip sensors \
-skip serialbus \
-skip serialport \
-skip speech \
-skip svg \
-skip wayland \
-skip webengine \
-skip websockets \
-skip webchannel \
-skip xmlpatterns \
-v \
define Build/Configure
$(SED) 's@$$$$(TARGET_CROSS)@$(TARGET_CROSS)@g' $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++/qmake.conf

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

@ -0,0 +1,19 @@
--- 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)

74
package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch
View File

@ -1,74 +0,0 @@
--- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -33,7 +33,6 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-
#include "socketcanbackend.h"
#include <QtCore/qdatastream.h>
@@ -50,29 +49,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
-#ifndef CANFD_MTU
-// CAN FD support was added by Linux kernel 3.6
-// For prior kernels we redefine the missing defines here
-// they are taken from linux/can/raw.h & linux/can.h
-
-enum {
- CAN_RAW_FD_FRAMES = 5
-};
-
-#define CAN_MAX_DLEN 8
-#define CANFD_MAX_DLEN 64
-struct canfd_frame {
- canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */
- __u8 len; /* frame payload length in byte */
- __u8 flags; /* additional flags for CAN FD */
- __u8 __res0; /* reserved / padding */
- __u8 __res1; /* reserved / padding */
- __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8)));
-};
-#define CAN_MTU (sizeof(struct can_frame))
-#define CANFD_MTU (sizeof(struct canfd_frame))
-#endif
#ifndef CANFD_BRS
# define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */
--- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h
+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h
@@ -45,6 +45,31 @@
#include <QtCore/qstring.h>
#include <QtCore/qvariant.h>
+#ifndef CANFD_MTU
+// CAN FD support was added by Linux kernel 3.6
+// For prior kernels we redefine the missing defines here
+// they are taken from linux/can/raw.h & linux/can.h
+
+enum {
+ CAN_RAW_FD_FRAMES = 5
+};
+
+#define CAN_MAX_DLEN 8
+#define CANFD_MAX_DLEN 64
+struct canfd_frame {
+ canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */
+ __u8 len; /* frame payload length in byte */
+ __u8 flags; /* additional flags for CAN FD */
+ __u8 __res0; /* reserved / padding */
+ __u8 __res1; /* reserved / padding */
+ __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8)));
+};
+#define CAN_MTU (sizeof(struct can_frame))
+#define CANFD_MTU (sizeof(struct canfd_frame))
+
+#endif
+
+
QT_BEGIN_NAMESPACE
class SocketCanBackend : public QCanBusDevice

91
package/lean/qt5/patches/020-disable_unused_libs.patch
View File

@ -1,91 +0,0 @@
This patch disables prinstsupport, sql, concurrent, testlib base libs compilation
--- a/qtbase/src/src.pro
+++ b/qtbase/src/src.pro
@@ -66,22 +66,10 @@ src_dbus.target = sub-dbus
src_dbus.depends = src_corelib
force_dbus_bootstrap: src_dbus.depends += src_tools_bootstrap_dbus # avoid syncqt race
-src_concurrent.subdir = $$PWD/concurrent
-src_concurrent.target = sub-concurrent
-src_concurrent.depends = src_corelib
-
-src_sql.subdir = $$PWD/sql
-src_sql.target = sub-sql
-src_sql.depends = src_corelib
-
src_network.subdir = $$PWD/network
src_network.target = sub-network
src_network.depends = src_corelib
-src_testlib.subdir = $$PWD/testlib
-src_testlib.target = sub-testlib
-src_testlib.depends = src_corelib # testlib links only to corelib, but see below for the headers
-
src_3rdparty_pcre2.subdir = $$PWD/3rdparty/pcre2
src_3rdparty_pcre2.target = sub-3rdparty-pcre2
@@ -125,13 +113,6 @@ src_openglextensions.subdir = $$PWD/open
src_openglextensions.target = sub-openglextensions
src_openglextensions.depends = src_gui
-src_printsupport.subdir = $$PWD/printsupport
-src_printsupport.target = sub-printsupport
-src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic
-
-src_plugins.subdir = $$PWD/plugins
-src_plugins.target = sub-plugins
-
src_android.subdir = $$PWD/android
# this order is important
@@ -152,14 +133,8 @@ TOOLS = src_tools_moc src_tools_rcc src_
win32:SUBDIRS += src_winmain
qtConfig(network) {
SUBDIRS += src_network
- src_plugins.depends += src_network
-}
-qtConfig(sql) {
- SUBDIRS += src_sql
- src_plugins.depends += src_sql
}
qtConfig(xml): SUBDIRS += src_xml
-qtConfig(testlib): SUBDIRS += src_testlib
qtConfig(dbus) {
force_dbus_bootstrap|qtConfig(private_tests): \
SUBDIRS += src_tools_bootstrap_dbus
@@ -167,9 +142,7 @@ qtConfig(dbus) {
TOOLS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
qtConfig(accessibility-atspi-bridge): \
src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp
- src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
}
-qtConfig(concurrent): SUBDIRS += src_concurrent
qtConfig(gui) {
qtConfig(harfbuzz):!qtConfig(system-harfbuzz) {
SUBDIRS += src_3rdparty_harfbuzzng
@@ -190,24 +163,17 @@ qtConfig(gui) {
}
SUBDIRS += src_gui src_platformsupport src_platformheaders
qtConfig(opengl): SUBDIRS += src_openglextensions
- src_plugins.depends += src_gui src_platformsupport src_platformheaders
- src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers
qtConfig(widgets) {
SUBDIRS += src_tools_uic src_widgets
!android-embedded: SUBDIRS += src_printsupport
TOOLS += src_tools_uic
- src_plugins.depends += src_widgets
- !android-embedded: src_plugins.depends += src_printsupport
- src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers
qtConfig(opengl) {
SUBDIRS += src_opengl
- src_plugins.depends += src_opengl
}
}
}
-SUBDIRS += src_plugins
-nacl: SUBDIRS -= src_network src_testlib
+nacl: SUBDIRS -= src_network
android:!android-embedded: SUBDIRS += src_android src_3rdparty_gradle

3985
package/lean/qt5/patches/030-qtbase-fix-compile-with-openssl1.1.1.patch
View File

File diff suppressed because it is too large Load Diff