Date: Mon, 26 Jan 2026 22:10:20 +0000 From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Olivier Duchateau <duchateau.olivier@gmail.com> Subject: git: 0a08fff16207 - main - archivers/file-roller: update to 44.6 Message-ID: <6977e64c.3759d.41e2c8ec@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a08fff16207f5e89a1b7dd2158e175eb376ca5a commit 0a08fff16207f5e89a1b7dd2158e175eb376ca5a Author: Olivier Duchateau <duchateau.olivier@gmail.com> AuthorDate: 2026-01-26 05:14:48 +0000 Commit: Don Lewis <truckman@FreeBSD.org> CommitDate: 2026-01-26 22:09:42 +0000 archivers/file-roller: update to 44.6 Update file-roller to version 44.6. Trim LIB_DEPENDS. (truckman) PR: 290387 --- archivers/file-roller/Makefile | 26 ++++------- archivers/file-roller/distinfo | 6 +-- .../file-roller/files/patch-src_fr-command-7z.c | 16 ------- .../file-roller/files/patch-src_fr-command-tar.c | 51 +++++++++++++++++----- archivers/file-roller/pkg-plist | 2 +- 5 files changed, 52 insertions(+), 49 deletions(-) diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 9b1cba7e855e..0c1302f6680d 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,5 +1,5 @@ PORTNAME= file-roller -PORTVERSION= 44.5 +PORTVERSION= 44.6 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME @@ -7,28 +7,21 @@ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Archive manager for zip files, tar, etc -WWW= https://wiki.gnome.org/Apps/FileRoller +WWW= https://gitlab.gnome.org/GNOME/file-roller -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool -LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ - libnotify.so:devel/libnotify \ - libhandy-1.so:x11-toolkits/libhandy \ - libportal.so:deskutils/libportal \ - libportal-gtk4.so:deskutils/libportal-gtk4 -RUN_DEPENDS= gtar:archivers/gtar - -PORTSCOUT= limitw:1,even - -USES= cpe desktop-file-utils gettext gnome libarchive localbase \ - meson pkgconfig python:build tar:xz -USE_GNOME= cairo gdkpixbuf gtk40 libadwaita +LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib + +USES= cpe desktop-file-utils gettext-tools gnome libarchive \ + localbase meson pkgconfig python:build tar:xz +CPE_VENDOR= gnome +USE_GNOME= glib20 gtk40 libadwaita USE_LDCONFIG= yes MESON_ARGS= -Dpackagekit=false BINARY_ALIAS= python3=${PYTHON_VERSION} -CPE_VENDOR= gnome GLIB_SCHEMAS= org.gnome.FileRoller.gschema.xml @@ -62,7 +55,6 @@ NAUTILUS_MESON_ENABLED= nautilus-actions post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/src/fr-command-tar.c \ ${WRKSRC}/src/fr-command-zip.c @${REINPLACE_CMD} -e 's|"7z"|"7zz"|g' \ ${WRKSRC}/src/fr-archive-libarchive.c \ diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index 303b1505f456..5e7638cf8f33 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1741853689 -SHA256 (gnome/file-roller-44.5.tar.xz) = dfaf4bb989c0b8986be8bdae9fffeab8d0f30669ae3a627e8c3df94f23888339 -SIZE (gnome/file-roller-44.5.tar.xz) = 1047784 +TIMESTAMP = 1760977992 +SHA256 (gnome/file-roller-44.6.tar.xz) = 9e873b5005bc425799a8cd4b237e1fff430ec8d6b34a992c6033f1dfc6e3764e +SIZE (gnome/file-roller-44.6.tar.xz) = 1052532 diff --git a/archivers/file-roller/files/patch-src_fr-command-7z.c b/archivers/file-roller/files/patch-src_fr-command-7z.c deleted file mode 100644 index 9a9297f2190f..000000000000 --- a/archivers/file-roller/files/patch-src_fr-command-7z.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/fr-command-7z.c.orig 2021-05-01 19:02:13 UTC -+++ src/fr-command-7z.c -@@ -325,8 +325,11 @@ fr_command_7z_add (FrCommand *command, - fr_process_add_arg (command->process, "-bd"); - fr_process_add_arg (command->process, "-bb1"); - fr_process_add_arg (command->process, "-y"); -- if (follow_links) -- fr_process_add_arg (command->process, "-l"); -+ if (! follow_links) -+ { -+ fr_process_add_arg (command->process, "-snh"); -+ fr_process_add_arg (command->process, "-snl"); -+ } - add_password_arg (command, archive->password, FALSE); - if ((archive->password != NULL) - && (*archive->password != 0) diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index 78843a28c6e9..7eb6d1898b34 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,12 +1,39 @@ ---- src/fr-command-tar.c.orig Sun Oct 15 12:33:56 2006 -+++ src/fr-command-tar.c Mon Oct 16 19:18:03 2006 -@@ -231,6 +231,9 @@ - #if defined (__SVR4) && defined (__sun) - if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) - command = g_strdup ("/usr/sfw/bin/gtar"); -+#elif defined(__FreeBSD__) -+ if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) -+ command = g_strdup ("%%LOCALBASE%%/bin/gtar"); - #endif - if (command != NULL) - fr_process_begin_command (comm->process, command); +--- src/fr-command-tar.c.orig 2025-10-19 06:50:04 UTC ++++ src/fr-command-tar.c +@@ -275,8 +275,6 @@ fr_command_tar_list (FrCommand *comm) + fr_process_set_out_line_func (comm->process, process_line, comm); + + begin_tar_command (comm); +- fr_process_add_arg (comm->process, "--force-local"); +- fr_process_add_arg (comm->process, "--no-wildcards"); + fr_process_add_arg (comm->process, "-tvf"); + fr_process_add_arg (comm->process, comm->filename); + add_compress_arg (comm); +@@ -345,9 +343,6 @@ fr_command_tar_add (FrCommand *comm, + comm); + + begin_tar_command (comm); +- fr_process_add_arg (comm->process, "--force-local"); +- fr_process_add_arg (comm->process, "--no-recursion"); +- fr_process_add_arg (comm->process, "--no-wildcards"); + fr_process_add_arg (comm->process, "-v"); + fr_process_add_arg (comm->process, "-p"); + if (follow_links) +@@ -419,8 +414,6 @@ fr_command_tar_delete (FrCommand *comm, + + begin_tar_command (comm); + fr_process_set_begin_func (comm->process, begin_func__delete, comm); +- fr_process_add_arg (comm->process, "--force-local"); +- fr_process_add_arg (comm->process, "--no-wildcards"); + fr_process_add_arg (comm->process, "-v"); + fr_process_add_arg (comm->process, "--delete"); + fr_process_add_arg (comm->process, "-f"); +@@ -466,8 +459,6 @@ fr_command_tar_extract (FrCommand *comm, + comm); + + begin_tar_command (comm); +- fr_process_add_arg (comm->process, "--force-local"); +- fr_process_add_arg (comm->process, "--no-wildcards"); + fr_process_add_arg (comm->process, "-v"); + fr_process_add_arg (comm->process, "-p"); + diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 70b39536edb7..7ccff4457b75 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -515,4 +515,4 @@ share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_HK/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.mo share/locale/zu/LC_MESSAGES/file-roller.mo -share/metainfo/org.gnome.FileRoller.appdata.xml +share/metainfo/org.gnome.FileRoller.metainfo.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6977e64c.3759d.41e2c8ec>