From nobody Wed Jan 12 21:25:24 2022 X-Original-To: dev-commits-ports-main@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 69E171955204; Wed, 12 Jan 2022 21:25:25 +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 4JZ0w45jPqz4lRT; Wed, 12 Jan 2022 21:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 80C1A14709; Wed, 12 Jan 2022 21:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20CLPOvR006456; Wed, 12 Jan 2022 21:25:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CLPO9e006455; Wed, 12 Jan 2022 21:25:24 GMT (envelope-from git) Date: Wed, 12 Jan 2022 21:25:24 GMT Message-Id: <202201122125.20CLPO9e006455@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: dba356ff75ea - main - polish/qnapi: switch from p7zip to 7-zip List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dba356ff75eae56cb8fdaaedb9e04625f7ba8426 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642022724; 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=hOPLpXtdDDwcKil39Co+hIxxqJQi7jwLd2F4VN7qGAs=; b=szMn9mgtQgY3DdgxRcmM2/RyBfBY5yBTgL3P7Wy2dnhjXZwz5iWwqBmninThWqunvepAFt v2ysXx1NfbrtOxQ5MZVn1vMoC1BnJmbGRnHIGHI5zYE8DOr+OqTRqXDiKcFJnBfsNmEZcF QbY7ZOjTSs7Bg8IUjcaADqoIW2bNmocU+aw9UB39SGijls/wei4KSCg/FEogaw5WfMT1B/ bI44AnSmT0AI7IThcX9MDuAMM4WkG7hY0qQsNn+61+hzPwOBYlNHz1y2Cz6ruzC1eY3CAy U026uTJIvwS58pcnNsLCVxoegK14s0x7OBL32phkrv8Pnx498AUEuzA0mAZ6Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642022724; a=rsa-sha256; cv=none; b=wRjwk3taAeaiHBL+vaHy61C3gyUbu9xvcjmw0rmTcyeqMbIRVoH2VwN1eevPFVQ+mpy/Kc y5PqX9MxwnKdXtT96/7rkY1t3m6etqkIyM7TbcqVpq6HPvzO8s3aTjZ7qBJDrEnpRmaJKw AeIyE8qWUE76kwgtmeT4RsUArvn04ktlZC2FvjCqDu0yVm9ncgY/1Te4bnP4bPk/M5kYZq Nz7TpdKNqcmDqk/K2S9RwaE5bgYXXRiMmmYEvZ6IGmDiFHj0DOrY38ZyQIURixKJrPySiu TzpAlrZIF/BeJ/0vyYX4Hu8JqkWZu0mHWFF4Yjc9BQvlLXJoVw4bnlcrq5a30w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=dba356ff75eae56cb8fdaaedb9e04625f7ba8426 commit dba356ff75eae56cb8fdaaedb9e04625f7ba8426 Author: Max Brazhnikov AuthorDate: 2022-01-12 21:24:02 +0000 Commit: Max Brazhnikov CommitDate: 2022-01-12 21:24:02 +0000 polish/qnapi: switch from p7zip to 7-zip Migrate to 7-zip [1] and while here: - Respect LOCALBASE - Don't move around man pages PR: 260866 --- polish/qnapi/Makefile | 8 +++++--- .../files/patch-libqnapi_src_config_configreader.cpp | 20 ++++++++++++++++++++ polish/qnapi/pkg-plist | 6 +++--- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile index 30fe93aa9ce0..c50be6ed0b07 100644 --- a/polish/qnapi/Makefile +++ b/polish/qnapi/Makefile @@ -2,7 +2,7 @@ PORTNAME= qnapi PORTVERSION= 0.2.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= polish multimedia MAINTAINER= ports@FreeBSD.org @@ -15,7 +15,7 @@ BUILD_DEPENDS= qt-maybe>0:devel/qt-maybe \ libmaia>0:net/libmaia LIB_DEPENDS= libmediainfo.so:multimedia/libmediainfo \ libzen.so:multimedia/libzen -RUN_DEPENDS= 7z:archivers/p7zip +RUN_DEPENDS= 7zz:archivers/7-zip USE_GITHUB= yes @@ -26,8 +26,10 @@ USE_QT= buildtools_build core gui network widgets xml CXXFLAGS+= -I${LOCALBASE}/include/maia post-patch: - @${REINPLACE_CMD} 's|/usr|${PREFIX}|; s|share/man|man|' \ + ${REINPLACE_CMD} 's|/usr|${PREFIX}|' \ ${WRKSRC}/qnapi.pro + ${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' \ + ${WRKSRC}/libqnapi/src/config/configreader.cpp post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qnapi diff --git a/polish/qnapi/files/patch-libqnapi_src_config_configreader.cpp b/polish/qnapi/files/patch-libqnapi_src_config_configreader.cpp new file mode 100644 index 000000000000..e42e41ad39b3 --- /dev/null +++ b/polish/qnapi/files/patch-libqnapi_src_config_configreader.cpp @@ -0,0 +1,20 @@ +--- libqnapi/src/config/configreader.cpp.orig 2017-05-19 16:50:58 UTC ++++ libqnapi/src/config/configreader.cpp +@@ -175,7 +175,7 @@ const GeneralConfig ConfigReader::resolveP7zipPath( + + sysPaths << appExecutableDir; + +- QStringList p7zipBinaries = {"7z", "7za"}; ++ QStringList p7zipBinaries = {"7z", "7zz"}; + + foreach (const QString sysPath, sysPaths) { + foreach (const QString p7zipBinary, p7zipBinaries) { +@@ -192,7 +192,7 @@ const GeneralConfig ConfigReader::resolveP7zipPath( + } + + if (p7zipPath.isEmpty()) { +- p7zipPath = "7z"; ++ p7zipPath = "7zz"; + } + #endif + diff --git a/polish/qnapi/pkg-plist b/polish/qnapi/pkg-plist index f06c28215785..dd98a700c31a 100644 --- a/polish/qnapi/pkg-plist +++ b/polish/qnapi/pkg-plist @@ -1,7 +1,4 @@ bin/qnapi -man/it/man1/qnapi.1.gz -man/man1/qnapi.1.gz -man/pl/man1/qnapi.1.gz share/applications/qnapi-download.desktop share/applications/qnapi-scan.desktop share/applications/qnapi.desktop @@ -11,3 +8,6 @@ share/icons/hicolor/16x16/apps/qnapi.png share/icons/hicolor/32x32/apps/qnapi.png share/icons/hicolor/48x48/apps/qnapi.png share/icons/hicolor/512x512/apps/qnapi.png +share/man/it/man1/qnapi.1.gz +share/man/man1/qnapi.1.gz +share/man/pl/man1/qnapi.1.gz