diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile index 631ea6ca15c0..dcc871f2d5fe 100644 --- a/archivers/xarchiver/Makefile +++ b/archivers/xarchiver/Makefile @@ -1,69 +1,69 @@ PORTNAME= xarchiver -DISTVERSION= 0.5.4.18 +DISTVERSION= 0.5.4.19 CATEGORIES= archivers MAINTAINER= eduardo@FreeBSD.org COMMENT= Desktop-agnostic GTK frontend to various archiving tools LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= 7zz:archivers/7-zip \ gtar:archivers/gtar \ - gzip:archivers/gzip \ + ${LOCALBASE}/bin/gzip:archivers/gzip \ ${LOCALBASE}/bin/unzip:archivers/unzip \ xdg-open:devel/xdg-utils \ zip:archivers/zip USES= autoreconf desktop-file-utils gmake gnome libtool:build pkgconfig USE_GITHUB= yes GH_ACCOUNT= ib USE_GNOME= cairo gdkpixbuf2 glib20 intltool GNU_CONFIGURE= yes PORTSCOUT= limit:^\d\.\d\.\d\.\d+$ # avoid tags like identical_to_xfce_git_content OPTIONS_DEFINE= DOCS NLS OPTIONS_GROUP= FORMATS OPTIONS_GROUP_FORMATS= ARJ LZO RAR OPTIONS_SINGLE= GTK OPTIONS_SINGLE_GTK= GTK2 GTK3 OPTIONS_DEFAULT= GTK3 OPTIONS_SUB= yes FORMATS_DESC= Additional compression formats support ARJ_DESC= ARJ compression support RAR_DESC= RAR compression support ARJ_RUN_DEPENDS= arj:archivers/arj LZO_RUN_DEPENDS= lzop:archivers/lzop RAR_RUN_DEPENDS= unrar:archivers/unrar \ rar:archivers/rar DOCS_USE= GNOME=libxslt DOCS_CONFIGURE_ENABLE= doc GTK2_CONFIGURE_ENABLE= gtk2 GTK2_USE= GNOME=gtk20 GTK3_USE= GNOME=gtk30 NLS_USES= gettext localbase NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/main.c post-patch-DOCS-off: @${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in post-patch-NLS-off: @${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in .include diff --git a/archivers/xarchiver/distinfo b/archivers/xarchiver/distinfo index 590bae22202c..66dea872199a 100644 --- a/archivers/xarchiver/distinfo +++ b/archivers/xarchiver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658519947 -SHA256 (ib-xarchiver-0.5.4.18_GH0.tar.gz) = 639889e052aad60c4a4ecacd607de3128ab765686570e93d954171ffdc22333e -SIZE (ib-xarchiver-0.5.4.18_GH0.tar.gz) = 1112838 +TIMESTAMP = 1661441116 +SHA256 (ib-xarchiver-0.5.4.19_GH0.tar.gz) = 3a7b74699527da196034c089ebdc6d6b1360b717ad9811b782719a2194b4734f +SIZE (ib-xarchiver-0.5.4.19_GH0.tar.gz) = 1120885 diff --git a/archivers/xarchiver/files/patch-src_main.c b/archivers/xarchiver/files/patch-src_main.c index e477c8a29856..2c499398688b 100644 --- a/archivers/xarchiver/files/patch-src_main.c +++ b/archivers/xarchiver/files/patch-src_main.c @@ -1,34 +1,25 @@ ---- src/main.c.orig 2020-12-12 13:32:03 UTC +--- src/main.c.orig 2022-08-25 20:42:45 UTC +++ src/main.c -@@ -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 () +@@ -410,7 +410,7 @@ static void xa_check_available_archivers () /* GNU zip */ type = XARCHIVETYPE_GZIP; - path = g_find_program_in_path("gzip"); + path = g_find_program_in_path("%%LOCALBASE%%/bin/gzip"); if (path) archiver[type].is_compressor = TRUE; -@@ -812,11 +812,11 @@ static void xa_check_available_archivers () +@@ -906,11 +906,11 @@ static void xa_check_available_archivers () if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->prefer_unzip)) || (!is7za && !lsar)) { - path = g_find_program_in_path("unzip"); + path = g_find_program_in_path("%%LOCALBASE%%/bin/unzip"); if (path) { - gchar *zip = g_find_program_in_path("zip"); + gchar *zip = g_find_program_in_path("%%LOCALBASE%%/bin/zip"); if (zip) {