Skip to content

Commit 2c18c2a

Browse files
committed
net-p2p/qbittorrent: Use Qt6
Based on patch submitted by: Nuno Teixeira <eduardo@freebsd.org>
1 parent 94ed6cb commit 2c18c2a

3 files changed

Lines changed: 11 additions & 20 deletions

File tree

net-p2p/qbittorrent/Makefile

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= qbittorrent
22
DISTVERSION= 4.5.5
3+
PORTREVISION= 1
34
CATEGORIES= net-p2p
45
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
56

@@ -21,24 +22,21 @@ FLAVOR?= ${FLAVORS:[1]}
2122
nox_PKGNAMESUFFIX= -nox
2223
nox_PLIST= ${MASTERDIR}/pkg-plist-nox
2324

24-
USES= compiler:c++14-lang cpe pkgconfig qmake:no_env qt:5 ssl tar:xz
25-
GNU_CONFIGURE= yes
26-
USE_QT= core network sql xml buildtools:build linguisttools:build qmake:build
27-
DESTDIRNAME= INSTALL_ROOT
28-
CONFIGURE_ENV+= openssl_CFLAGS="-I${OPENSSLINC}" openssl_LIBS="-L${OPENSSLLIB} -lssl"
29-
25+
USES= compiler:c++14-lang cpe pkgconfig cmake qt:6 ssl tar:xz
26+
USE_QT= base svg translations
3027
USE_CXXSTD= c++17 # prevent boost-related SEGV, see bug#264278
3128

29+
CMAKE_ON= QT6
30+
3231
.if ${FLAVOR} == default
3332
USES+= desktop-file-utils gl
34-
USE_QT+= concurrent gui svg widgets
3533
USE_GL= gl
3634
.endif
3735

3836
.if ${FLAVOR} == nox
3937
SUFFIX= -nox
4038
COMMENT+= (web UI version)
41-
CONFIGURE_ARGS= --disable-gui
39+
CMAKE_OFF= GUI
4240
USERS= qbittorrent
4341
GROUPS= qbittorrent
4442
USE_RC_SUBR= qbittorrent
@@ -56,9 +54,8 @@ LIBTORRENT_DESC= libtorrent version number to use
5654
LIBTORRENT1_DESC= Version 1.x (default)
5755
LIBTORRENT2_DESC= Version 2.x (experimental)
5856

59-
DEBUG_CONFIGURE_ENABLE= debug
60-
DBUS_CONFIGURE_ENABLE= qt-dbus
61-
DBUS_USE= qt=dbus
57+
DEBUG_CMAKE_BOOL= debug
58+
DBUS_CMAKE_BOOL= DBUS
6259

6360
LIBTORRENT1_BUILD_DEPENDS= libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar
6461
LIBTORRENT1_RUN_DEPENDS= libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar
@@ -68,15 +65,9 @@ LIBTORRENT2_EXTRA_PATCHES= ${FILESDIR}/extrapatch-libtorrent-rasterbar2-settings
6865

6966
PYTHON_DESC= Install Python to support some plugin functionality
7067
PYTHON_USES= python:run
71-
72-
post-patch-PYTHON-on:
73-
@${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_CMD}"|' ${WRKSRC}/src/base/utils/foreignapps.cpp
68+
PYTHON_BINARY_ALIAS= python3=${PYTHON_CMD}
7469

7570
post-install:
76-
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX}
77-
${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent${SUFFIX}.1 \
78-
${STAGEDIR}${MAN1PREFIX}/man/man1/
79-
@${RM} -r ${STAGEDIR}${PREFIX}/share/man
8071
.if ${FLAVOR} == nox
8172
@${MKDIR} ${STAGEDIR}/var/db/qbittorrent/conf ${STAGEDIR}/var/db/qbittorrent/Downloads
8273
.endif

net-p2p/qbittorrent/pkg-plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
bin/qbittorrent
2-
man/man1/qbittorrent.1.gz
32
share/applications/org.qbittorrent.qBittorrent.desktop
43
share/icons/hicolor/128x128/apps/qbittorrent.png
54
share/icons/hicolor/128x128/status/qbittorrent-tray.png
@@ -27,4 +26,5 @@ share/icons/hicolor/scalable/apps/qbittorrent.svg
2726
share/icons/hicolor/scalable/status/qbittorrent-tray-dark.svg
2827
share/icons/hicolor/scalable/status/qbittorrent-tray-light.svg
2928
share/icons/hicolor/scalable/status/qbittorrent-tray.svg
29+
share/man/man1/qbittorrent.1.gz
3030
share/metainfo/org.qbittorrent.qBittorrent.appdata.xml

net-p2p/qbittorrent/pkg-plist-nox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bin/qbittorrent-nox
2-
man/man1/qbittorrent-nox.1.gz
2+
share/man/man1/qbittorrent-nox.1.gz
33
@owner %%USER%%
44
@group %%GROUP%%
55
@dir /var/db/qbittorrent/conf

0 commit comments

Comments
 (0)