From nobody Sat Sep 2 00:50:44 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RcxCT0CYlz4s7GX; Sat, 2 Sep 2023 00:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RcxCS6sWlz3Mg2; Sat, 2 Sep 2023 00:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693615845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VY52+kLAZmuAzDJn8eXwYC3u9E7qW77vyLuTqfSLByc=; b=BlWpLGYtFdmrezeYqPL0eVpF/upUwKPG0HVLitsEduIce/YuD+d0O4ShvdOxLeP6i7OSP5 sk9KuohACBwZO+zV4KqlTc4107yOICBUVlmbgUS9mLOZYF0QBBWC1HI3iIzTPTJWSrDChC lvrFBZHpCGINw/XRbeR+rlfNM3+zjfL/o22BAfUj4mGQ4gFZhJq1caAnfU/y6YTjBdXzJQ UxWzkozTYR46DF6o28s6TCysEwSL6atdYtvt8rEc8FRydEj19BDpSQZlt22977CqpbRsWL N1Cb+7wKmoAKAxgIk+91MzJCNIORL34UxIhtume5SQZtdEpoFPBRvnJ2GCPBMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693615845; a=rsa-sha256; cv=none; b=OB8b9faCHNXTx0Z0BVoMA2BOLU5QP6VW84xJwawZkZwtplPBdoKsQiboOtR0wRSlp3NMwI scm7uRrhG5KnZyzfz+PXhoKDbz/zq5KBm4/Sy80IaFchFpUs0FnUgAZUjebyCq3MOhSfiK cSVggI5uXfiJ0RkvPPJyPkQhZYAghZpZ4uVFieQuRDhUGHhcJSUPayIizY05cmEP8s5K7I gayI1ARwnA6EI36LHnhZ5NyVkr6Akw3+EjWVbcCZSW/+8qsLb5nKrkymeywLkLgfOLwsxa gC/cE3SV90m0G87RxM3DXArqbQNJ0wwJywlbodPJmiI66owe44b1Fj+ZNRUfDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693615845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VY52+kLAZmuAzDJn8eXwYC3u9E7qW77vyLuTqfSLByc=; b=wdhCs5YU4LvXpdVmcBGNo2KfFRqtw59uuMUM2R/e+MhPqeamak5RB0cpazw/pz/k0hhGp/ QL3IcuRteVULgqRN5MeDDLcZOF6Q2O7W7FiQS50ch35Igsw5b19kVcFov3EY36qrJO6ZHQ Odrrj3BoOHLlPyphTnX451Ud0XyXyHywZ9HD8Ys3sSybLVrJD7Y6NvGN14B2QV183yh689 HnWg+wObJ6LUsyh8JkL4a3coLgtpUdqg3OZyrcZ33zaCbItzNLfADp3QT3NtctIzLv0+F2 lw4lta9yrm5gLTITCqlCBX9kw/+8caqloJi6aV1DqsmB/mffNvv1zGz1vAUMSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RcxCS5bkBz7Sw; Sat, 2 Sep 2023 00:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3820oiJW059100; Sat, 2 Sep 2023 00:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3820oirv059097; Sat, 2 Sep 2023 00:50:44 GMT (envelope-from git) Date: Sat, 2 Sep 2023 00:50:44 GMT Message-Id: <202309020050.3820oirv059097@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 2c18c2a2da98 - main - net-p2p/qbittorrent: Use Qt6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c18c2a2da988ef399c05674f8bd7ab093caa6e8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c18c2a2da988ef399c05674f8bd7ab093caa6e8 commit 2c18c2a2da988ef399c05674f8bd7ab093caa6e8 Author: Yuri Victorovich AuthorDate: 2023-09-02 00:48:45 +0000 Commit: Yuri Victorovich CommitDate: 2023-09-02 00:50:40 +0000 net-p2p/qbittorrent: Use Qt6 Based on patch submitted by: Nuno Teixeira --- net-p2p/qbittorrent/Makefile | 27 +++++++++------------------ net-p2p/qbittorrent/pkg-plist | 2 +- net-p2p/qbittorrent/pkg-plist-nox | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index b473086d8610..f9e81b94dbc8 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -1,5 +1,6 @@ PORTNAME= qbittorrent DISTVERSION= 4.5.5 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -21,24 +22,21 @@ FLAVOR?= ${FLAVORS:[1]} nox_PKGNAMESUFFIX= -nox nox_PLIST= ${MASTERDIR}/pkg-plist-nox -USES= compiler:c++14-lang cpe pkgconfig qmake:no_env qt:5 ssl tar:xz -GNU_CONFIGURE= yes -USE_QT= core network sql xml buildtools:build linguisttools:build qmake:build -DESTDIRNAME= INSTALL_ROOT -CONFIGURE_ENV+= openssl_CFLAGS="-I${OPENSSLINC}" openssl_LIBS="-L${OPENSSLLIB} -lssl" - +USES= compiler:c++14-lang cpe pkgconfig cmake qt:6 ssl tar:xz +USE_QT= base svg translations USE_CXXSTD= c++17 # prevent boost-related SEGV, see bug#264278 +CMAKE_ON= QT6 + .if ${FLAVOR} == default USES+= desktop-file-utils gl -USE_QT+= concurrent gui svg widgets USE_GL= gl .endif .if ${FLAVOR} == nox SUFFIX= -nox COMMENT+= (web UI version) -CONFIGURE_ARGS= --disable-gui +CMAKE_OFF= GUI USERS= qbittorrent GROUPS= qbittorrent USE_RC_SUBR= qbittorrent @@ -56,9 +54,8 @@ LIBTORRENT_DESC= libtorrent version number to use LIBTORRENT1_DESC= Version 1.x (default) LIBTORRENT2_DESC= Version 2.x (experimental) -DEBUG_CONFIGURE_ENABLE= debug -DBUS_CONFIGURE_ENABLE= qt-dbus -DBUS_USE= qt=dbus +DEBUG_CMAKE_BOOL= debug +DBUS_CMAKE_BOOL= DBUS LIBTORRENT1_BUILD_DEPENDS= libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar LIBTORRENT1_RUN_DEPENDS= libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar @@ -68,15 +65,9 @@ LIBTORRENT2_EXTRA_PATCHES= ${FILESDIR}/extrapatch-libtorrent-rasterbar2-settings PYTHON_DESC= Install Python to support some plugin functionality PYTHON_USES= python:run - -post-patch-PYTHON-on: - @${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_CMD}"|' ${WRKSRC}/src/base/utils/foreignapps.cpp +PYTHON_BINARY_ALIAS= python3=${PYTHON_CMD} post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX} - ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent${SUFFIX}.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/ - @${RM} -r ${STAGEDIR}${PREFIX}/share/man .if ${FLAVOR} == nox @${MKDIR} ${STAGEDIR}/var/db/qbittorrent/conf ${STAGEDIR}/var/db/qbittorrent/Downloads .endif diff --git a/net-p2p/qbittorrent/pkg-plist b/net-p2p/qbittorrent/pkg-plist index 8948a92d77f1..bb3a6942104f 100644 --- a/net-p2p/qbittorrent/pkg-plist +++ b/net-p2p/qbittorrent/pkg-plist @@ -1,5 +1,4 @@ bin/qbittorrent -man/man1/qbittorrent.1.gz share/applications/org.qbittorrent.qBittorrent.desktop share/icons/hicolor/128x128/apps/qbittorrent.png share/icons/hicolor/128x128/status/qbittorrent-tray.png @@ -27,4 +26,5 @@ 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 +share/man/man1/qbittorrent.1.gz share/metainfo/org.qbittorrent.qBittorrent.appdata.xml diff --git a/net-p2p/qbittorrent/pkg-plist-nox b/net-p2p/qbittorrent/pkg-plist-nox index c97540d3a802..6371e4b212e9 100644 --- a/net-p2p/qbittorrent/pkg-plist-nox +++ b/net-p2p/qbittorrent/pkg-plist-nox @@ -1,5 +1,5 @@ bin/qbittorrent-nox -man/man1/qbittorrent-nox.1.gz +share/man/man1/qbittorrent-nox.1.gz @owner %%USER%% @group %%GROUP%% @dir /var/db/qbittorrent/conf