From nobody Wed Jan 12 21:25:23 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 D3E441955035; Wed, 12 Jan 2022 21:25:23 +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 4JZ0w3418nz4lB3; Wed, 12 Jan 2022 21:25:23 +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 6B1B31453E; Wed, 12 Jan 2022 21:25:23 +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 20CLPNVu006430; Wed, 12 Jan 2022 21:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CLPNHN006429; Wed, 12 Jan 2022 21:25:23 GMT (envelope-from git) Date: Wed, 12 Jan 2022 21:25:23 GMT Message-Id: <202201122125.20CLPNHN006429@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: 88cbdd9c25e9 - main - archivers/xarchiver: 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: 88cbdd9c25e9af87860167f9a705bdabd82ee5cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642022723; 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=uW3n7YQefpF/QNqinO4xnavf5oHO8HCcg4W//TwV1ks=; b=hCLLwt3Jw/dQe0shXfvt7hH0A/1YL8vTTMYdYW7Rd6SKuVmy88W8zrqZU3oZPzEVFozdAB Wf/VWGe8O6N+45tJ+EjJCqA3HMPinTwMYBMGbW3sJ9rVLfnaPsjP4BhQDc8KyhbWUKsj6c NubAIJqzSuE1wg6D3GNDsM5PmKl854Od2sqVo0R2RfpwhywKECBVd+3GS5mEyxglzXTboF DGDVRS/0h50QsFuMdUi0ysnDIU0KA97OjecbFqlSbuVRk23tx6vmTcvXN2kVS2/ey0Bqls HVS6RfaJ0Gb00MCOU2XCm3FDiWg1Xya7QCQNwAqsmjgUId1k/ESz8HjWF2an4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642022723; a=rsa-sha256; cv=none; b=CnlZHbboPXmKkNuqczViqZD12HYRGpvaWVaqZnTV0LbS7XnalbJ1jRUhYfIzgOhTkAvUHe F1aIoTV02c2y6Ipwy9oiNHbqYO6Lt2TDQHCvj8pEflHlR9d8dqngR2kfqtGp04/xZ7cLuL 5qTfEYqIM1B7787wuE1pZCI8jUG+QVjcU9xwxwmfQ4BglMZfOfUtKPWLk97fp0/LPzfoFy CQ8NL/Xzm/EljPtXL2mSWGHO8ToI5zBNAKJT1suD5hNKu0xjfaBc1wtOdjvTpMbPX1dKaK qX30yBPElJSycdV46Oqd1SoBQeaN6gNKmvONbaleQEhKRZl2YgPxi9welit47A== 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=88cbdd9c25e9af87860167f9a705bdabd82ee5cc commit 88cbdd9c25e9af87860167f9a705bdabd82ee5cc Author: Max Brazhnikov AuthorDate: 2022-01-12 21:24:02 +0000 Commit: Max Brazhnikov CommitDate: 2022-01-12 21:24:02 +0000 archivers/xarchiver: switch from p7zip to 7-zip PR: 260866 --- archivers/xarchiver/Makefile | 3 ++- archivers/xarchiver/files/patch-src_main.c | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile index 65c9406a47f5..b43c3daca37d 100644 --- a/archivers/xarchiver/Makefile +++ b/archivers/xarchiver/Makefile @@ -2,6 +2,7 @@ PORTNAME= xarchiver PORTVERSION= 0.5.4.16 +PORTREVISION= 1 CATEGORIES= archivers MAINTAINER= ports@FreeBSD.org @@ -12,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -RUN_DEPENDS= 7zr:archivers/p7zip \ +RUN_DEPENDS= 7zz:archivers/7-zip \ gtar:archivers/gtar \ gzip:archivers/gzip \ ${LOCALBASE}/bin/unzip:archivers/unzip \ diff --git a/archivers/xarchiver/files/patch-src_main.c b/archivers/xarchiver/files/patch-src_main.c index aacadce39eb4..e477c8a29856 100644 --- a/archivers/xarchiver/files/patch-src_main.c +++ b/archivers/xarchiver/files/patch-src_main.c @@ -1,6 +1,15 @@ ---- src/main.c.orig 2020-05-30 14:10:55 UTC +--- src/main.c.orig 2020-12-12 13:32:03 UTC +++ src/main.c -@@ -387,7 +387,7 @@ static void xa_check_available_archivers () +@@ -103,7 +103,7 @@ static void xa_check_available_archivers () + + /* (un)compressors that can handle various types */ + +- sevenz = g_find_program_in_path("7z"); ++ sevenz = g_find_program_in_path("7zz"); + + if (!sevenz) + { +@@ -388,7 +388,7 @@ static void xa_check_available_archivers () /* GNU zip */ type = XARCHIVETYPE_GZIP; @@ -9,7 +18,7 @@ if (path) archiver[type].is_compressor = TRUE; -@@ -799,11 +799,11 @@ static void xa_check_available_archivers () +@@ -812,11 +812,11 @@ static void xa_check_available_archivers () if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->prefer_unzip)) || (!is7za && !lsar)) {