From d5b379e71799eac8953a4941c9b6e2c4e3a03823 Mon Sep 17 00:00:00 2001
From: ubuntu <ubuntu@localhost.localdomain>
Date: Mon, 28 Mar 2022 18:47:25 +0800
Subject: [PATCH] Update qBittorrent to v4.4.2, qt to v6.2.4

---
 qBittorrent/Makefile               |  6 +++---
 qBittorrent/files/qBittorrent.conf |  5 ++++-
 qt6base/Makefile                   | 16 +++++++++-------
 qt6tools/Makefile                  |  4 ++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/qBittorrent/Makefile b/qBittorrent/Makefile
index b08cd6a..5ebe99a 100644
--- a/qBittorrent/Makefile
+++ b/qBittorrent/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qBittorrent
-PKG_VERSION:=4.4.1
+PKG_VERSION:=4.4.2
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)?
-PKG_HASH:=144a609514a7b516e65c4a4e32e49529b5e3949a713daf86332cd95867c991ba
+PKG_HASH:=f9406eb982a4b8a084341fb0bc30bd8b50babe5dcf4197204ab407b06e20e8a3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Krypton Lee <jun.k.lee199410@outlook.com>
@@ -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 +libtorrent-rasterbar
+  DEPENDS:=+libQt6Core +libQt6Network +libQt6Sql +libQt6Xml +libtorrent-rasterbar +qt6-plugin-libqopensslbackend +qt6-plugin-libqsqlite
 endef
 
 define Package/qBittorrent/description
diff --git a/qBittorrent/files/qBittorrent.conf b/qBittorrent/files/qBittorrent.conf
index 7c4001d..54d5674 100644
--- a/qBittorrent/files/qBittorrent.conf
+++ b/qBittorrent/files/qBittorrent.conf
@@ -11,8 +11,11 @@ Session\QueueingSystemEnabled=false
 [Core]
 AutoDeleteAddedTorrentFile=Never
 
+[LegalNotice]
+Accepted=true
+
 [Meta]
-MigrationVersion=2
+MigrationVersion=3
 
 [Network]
 Proxy\OnlyForTorrents=false
diff --git a/qt6base/Makefile b/qt6base/Makefile
index bd5e432..4ba3b9e 100644
--- a/qt6base/Makefile
+++ b/qt6base/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6base
 PKG_BASE_VERSION:=6.2
-PKG_SUBVERSION:=3
+PKG_SUBVERSION:=4
 PKG_VERSION:=$(PKG_BASE_VERSION).$(PKG_SUBVERSION)
 PKG_RELEASE:=0
 
-PKG_MD5SUM:=eba97e9e29f811a2da2784c18f65a9d6
+PKG_MD5SUM:=1a962f1105fea5650cdff57fff64509f
 PKG_SOURCE:=qtbase-everywhere-src-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_BASE_VERSION)/$(PKG_VERSION)/submodules
 
@@ -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
@@ -60,7 +62,7 @@ endif
 
 CMAKE_HOST_OPTIONS += \
 	-DBUILD_SHARED_LIBS=OFF \
-	-DFEATURE_optimize_size=ON \
+	-DFEATURE_optimize_full=ON \
 	-DFEATURE_zstd=OFF \
 	-DFEATURE_concurrent=OFF \
 	-DFEATURE_dbus=ON \
@@ -106,7 +108,7 @@ 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++ \
@@ -114,7 +116,7 @@ define Build/Configure
 			-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 \
@@ -207,8 +209,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
diff --git a/qt6tools/Makefile b/qt6tools/Makefile
index 2abce06..2c7ac52 100644
--- a/qt6tools/Makefile
+++ b/qt6tools/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt6tools
 PKG_BASE_VERSION:=6.2
-PKG_SUBVERSION:=3
+PKG_SUBVERSION:=4
 PKG_VERSION:=$(PKG_BASE_VERSION).$(PKG_SUBVERSION)
 PKG_RELEASE:=0
 
-PKG_MD5SUM:=479f8a174792d01b4a8f8eabee72ec5f
+PKG_MD5SUM:=17797d64a1c049bb5dfd919ba9203ffa
 PKG_SOURCE:=qttools-everywhere-src-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_BASE_VERSION)/$(PKG_VERSION)/submodules
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-everywhere-src-$(PKG_VERSION)