Update file-roller to 3.26.1.

5 files changed, 34 insertions, 39 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 121860aac202..503596e8aa34 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	file-roller
-PORTVERSION=	3.20.3
+PORTVERSION=	3.26.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
@@ -22,14 +22,12 @@ RUN_DEPENDS=	gtar:archivers/gtar
 PORTSCOUT=	limitw:1,even
 
 USES=		desktop-file-utils gettext gmake libarchive libtool \
-		pathfix pkgconfig tar:xz
+		localbase pathfix pkgconfig tar:xz
 USE_GNOME=	cairo gtk30 intlhack introspection:build
 USE_XORG=	sm
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-packagekit
 INSTALL_TARGET=	install-strip
 
@@ -39,7 +37,7 @@ GLIB_SCHEMAS=	org.gnome.FileRoller.gschema.xml
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DOCS NAUTILUS
 OPTIONS_DEFAULT=NAUTILUS
-NAUTILUS_DESC=	Enable Nautilus extension
+NAUTILUS_DESC=	Nautilus context menu actions
 NAUTILUS_USE=	GNOME=nautilus3
 NAUTILUS_CONFIGURE_ENABLE=	nautilus-actions
 
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 234d80f37411..b0c433a47ab4 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477430126
-SHA256 (gnome3/file-roller-3.20.3.tar.xz) = 6b5c2de4c6bd52318cacd2a398cdfa45a5f1df8a77c6652a38a6a1d3e53644e9
-SIZE (gnome3/file-roller-3.20.3.tar.xz) = 1432400
+TIMESTAMP = 1508523946
+SHA256 (gnome3/file-roller-3.26.1.tar.xz) = ecd5e4c9b8435a6515120c59efeed196ec3f07cb84e1bbda7534cb5456e491ae
+SIZE (gnome3/file-roller-3.26.1.tar.xz) = 1436044
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 c61478e72453..78843a28c6e9 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,6 +1,6 @@
---- src/fr-command-tar.c.orig	2014-08-13 05:21:20 UTC
-+++ src/fr-command-tar.c
-@@ -236,6 +236,9 @@ begin_tar_command (FrCommand *comm)
+--- 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");
diff --git a/archivers/file-roller/files/patch-src_fr-command-zip.c b/archivers/file-roller/files/patch-src_fr-command-zip.c
index d55515487711..5995813eb3b6 100644
--- a/archivers/file-roller/files/patch-src_fr-command-zip.c
+++ b/archivers/file-roller/files/patch-src_fr-command-zip.c
@@ -1,6 +1,6 @@
---- src/fr-command-zip.c.orig	2015-02-15 10:13:10 UTC
-+++ src/fr-command-zip.c
-@@ -179,7 +179,11 @@ fr_command_zip_list (FrCommand  *comm)
+--- src/fr-command-zip.c.orig	2010-11-16 08:32:18.000000000 +0000
++++ src/fr-command-zip.c	2011-01-20 16:55:45.000000000 +0000
+@@ -186,7 +186,11 @@ fr_command_zip_list (FrCommand  *comm)
  {
  	fr_process_set_out_line_func (comm->process, list__process_line, comm);
  
@@ -11,8 +11,8 @@
 +#endif
  	fr_process_set_begin_func (comm->process, list__begin, comm);
  	fr_process_add_arg (comm->process, "-ZTs");
- 	fr_process_add_arg (comm->process, "--");
-@@ -299,7 +303,11 @@ fr_command_zip_extract (FrCommand  *comm
+ 	fr_process_add_arg (comm->process, comm->filename);
+@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand  *comm
  				      process_line__common,
  				      comm);
  
@@ -34,5 +34,5 @@
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
  	fr_process_add_arg (comm->process, "-t");
- 	add_password_arg (comm, FR_ARCHIVE (comm)->password);
- 	fr_process_add_arg (comm->process, "--");
+ 	add_password_arg (comm, comm->password);
+ 	fr_process_add_arg (comm->process, comm->filename);
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index a1528de539d7..8d640ce412b9 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -4,7 +4,6 @@ bin/file-roller
 libexec/file-roller/isoinfo.sh
 libexec/file-roller/rpm2cpio
 share/GConf/gsettings/file-roller.convert
-share/appdata/org.gnome.FileRoller.appdata.xml
 share/applications/org.gnome.FileRoller.desktop
 share/dbus-1/services/org.gnome.FileRoller.ArchiveManager1.service
 share/dbus-1/services/org.gnome.FileRoller.service
@@ -17,7 +16,6 @@ share/help/C/file-roller/archive-open.page
 share/help/C/file-roller/archive-view.page
 share/help/C/file-roller/figures/file-roller-3-12.png
 share/help/C/file-roller/figures/file-roller-icon.png
-share/help/C/file-roller/figures/file-roller-open-recent.png
 share/help/C/file-roller/index.page
 share/help/C/file-roller/introduction.page
 share/help/C/file-roller/keyboard-shortcuts.page
@@ -35,7 +33,6 @@ share/help/ca/file-roller/archive-open.page
 share/help/ca/file-roller/archive-view.page
 share/help/ca/file-roller/figures/file-roller-3-12.png
 share/help/ca/file-roller/figures/file-roller-icon.png
-share/help/ca/file-roller/figures/file-roller-open-recent.png
 share/help/ca/file-roller/index.page
 share/help/ca/file-roller/introduction.page
 share/help/ca/file-roller/keyboard-shortcuts.page
@@ -53,7 +50,6 @@ share/help/cs/file-roller/archive-open.page
 share/help/cs/file-roller/archive-view.page
 share/help/cs/file-roller/figures/file-roller-3-12.png
 share/help/cs/file-roller/figures/file-roller-icon.png
-share/help/cs/file-roller/figures/file-roller-open-recent.png
 share/help/cs/file-roller/index.page
 share/help/cs/file-roller/introduction.page
 share/help/cs/file-roller/keyboard-shortcuts.page
@@ -71,7 +67,6 @@ share/help/da/file-roller/archive-open.page
 share/help/da/file-roller/archive-view.page
 share/help/da/file-roller/figures/file-roller-3-12.png
 share/help/da/file-roller/figures/file-roller-icon.png
-share/help/da/file-roller/figures/file-roller-open-recent.png
 share/help/da/file-roller/index.page
 share/help/da/file-roller/introduction.page
 share/help/da/file-roller/keyboard-shortcuts.page
@@ -89,7 +84,6 @@ share/help/de/file-roller/archive-open.page
 share/help/de/file-roller/archive-view.page
 share/help/de/file-roller/figures/file-roller-3-12.png
 share/help/de/file-roller/figures/file-roller-icon.png
-share/help/de/file-roller/figures/file-roller-open-recent.png
 share/help/de/file-roller/index.page
 share/help/de/file-roller/introduction.page
 share/help/de/file-roller/keyboard-shortcuts.page
@@ -107,7 +101,6 @@ share/help/el/file-roller/archive-open.page
 share/help/el/file-roller/archive-view.page
 share/help/el/file-roller/figures/file-roller-3-12.png
 share/help/el/file-roller/figures/file-roller-icon.png
-share/help/el/file-roller/figures/file-roller-open-recent.png
 share/help/el/file-roller/index.page
 share/help/el/file-roller/introduction.page
 share/help/el/file-roller/keyboard-shortcuts.page
@@ -125,7 +118,6 @@ share/help/es/file-roller/archive-open.page
 share/help/es/file-roller/archive-view.page
 share/help/es/file-roller/figures/file-roller-3-12.png
 share/help/es/file-roller/figures/file-roller-icon.png
-share/help/es/file-roller/figures/file-roller-open-recent.png
 share/help/es/file-roller/index.page
 share/help/es/file-roller/introduction.page
 share/help/es/file-roller/keyboard-shortcuts.page
@@ -143,7 +135,6 @@ share/help/fi/file-roller/archive-open.page
 share/help/fi/file-roller/archive-view.page
 share/help/fi/file-roller/figures/file-roller-3-12.png
 share/help/fi/file-roller/figures/file-roller-icon.png
-share/help/fi/file-roller/figures/file-roller-open-recent.png
 share/help/fi/file-roller/index.page
 share/help/fi/file-roller/introduction.page
 share/help/fi/file-roller/keyboard-shortcuts.page
@@ -161,7 +152,6 @@ share/help/fr/file-roller/archive-open.page
 share/help/fr/file-roller/archive-view.page
 share/help/fr/file-roller/figures/file-roller-3-12.png
 share/help/fr/file-roller/figures/file-roller-icon.png
-share/help/fr/file-roller/figures/file-roller-open-recent.png
 share/help/fr/file-roller/index.page
 share/help/fr/file-roller/introduction.page
 share/help/fr/file-roller/keyboard-shortcuts.page
@@ -179,7 +169,6 @@ share/help/gl/file-roller/archive-open.page
 share/help/gl/file-roller/archive-view.page
 share/help/gl/file-roller/figures/file-roller-3-12.png
 share/help/gl/file-roller/figures/file-roller-icon.png
-share/help/gl/file-roller/figures/file-roller-open-recent.png
 share/help/gl/file-roller/index.page
 share/help/gl/file-roller/introduction.page
 share/help/gl/file-roller/keyboard-shortcuts.page
@@ -197,7 +186,6 @@ share/help/hu/file-roller/archive-open.page
 share/help/hu/file-roller/archive-view.page
 share/help/hu/file-roller/figures/file-roller-3-12.png
 share/help/hu/file-roller/figures/file-roller-icon.png
-share/help/hu/file-roller/figures/file-roller-open-recent.png
 share/help/hu/file-roller/index.page
 share/help/hu/file-roller/introduction.page
 share/help/hu/file-roller/keyboard-shortcuts.page
@@ -215,7 +203,6 @@ share/help/id/file-roller/archive-open.page
 share/help/id/file-roller/archive-view.page
 share/help/id/file-roller/figures/file-roller-3-12.png
 share/help/id/file-roller/figures/file-roller-icon.png
-share/help/id/file-roller/figures/file-roller-open-recent.png
 share/help/id/file-roller/index.page
 share/help/id/file-roller/introduction.page
 share/help/id/file-roller/keyboard-shortcuts.page
@@ -233,7 +220,6 @@ share/help/ja/file-roller/archive-open.page
 share/help/ja/file-roller/archive-view.page
 share/help/ja/file-roller/figures/file-roller-3-12.png
 share/help/ja/file-roller/figures/file-roller-icon.png
-share/help/ja/file-roller/figures/file-roller-open-recent.png
 share/help/ja/file-roller/index.page
 share/help/ja/file-roller/introduction.page
 share/help/ja/file-roller/keyboard-shortcuts.page
@@ -251,7 +237,6 @@ share/help/ko/file-roller/archive-open.page
 share/help/ko/file-roller/archive-view.page
 share/help/ko/file-roller/figures/file-roller-3-12.png
 share/help/ko/file-roller/figures/file-roller-icon.png
-share/help/ko/file-roller/figures/file-roller-open-recent.png
 share/help/ko/file-roller/index.page
 share/help/ko/file-roller/introduction.page
 share/help/ko/file-roller/keyboard-shortcuts.page
@@ -261,6 +246,23 @@ share/help/ko/file-roller/supported-formats.page
 share/help/ko/file-roller/test-integrity.page
 share/help/ko/file-roller/troubleshooting-archive-open.page
 share/help/ko/file-roller/troubleshooting-password.page
+share/help/pl/file-roller/archive-create.page
+share/help/pl/file-roller/archive-edit.page
+share/help/pl/file-roller/archive-extract-advanced-options.page
+share/help/pl/file-roller/archive-extract.page
+share/help/pl/file-roller/archive-open.page
+share/help/pl/file-roller/archive-view.page
+share/help/pl/file-roller/figures/file-roller-3-12.png
+share/help/pl/file-roller/figures/file-roller-icon.png
+share/help/pl/file-roller/index.page
+share/help/pl/file-roller/introduction.page
+share/help/pl/file-roller/keyboard-shortcuts.page
+share/help/pl/file-roller/legal.xml
+share/help/pl/file-roller/password-protection.page
+share/help/pl/file-roller/supported-formats.page
+share/help/pl/file-roller/test-integrity.page
+share/help/pl/file-roller/troubleshooting-archive-open.page
+share/help/pl/file-roller/troubleshooting-password.page
 share/help/pt_BR/file-roller/archive-create.page
 share/help/pt_BR/file-roller/archive-edit.page
 share/help/pt_BR/file-roller/archive-extract-advanced-options.page
@@ -269,7 +271,6 @@ share/help/pt_BR/file-roller/archive-open.page
 share/help/pt_BR/file-roller/archive-view.page
 share/help/pt_BR/file-roller/figures/file-roller-3-12.png
 share/help/pt_BR/file-roller/figures/file-roller-icon.png
-share/help/pt_BR/file-roller/figures/file-roller-open-recent.png
 share/help/pt_BR/file-roller/index.page
 share/help/pt_BR/file-roller/introduction.page
 share/help/pt_BR/file-roller/keyboard-shortcuts.page
@@ -287,7 +288,6 @@ share/help/ru/file-roller/archive-open.page
 share/help/ru/file-roller/archive-view.page
 share/help/ru/file-roller/figures/file-roller-3-12.png
 share/help/ru/file-roller/figures/file-roller-icon.png
-share/help/ru/file-roller/figures/file-roller-open-recent.png
 share/help/ru/file-roller/index.page
 share/help/ru/file-roller/introduction.page
 share/help/ru/file-roller/keyboard-shortcuts.page
@@ -305,7 +305,6 @@ share/help/sl/file-roller/archive-open.page
 share/help/sl/file-roller/archive-view.page
 share/help/sl/file-roller/figures/file-roller-3-12.png
 share/help/sl/file-roller/figures/file-roller-icon.png
-share/help/sl/file-roller/figures/file-roller-open-recent.png
 share/help/sl/file-roller/index.page
 share/help/sl/file-roller/introduction.page
 share/help/sl/file-roller/keyboard-shortcuts.page
@@ -323,7 +322,6 @@ share/help/sv/file-roller/archive-open.page
 share/help/sv/file-roller/archive-view.page
 share/help/sv/file-roller/figures/file-roller-3-12.png
 share/help/sv/file-roller/figures/file-roller-icon.png
-share/help/sv/file-roller/figures/file-roller-open-recent.png
 share/help/sv/file-roller/index.page
 share/help/sv/file-roller/introduction.page
 share/help/sv/file-roller/keyboard-shortcuts.page
@@ -341,7 +339,6 @@ share/help/te/file-roller/archive-open.page
 share/help/te/file-roller/archive-view.page
 share/help/te/file-roller/figures/file-roller-3-12.png
 share/help/te/file-roller/figures/file-roller-icon.png
-share/help/te/file-roller/figures/file-roller-open-recent.png
 share/help/te/file-roller/index.page
 share/help/te/file-roller/introduction.page
 share/help/te/file-roller/keyboard-shortcuts.page
@@ -359,7 +356,6 @@ share/help/zh_CN/file-roller/archive-open.page
 share/help/zh_CN/file-roller/archive-view.page
 share/help/zh_CN/file-roller/figures/file-roller-3-12.png
 share/help/zh_CN/file-roller/figures/file-roller-icon.png
-share/help/zh_CN/file-roller/figures/file-roller-open-recent.png
 share/help/zh_CN/file-roller/index.page
 share/help/zh_CN/file-roller/introduction.page
 share/help/zh_CN/file-roller/keyboard-shortcuts.page
@@ -478,3 +474,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