Updating net/qbittorrent from 4.3.9 to 4.4.2
Changelog: https://github.com/qbittorrent/qBittorrent/blob/release-4.4.2/Changelog Some things got fixed upstream so we don't need that on patches anymore. I rearrange the WANTLIB when adding some new lib deps. Tested OK on amd64. Asking for OKs because we are near the lock of the tree. Cheers. Elias mariani@ Index: Makefile.inc =================================================================== RCS file: /cvs/ports/net/qbittorrent/Makefile.inc,v retrieving revision 1.20 diff -u -p -r1.20 Makefile.inc --- Makefile.inc 11 Mar 2022 19:47:15 -0000 1.20 +++ Makefile.inc 28 Mar 2022 21:39:46 -0000 @@ -1,7 +1,7 @@ # qmake picks up gcrypt.h even though it's unused DPB_PROPERTIES = nojunk -VER = 4.3.9 +VER = 4.4.2 DISTNAME = qbittorrent-${VER} DIST_SUBDIR = qbittorrent Index: qbittorrent/Makefile =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- qbittorrent/Makefile 11 Mar 2022 19:47:15 -0000 1.17 +++ qbittorrent/Makefile 28 Mar 2022 21:39:46 -0000 @@ -1,8 +1,8 @@ COMMENT = BitTorrent client with Qt interface -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml boost_system -WANTLIB += boost_system-mt c crypto execinfo m ssl torrent-rasterbar z -WANTLIB += GL Qt5DBus Qt5Gui Qt5Svg Qt5Widgets +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network +WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml boost_system-mt c crypto +WANTLIB += execinfo m ssl torrent-rasterbar z MODULES = lang/python Index: qbittorrent/distinfo =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- qbittorrent/distinfo 15 Dec 2021 22:33:09 -0000 1.16 +++ qbittorrent/distinfo 28 Mar 2022 21:39:46 -0000 @@ -1,2 +1,2 @@ -SHA256 (qbittorrent/qbittorrent-4.3.9.tar.gz) = Y1NN8fccQhQEPgXMNHqwdTfgAq/2OZ8FNPCw2nywFOo= -SIZE (qbittorrent/qbittorrent-4.3.9.tar.gz) = 8390945 +SHA256 (qbittorrent/qbittorrent-4.4.2.tar.gz) = LVusW4N8Pf0hnY42p3cmjufQv604vJS/0B/wf0MHm74= +SIZE (qbittorrent/qbittorrent-4.4.2.tar.gz) = 9072263 Index: qbittorrent/patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent/patches/patch-configure_ac,v retrieving revision 1.4 diff -u -p -r1.4 patch-configure_ac --- qbittorrent/patches/patch-configure_ac 11 Mar 2022 19:47:15 -0000 1.4 +++ qbittorrent/patches/patch-configure_ac 28 Mar 2022 21:39:46 -0000 @@ -1,21 +1,8 @@ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -53,6 +53,12 @@ AC_ARG_ENABLE(qt-dbus, - [enable_qt_dbus=yes]) - - # Detect OS -+AC_MSG_CHECKING([whether OS is OpenBSD]) -+AS_IF([expr "$host_os" : ".*openbsd.*" > /dev/null], -+ [AC_MSG_RESULT([yes]) -+ LIBS="-lexecinfo $LIBS"], -+ [AC_MSG_RESULT([no])]) -+ - AC_MSG_CHECKING([whether OS is FreeBSD]) - AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null], - [AC_MSG_RESULT([yes]) -@@ -185,7 +191,7 @@ PKG_CHECK_MODULES(libtorrent, - LIBS="$libtorrent_LIBS $LIBS"]) +@@ -198,7 +198,7 @@ PKG_CHECK_MODULES(libtorrent, + [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"])]) PKG_CHECK_MODULES(openssl, - [openssl >= 1.1.1], Index: qbittorrent/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- qbittorrent/pkg/PLIST 11 Mar 2022 19:47:15 -0000 1.4 +++ qbittorrent/pkg/PLIST 28 Mar 2022 21:39:46 -0000 @@ -25,6 +25,7 @@ share/icons/hicolor/72x72/apps/qbittorre share/icons/hicolor/72x72/status/qbittorrent-tray.png share/icons/hicolor/96x96/apps/qbittorrent.png share/icons/hicolor/96x96/status/qbittorrent-tray.png +share/icons/hicolor/scalable/apps/qbittorrent.svg share/icons/hicolor/scalable/status/qbittorrent-tray-dark.svg share/icons/hicolor/scalable/status/qbittorrent-tray-light.svg share/icons/hicolor/scalable/status/qbittorrent-tray.svg Index: qbittorrent-nox/Makefile =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent-nox/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- qbittorrent-nox/Makefile 11 Mar 2022 19:47:15 -0000 1.9 +++ qbittorrent-nox/Makefile 28 Mar 2022 21:39:46 -0000 @@ -1,8 +1,9 @@ COMMENT = BitTorrent client with web interface PKGNAME = qbittorrent-nox-${VER} -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml boost_system -WANTLIB += boost_system-mt c crypto execinfo m ssl torrent-rasterbar z +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Sql Qt5Xml +WANTLIB += boost_system-mt c crypto execinfo m ssl torrent-rasterbar +WANTLIB += z LIB_DEPENDS += net/libtorrent-rasterbar \ devel/boost Index: qbittorrent-nox/distinfo =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent-nox/distinfo,v retrieving revision 1.16 diff -u -p -r1.16 distinfo --- qbittorrent-nox/distinfo 15 Dec 2021 22:33:10 -0000 1.16 +++ qbittorrent-nox/distinfo 28 Mar 2022 21:39:46 -0000 @@ -1,2 +1,2 @@ -SHA256 (qbittorrent/qbittorrent-4.3.9.tar.gz) = Y1NN8fccQhQEPgXMNHqwdTfgAq/2OZ8FNPCw2nywFOo= -SIZE (qbittorrent/qbittorrent-4.3.9.tar.gz) = 8390945 +SHA256 (qbittorrent/qbittorrent-4.4.2.tar.gz) = LVusW4N8Pf0hnY42p3cmjufQv604vJS/0B/wf0MHm74= +SIZE (qbittorrent/qbittorrent-4.4.2.tar.gz) = 9072263 Index: qbittorrent-nox/patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/net/qbittorrent/qbittorrent-nox/patches/patch-configure_ac,v retrieving revision 1.4 diff -u -p -r1.4 patch-configure_ac --- qbittorrent-nox/patches/patch-configure_ac 11 Mar 2022 19:47:16 -0000 1.4 +++ qbittorrent-nox/patches/patch-configure_ac 28 Mar 2022 21:39:46 -0000 @@ -1,21 +1,8 @@ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -53,6 +53,12 @@ AC_ARG_ENABLE(qt-dbus, - [enable_qt_dbus=yes]) - - # Detect OS -+AC_MSG_CHECKING([whether OS is OpenBSD]) -+AS_IF([expr "$host_os" : ".*openbsd.*" > /dev/null], -+ [AC_MSG_RESULT([yes]) -+ LIBS="-lexecinfo $LIBS"], -+ [AC_MSG_RESULT([no])]) -+ - AC_MSG_CHECKING([whether OS is FreeBSD]) - AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null], - [AC_MSG_RESULT([yes]) -@@ -185,7 +191,7 @@ PKG_CHECK_MODULES(libtorrent, - LIBS="$libtorrent_LIBS $LIBS"]) +@@ -198,7 +198,7 @@ PKG_CHECK_MODULES(libtorrent, + [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"])]) PKG_CHECK_MODULES(openssl, - [openssl >= 1.1.1],