From a5217b290109edd437c990ad7f0e0b20fed78f00 Mon Sep 17 00:00:00 2001 From: M1A6I3L <58336295+M1A6I3L@users.noreply.github.com> Date: Wed, 9 Dec 2020 14:40:13 +0800 Subject: [PATCH] Fix qbt compilation errors in specific situation (#5895) Add qt5-sql to the dependencies of qbt. --- package/lean/qBittorrent/Makefile | 2 +- package/lean/qt5/Makefile | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/lean/qBittorrent/Makefile b/package/lean/qBittorrent/Makefile index fea6a7006..116446420 100644 --- a/package/lean/qBittorrent/Makefile +++ b/package/lean/qBittorrent/Makefile @@ -25,7 +25,7 @@ define Package/qBittorrent CATEGORY:=Network TITLE:=bittorrent client programmed in C++ / Qt URL:=https://www.qbittorrent.org/ - DEPENDS:=+qt5-core +qt5-network +qt5-xml +rblibtorrent + DEPENDS:=+qt5-core +qt5-network +qt5-sql +qt5-xml +rblibtorrent endef define Package/qBittorrent/description diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile index a03d9d79e..585e3e54e 100644 --- a/package/lean/qt5/Makefile +++ b/package/lean/qt5/Makefile @@ -58,6 +58,12 @@ define Package/qt5-network DEPENDS+=+qt5-core +libopenssl endef +define Package/qt5-sql + $(call Package/qt5/Default) + TITLE+=sql + DEPENDS+=+qt5-core +endef + define Package/qt5-xml $(call Package/qt5/Default) TITLE+=xml @@ -174,6 +180,11 @@ define Package/qt5-network/install $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Network.so* $(1)/usr/lib endef +define Package/qt5-sql/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Sql.so* $(1)/usr/lib/ +endef + define Package/qt5-xml/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Xml.so* $(1)/usr/lib @@ -181,4 +192,5 @@ endef $(eval $(call BuildPackage,qt5-core,+zlib,+libpcre2-16,+libdouble-conversion)) $(eval $(call BuildPackage,qt5-network)) +$(eval $(call BuildPackage,qt5-sql)) $(eval $(call BuildPackage,qt5-xml))