CVS commit: pkgsrc/net/qbittorrent

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Mar 30 17:17:23 UTC 2020

Modified Files:
        pkgsrc/net/qbittorrent: Makefile distinfo
Added Files:
        pkgsrc/net/qbittorrent/patches: patch-dist_CMakeLists.txt
            patch-src_app_CMakeLists.txt

Log Message:
qbittorrent: updated to 4.2.2

v4.2.2 changelog:

FEATURE: Allow transfer list text color changes through QSS
FEATURE: Option to show console when external program is run
FEATURE: Rename Country column to "Country / Region"
FEATURE: Change the defaults of some settings
FEATURE: Refactored Transfer List code to allow theming. As a sideffect the row height has more padding.
FEATURE: Allow double-click in preview dialog
FEATURE: Expose stop_tracker_timeout in advanced settings
FEATURE: Add piece_extent_affinity to AdvancedSettings
FEATURE: Reorganize UI theme selection
FEATURE: Show any multiple connections from the same IP in peer list
FEATURE: Add stalled filters to GUI and Web API/UI
FEATURE: Use IP geolocation database by DB-IP instead of MaxMind
FEATURE: Allow to save downloaded metadata as torrent file
FEATURE: Allow single app instance per configuration
PERFORMANCE: Move multiple torrents one by one
BUGFIX: Disable Torrent Queue by default for new users
BUGFIX: Update free disk space label on Category change in Auto Mode
BUGFIX: Save resume data after recheck
BUGFIX: Tracker is errored only if all local endpoints fail
BUGFIX: Change placement of stop tracker timeout setting
BUGFIX: Redesign torrent startup handling
BUGFIX: Show "∞" instead of " -1" in Preferences
BUGFIX: Improve code efficiency for reverse resolution of peers
BUGFIX: Handle HTTP redirection to magnet URI
BUGFIX: Various fixes for portable mode
BUGFIX: Include resume folder path in exception message
BUGFIX: Change placeholder text in torrent list's filter
BUGFIX: Improvements in the embedded tracker to be more spec compliant
BUGFIX: Improve the options tooltips
BUGFIX: Check if file exists in seed mode
BUGFIX: Delegate GUI scaling work to Qt
BUGFIX: Fix crash when renaming torrent contents
BUGFIX: Fix total connected peers count calculation
BUGFIX: Allow other keypresses in LogListWidget
BUGFIX: Disable Auto TMM when not using default savepath from monitored folder
WEBUI: Fix first row renaming in files tab
WEBUI: Use SVG image for WebUI favicon
WEBUI: Inherit text color for filter list elements
WEBUI: Expose WebUI ban counter to users
WEBUI: Expose WebUI ban duration to users
WEBUI: Implement "Secure" flag for session cookie
WEBUI: Remove unused/deprecated option
WEBUI: Prevent excessive sync requests
WEBUI: Fix populating statistics window
WEBUI: Fix matching uncategorized torrents
WEBUI: Always allow whitespace in category names
SEARCH: Bump python version for new installation
SEARCH: Fix missing string
SEARCH: Drop python2 support
WINDOWS: Installer: Option to start qBittorrent on Windows start up
WINDOWS: Installer: Improve Czech translation
WINDOWS: Installer: Update French translation
WINDOWS: Installer: Update German translation
WINDOWS: Installer: Update Japanese translation
WINDOWS: Path length limitation is removed on Windows 10 1607 onwards


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/qbittorrent/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/qbittorrent/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/qbittorrent/patches/patch-dist_CMakeLists.txt \
    pkgsrc/net/qbittorrent/patches/patch-src_app_CMakeLists.txt

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.6 pkgsrc/net/qbittorrent/Makefile:1.7
--- pkgsrc/net/qbittorrent/Makefile:1.6 Tue Mar 10 22:10:47 2020
+++ pkgsrc/net/qbittorrent/Makefile     Mon Mar 30 17:17:23 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/03/10 22:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/30 17:17:23 adam Exp $
 
-DISTNAME=      qbittorrent-4.2.1
-PKGREVISION=   4
+DISTNAME=      qbittorrent-4.2.2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=qbittorrent/}
 GITHUB_PROJECT=        qBittorrent
@@ -13,22 +12,26 @@ 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 c++14
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
-
-# C++11
-GCC_REQD+=     4.7
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 
+GCC_REQD+=     6 # c++14
+
 LDFLAGS.NetBSD+=       -ljemalloc
 
+.include "../../mk/bsd.prefs.mk"
+
 .include "../../devel/boost-libs/buildlink3.mk"
 .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 "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/qbittorrent/distinfo
diff -u pkgsrc/net/qbittorrent/distinfo:1.2 pkgsrc/net/qbittorrent/distinfo:1.3
--- pkgsrc/net/qbittorrent/distinfo:1.2 Sat Jan  4 17:03:25 2020
+++ pkgsrc/net/qbittorrent/distinfo     Mon Mar 30 17:17:23 2020
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2020/01/04 17:03:25 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/03/30 17:17:23 adam Exp $
 
-SHA1 (qbittorrent-4.2.1.tar.gz) = de29ee0166ec49155da03818cb2ed09170dc92d2
-RMD160 (qbittorrent-4.2.1.tar.gz) = 5c79f7fa6aec39ed9c62b05969787a8d593844ad
-SHA512 (qbittorrent-4.2.1.tar.gz) = 345c702a49d284fe28b45e52719a79195a784ba07339ea49c340d10d387482d3ba59335b2e41616de97e3813531e808c41239e597ef4b710fcebceb0c837483c
-Size (qbittorrent-4.2.1.tar.gz) = 7824636 bytes
+SHA1 (qbittorrent-4.2.2.tar.gz) = 877a4d3b9aa0761fcba6a948e0034d55ec6f9a6b
+RMD160 (qbittorrent-4.2.2.tar.gz) = cef064d6b104afa248538bc8a39bfe2b6078729e
+SHA512 (qbittorrent-4.2.2.tar.gz) = a6df94183597609c517c85ae45076a9885e67be4b261a79221021a398b92860c6925738593bb9ae33b270a5a906331ed76287f685aadc97906c8fb8094876ed2
+Size (qbittorrent-4.2.2.tar.gz) = 7947231 bytes
+SHA1 (patch-dist_CMakeLists.txt) = 5233c8c8bcbe522e07cbed1c969283810b048be4
+SHA1 (patch-src_app_CMakeLists.txt) = 2266baa28b9f0397fe5f634e0404f252ced6b4f2
 SHA1 (patch-src_base_utils_fs.cpp) = 88355e2698f5298c597f2240e853238831eb7994

Added files:

Index: pkgsrc/net/qbittorrent/patches/patch-dist_CMakeLists.txt
diff -u /dev/null pkgsrc/net/qbittorrent/patches/patch-dist_CMakeLists.txt:1.1
--- /dev/null   Mon Mar 30 17:17:23 2020
+++ pkgsrc/net/qbittorrent/patches/patch-dist_CMakeLists.txt    Mon Mar 30 17:17:23 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-dist_CMakeLists.txt,v 1.1 2020/03/30 17:17:23 adam Exp $
+
+Treat Darwin as any other UNIX.
+
+--- dist/CMakeLists.txt.orig   2020-03-30 17:02:36.000000000 +0000
++++ dist/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop-related files
+ 
+-if (APPLE)
++if (FALSE)
+     add_subdirectory(mac)
+ else (APPLE)
+     if (UNIX)
Index: pkgsrc/net/qbittorrent/patches/patch-src_app_CMakeLists.txt
diff -u /dev/null pkgsrc/net/qbittorrent/patches/patch-src_app_CMakeLists.txt:1.1
--- /dev/null   Mon Mar 30 17:17:23 2020
+++ pkgsrc/net/qbittorrent/patches/patch-src_app_CMakeLists.txt Mon Mar 30 17:17:23 2020
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_app_CMakeLists.txt,v 1.1 2020/03/30 17:17:23 adam Exp $
+
+Disable app bundle on Darwin.
+
+--- src/app/CMakeLists.txt.orig        2020-03-30 16:49:50.000000000 +0000
++++ src/app/CMakeLists.txt
+@@ -27,7 +27,6 @@ set_target_properties(qBittorrent
+     PROPERTIES
+         AUTOUIC True
+         AUTORCC True
+-        MACOSX_BUNDLE True
+ )
+ 
+ # translations
+@@ -102,7 +101,7 @@ if (NOT DISABLE_WEBUI)
+ endif()
+ 
+ # we have to include resources into the bundle
+-if (APPLE)
++if (FALSE)
+     set(OSX_RES_SRC_DIR "${qBittorrent_SOURCE_DIR}/dist/mac")
+     list(APPEND QBT_APP_RESOURCE_SOURCE
+         "${OSX_RES_SRC_DIR}/qt.conf"
+@@ -154,7 +153,7 @@ target_sources(qBittorrent PRIVATE ${QBT
+ 
+ get_target_property(QBT_EXECUTABLE_NAME qBittorrent OUTPUT_NAME)
+ 
+-if (APPLE)
++if (FALSE)
+     set(qbt_BUNDLE_NAME ${QBT_EXECUTABLE_NAME})
+ 
+ # substitute @EXECUTABLE@ in dist/mac/Info.plist
+@@ -173,7 +172,7 @@ install(TARGETS qBittorrent
+     BUNDLE  DESTINATION .
+     COMPONENT runtime)
+ 
+-if (Qt5Widgets_FOUND AND APPLE)
++if (FALSE)
+     find_package(Qt5Svg REQUIRED)
+     include(bundle)
+ endif (Qt5Widgets_FOUND AND APPLE)