Skip to content

Commit

Permalink
Fix bug: qt6 TLS openssl backend cannot be loaded while runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
ubuntu committed Mar 28, 2022
1 parent 97ddb67 commit e9f924c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
3 changes: 2 additions & 1 deletion qBittorrent/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ define Package/qBittorrent
SUBMENU:=BitTorrent
TITLE:=BitTorrent Client Programmed in C++ / Qt
URL:=https://www.qbittorrent.org/
DEPENDS:=+libQt6Core +libQt6Network +libQt6Sql +libQt6Xml +rblibtorrent
DEPENDS:=+libQt6Core +libQt6Network +libQt6Sql +libQt6Xml +rblibtorrent +qt6-plugin-libqopensslbackend +qt6-plugin-libqsqlite
endef

define Package/qBittorrent/description
Expand Down Expand Up @@ -65,3 +65,4 @@ define Package/qBittorrent/install
endef

$(eval $(call BuildPackage,qBittorrent))

5 changes: 4 additions & 1 deletion qBittorrent/files/qBittorrent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ Session\QueueingSystemEnabled=false
[Core]
AutoDeleteAddedTorrentFile=Never

[LegalNotice]
Accepted=true

[Meta]
MigrationVersion=2
MigrationVersion=3

[Network]
Proxy\OnlyForTorrents=false
Expand Down
13 changes: 8 additions & 5 deletions qt6base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ PKG_USE_MIPS16:=0

CMAKE_INSTALL:=1

STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS))

include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
Expand Down Expand Up @@ -59,8 +61,9 @@ ifdef CONFIG_USE_GLIBC
endif

CMAKE_HOST_OPTIONS += \
-DQT_FORCE_MIN_CMAKE_VERSION_FOR_BUILDING_QT=3.19 \
-DBUILD_SHARED_LIBS=OFF \
-DFEATURE_optimize_size=ON \
-DFEATURE_optimize_full=ON \
-DFEATURE_zstd=OFF \
-DFEATURE_concurrent=OFF \
-DFEATURE_dbus=ON \
Expand Down Expand Up @@ -106,15 +109,15 @@ define Build/Configure
-DCMAKE_FIND_USE_PACKAGE_REGISTRY=FALSE \
-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \
$(CMAKE_OPTIONS) \
-DCMAKE_INSTALL_PREFIX=/usr \
-DINSTALL_PLUGINSDIR=/usr/lib/qt6plugins \
-DCMAKE_SYSROOT=$(STAGING_DIR) \
-DQT_HOST_PATH=$(STAGING_DIR_HOSTPKG) \
-DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ \
-DQT_BUILD_EXAMPLES=OFF \
-DQT_BUILD_TESTS=OFF \
-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=OFF \
-DBUILD_SHARED_LIBS=ON \
-DFEATURE_optimize_size=ON \
-DFEATURE_optimize_full=ON \
-DFEATURE_system_zlib=ON \
-DFEATURE_zstd=OFF \
-DFEATURE_backtrace=OFF \
Expand Down Expand Up @@ -207,8 +210,8 @@ $(eval $(call DefineQt6Package,Widgets,Gui,))
$(eval $(call DefineQt6Package,Xml,Core,))

define Package/qt6-plugin/Default/install
$(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/plugins/$(2)/libq$(3).so $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/qt6plugins/$(2)/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/qt6plugins/$(2)/libq$(3).so $(1)/usr/lib/qt6plugins/$(2)/
endef

# 1: plugin diretory
Expand Down

0 comments on commit e9f924c

Please sign in to comment.