CVS commit: pkgsrc/net/qbittorrent

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 17 20:14:28 UTC 2024

Modified Files:
        pkgsrc/net/qbittorrent: Makefile distinfo
Added Files:
        pkgsrc/net/qbittorrent: options.mk

Log Message:
qbittorrent: updated to 4.6.3

v4.6.3
- BUGFIX: Correctly update number of filtered items (glassez)
- BUGFIX: Don't forget to store Stop condition value (glassez)
- BUGFIX: Show correctly decoded filename in log (glassez)
- BUGFIX: Specify a locale if none is set (Chocobo1)
- BUGFIX: Apply inactive seeding time limit set on new torrents (glassez)
- BUGFIX: Show URL seeds for torrents that have no metadata (glassez)
- BUGFIX: Don't get stuck loading on mismatched info-hashes in resume data (glassez)


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/net/qbittorrent/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/qbittorrent/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/qbittorrent/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/qbittorrent/Makefile
diff -u pkgsrc/net/qbittorrent/Makefile:1.63 pkgsrc/net/qbittorrent/Makefile:1.64
--- pkgsrc/net/qbittorrent/Makefile:1.63        Fri Dec 29 18:24:56 2023
+++ pkgsrc/net/qbittorrent/Makefile     Wed Jan 17 20:14:28 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2023/12/29 18:24:56 adam Exp $
+# $NetBSD: Makefile,v 1.64 2024/01/17 20:14:28 adam Exp $
 
-DISTNAME=      qbittorrent-4.6.2
-PKGREVISION=   1
+DISTNAME=      qbittorrent-4.6.3
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=qbittorrent/}
 GITHUB_PROJECT=        qBittorrent
@@ -12,7 +11,6 @@ HOMEPAGE=     https://www.qbittorrent.org/
 COMMENT=       BitTorrent client in Qt
 LICENSE=       gnu-gpl-v2
 
-USE_CMAKE=     yes
 # c++14 mode is required; also for libtorrent
 # https://github.com/qbittorrent/qBittorrent/issues/11425
 USE_LANGUAGES= c gnu++14
@@ -21,22 +19,19 @@ CMAKE_ARGS+=        -DCMAKE_BUILD_TYPE="Release
 # error "Boost.Stacktrace requires `_Unwind_Backtrace` function
 CMAKE_ARGS+=   -DSTACKTRACE=OFF
 
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-
 GCC_REQD+=     10 # c++14
 
 LDFLAGS.NetBSD+=       -ljemalloc
 
+.include "options.mk"
+
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.11
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/libtorrent-rasterbar/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.if ${OPSYS} == "Darwin"
-.  include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.endif
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/qbittorrent/distinfo
diff -u pkgsrc/net/qbittorrent/distinfo:1.31 pkgsrc/net/qbittorrent/distinfo:1.32
--- pkgsrc/net/qbittorrent/distinfo:1.31        Fri Dec  1 12:57:04 2023
+++ pkgsrc/net/qbittorrent/distinfo     Wed Jan 17 20:14:28 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2023/12/01 12:57:04 adam Exp $
+$NetBSD: distinfo,v 1.32 2024/01/17 20:14:28 adam Exp $
 
-BLAKE2s (qbittorrent-4.6.2.tar.gz) = a4fdebd47803af487576647c8ff4b7f0e8f4b6b66b3d653b2ec77777c258f66b
-SHA512 (qbittorrent-4.6.2.tar.gz) = 04977ae048a7f377b5d6a3091b93bbb84b085be9fb48a4096104fd00b77aaf41c8e62f6b527e69a92ce2ab604e95a91222d5f286b9219d094777833c302418e4
-Size (qbittorrent-4.6.2.tar.gz) = 9058275 bytes
+BLAKE2s (qbittorrent-4.6.3.tar.gz) = c88ae311d4d39665dba080d556f4d0aaefe49b23d37e93a07a14d964bb165c3b
+SHA512 (qbittorrent-4.6.3.tar.gz) = c261284cd01f5b2b7b4a243406f160c3661c1c9b96925c93aa953c23d1ef8e167bc7403166399763094b7346ac5be2bb7431ea6fd50a706f4db45d9f260e56f2
+Size (qbittorrent-4.6.3.tar.gz) = 9066434 bytes
 SHA1 (patch-dist_CMakeLists.txt) = 2c426222aa168c24a2e39a665f3152eca848e4a8
 SHA1 (patch-src_app_CMakeLists.txt) = 6ef5c2fd194607a5f2ab05a60b909e0c2998892c
 SHA1 (patch-src_base_utils_fs.cpp) = fe80c85424b59e7b89acfccfff58c89dc1122d22

Added files:

Index: pkgsrc/net/qbittorrent/options.mk
diff -u /dev/null pkgsrc/net/qbittorrent/options.mk:1.1
--- /dev/null   Wed Jan 17 20:14:28 2024
+++ pkgsrc/net/qbittorrent/options.mk   Wed Jan 17 20:14:28 2024
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2024/01/17 20:14:28 adam Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.qbittorrent
+PKG_OPTIONS_OPTIONAL_GROUPS=   gui
+PKG_OPTIONS_GROUP.gui=         qt5 qt6
+PKG_SUGGESTED_OPTIONS=         qt6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mqt5)
+CMAKE_ARGS+=   -DQT6=OFF
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+.  include "../../x11/qt5-qtbase/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mqt6)
+CMAKE_ARGS+=   -DQT6=ON
+TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
+.  include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.  include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif