Attachment 169247 Details for Bug 208748 – Patch to update archivers/xarchiver

[patch] Patch to update archivers/xarchiver

xarchiver.diff (text/plain), 12.17 KB, created by Olivier Duchateau on 2016-04-12 17:13:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2016-04-12 17:13:17 UTC

Size: 12.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 413145)
>+++ Makefile	(working copy)
>@@ -2,10 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	xarchiver
>-PORTVERSION=	0.5.4
>-PORTREVISION=	1
>+PORTVERSION=	0.5.4.6
> CATEGORIES=	archivers
>-MASTER_SITES=	SF/${PORTNAME:tl}
> 
> MAINTAINER=	danilo@FreeBSD.org
> COMMENT=	Desktop-agnostic GTK+2 frontend to various archiving tools
>@@ -17,6 +15,10 @@
> 		zip:archivers/zip \
> 		zipinfo:archivers/unzip
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	ib
>+GH_TAGNAME=	bb5fce0
>+
> USES=		desktop-file-utils gmake pkgconfig tar:bzip2
> USE_GNOME=	glib20 gtk20 intltool
> GNU_CONFIGURE=	yes
>Index: distinfo
>===================================================================
>--- distinfo	(revision 413145)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xarchiver-0.5.4.tar.bz2) = e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4
>-SIZE (xarchiver-0.5.4.tar.bz2) = 1003045
>+SHA256 (ib-xarchiver-0.5.4.6-bb5fce0_GH0.tar.gz) = 5c9ac0ac4a1bc286a8fa015ef9d6f543f09ae23ea9a944f7c2293a840b35133d
>+SIZE (ib-xarchiver-0.5.4.6-bb5fce0_GH0.tar.gz) = 983215
>Index: files/patch-src_tar.c
>===================================================================
>--- files/patch-src_tar.c	(revision 413145)
>+++ files/patch-src_tar.c	(working copy)
>@@ -1,6 +1,6 @@
>---- src/tar.c.orig	2014-09-28 20:10:38 UTC
>+--- src/tar.c.orig	2016-03-09 15:25:48 UTC
> +++ src/tar.c
>-@@ -331,7 +331,7 @@ gboolean xa_tar_extract(XArchive *archiv
>+@@ -330,7 +330,7 @@ gboolean xa_tar_extract(XArchive *archiv
>  						#else
>  								archive->overwrite ? " --overwrite" : " --keep-old-files",
>  						#endif
>@@ -9,7 +9,7 @@
>  								" -C ",archive->extraction_path," ",names->str,NULL);
>  		}
>  		else
>-@@ -350,7 +350,7 @@ gboolean xa_tar_extract(XArchive *archiv
>+@@ -349,7 +349,7 @@ gboolean xa_tar_extract(XArchive *archiv
>  						#else
>  								archive->overwrite ? " --overwrite" : " --keep-old-files",
>  						#endif
>@@ -18,7 +18,7 @@
>  								" -C ",archive->extraction_path," ",names->str,NULL);
>  		}
>  		else
>-@@ -369,7 +369,7 @@ gboolean xa_tar_extract(XArchive *archiv
>+@@ -368,7 +368,7 @@ gboolean xa_tar_extract(XArchive *archiv
>  						#else
>  								archive->overwrite ? " --overwrite" : " --keep-old-files",
>  						#endif
>@@ -27,14 +27,7 @@
>  								" -C ",archive->extraction_path," ",names->str,NULL);
>  		}
>  		else
>-@@ -382,18 +382,18 @@ gboolean xa_tar_extract(XArchive *archiv
>- 		case XARCHIVETYPE_TAR_LZMA:
>- 		if (archive->full_path || multi_extract)
>- 		{
>--			command = g_strconcat (tar, " --use-compress-program=lzma -xvf " , archive->escaped_path,
>-+			command = g_strconcat (tar, " --use-compress-program='lzma -d' -xvf " , archive->escaped_path,
>- 						#ifdef __FreeBSD__
>- 								archive->overwrite ? " " : " -k",
>+@@ -387,7 +387,7 @@ gboolean xa_tar_extract(XArchive *archiv
>  						#else
>  								archive->overwrite ? " --overwrite" : " --keep-old-files",
>  						#endif
>@@ -43,20 +36,7 @@
>  								" -C ",archive->extraction_path," ",names->str,NULL);
>  		}
>  		else
>- 		{
>--			result = xa_extract_tar_without_directories ( "tar --use-compress-program=lzma -xvf ",archive,names->str);
>-+			result = xa_extract_tar_without_directories ( "tar --use-compress-program='lzma -d' -xvf ",archive,names->str);
>- 			command = NULL;
>- 		}
>- 		break;
>-@@ -401,18 +401,18 @@ gboolean xa_tar_extract(XArchive *archiv
>- 		case XARCHIVETYPE_TAR_LZOP:
>- 		if (archive->full_path || multi_extract)
>- 		{
>--			command = g_strconcat (tar, " --use-compress-program=lzop -xvf " , archive->escaped_path,
>-+			command = g_strconcat (tar, " --use-compress-program='lzop -d' -xvf " , archive->escaped_path,
>- 						#ifdef __FreeBSD__
>- 								archive->overwrite ? " " : " -k",
>+@@ -406,7 +406,7 @@ gboolean xa_tar_extract(XArchive *archiv
>  						#else
>  								archive->overwrite ? " --overwrite" : " --keep-old-files",
>  						#endif
>@@ -65,20 +45,7 @@
>  								" -C ",archive->extraction_path," ",names->str,NULL);
>  		}
>  		else
>- 		{
>--			result = xa_extract_tar_without_directories ( "tar --use-compress-program=lzop -xvf ",archive,names->str);
>-+			result = xa_extract_tar_without_directories ( "tar --use-compress-program='lzop -d' -xvf ",archive,names->str);
>- 			command = NULL;
>- 		}
>- 		break;
>-@@ -420,18 +420,18 @@ gboolean xa_tar_extract(XArchive *archiv
>- 		case XARCHIVETYPE_TAR_XZ:
>- 		if (archive->full_path || multi_extract)
>- 		{
>--			command = g_strconcat (tar, " --use-compress-program=xz -xvf " , archive->escaped_path,
>-+			command = g_strconcat (tar, " --use-compress-program='xz -d' -xvf " , archive->escaped_path,
>- 						#ifdef __FreeBSD__
>- 								archive->overwrite ? " " : " -k",
>+@@ -425,7 +425,7 @@ gboolean xa_tar_extract(XArchive *archiv
>  						#else
>  								archive->overwrite ? " --overwrite" : " --keep-old-files",
>  						#endif
>@@ -87,37 +54,3 @@
>  								" -C ",archive->extraction_path," ",names->str,NULL);
>  		}
>  		else
>- 		{
>--			result = xa_extract_tar_without_directories ( "tar --use-compress-program=xz -xvf ",archive,names->str);
>-+			result = xa_extract_tar_without_directories ( "tar --use-compress-program='xz -d' -xvf ",archive,names->str);
>- 			command = NULL;
>- 		}
>- 		break;
>-@@ -567,7 +567,7 @@ gboolean xa_extract_tar_without_director
>- 											archive->overwrite ? " --overwrite" : " --keep-old-files",
>- 											" --no-wildcards ",
>- 										#endif
>--										archive->tar_touch ? " --touch" : "",
>-+										archive->tar_touch ? " -m" : "",
>- 										"-C ",archive->tmp," ",files_to_extract,NULL);
>- 	list = g_slist_append(list,command);
>- 	if (strstr(files_to_extract,"/") || strcmp(archive->tmp,archive->extraction_path) != 0)
>-@@ -618,15 +618,15 @@ void xa_tar_test(XArchive *archive)
>- 		break;
>- 
>- 		case XARCHIVETYPE_TAR_LZMA:
>--			command = g_strconcat (tar, " --use-compress-program=lzma -tvf ",archive->path, NULL);
>-+			command = g_strconcat (tar, " --use-compress-program='lzma -d' -tvf ",archive->path, NULL);
>- 		break;
>- 
>- 		case XARCHIVETYPE_TAR_LZOP:
>--			command = g_strconcat (tar, " --use-compress-program=lzop -tvf ",archive->path, NULL);
>-+			command = g_strconcat (tar, " --use-compress-program='lzop -d' -tvf ",archive->path, NULL);
>- 		break;
>- 		
>- 		case XARCHIVETYPE_TAR_XZ:
>--			command = g_strconcat (tar, " --use-compress-program=xz -tvf ",archive->path, NULL);
>-+			command = g_strconcat (tar, " --use-compress-program='xz -d' -tvf ",archive->path, NULL);
>- 		break;
>- 
>- 		case XARCHIVETYPE_LZMA:
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 413145)
>+++ pkg-descr	(working copy)
>@@ -2,4 +2,4 @@
> All common archive types are supported. RPM and ISO are handled without
> rpm or isodump executables.
> 
>-WWW: http://xarchiver.sourceforge.net/
>+WWW: https://github.com/ib/xarchiver
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 413145)
>+++ pkg-plist	(working copy)
>@@ -1,53 +1,50 @@
> bin/xarchiver
> libexec/thunar-archive-plugin/xarchiver.tap
> share/applications/xarchiver.desktop
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s04.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch02s02.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch02s03.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s02.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s03.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s04.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s05.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s06.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s07.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s08.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch03s09.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch04.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s02.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s03.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s04.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s05.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/ch04s06.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/add_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/archive_comment_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/archive_properties.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/extract_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/multi_extract_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/new_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/password_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog.png
>-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/html/xarchiver.css
>+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch01s01.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch01s02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch01s03.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch02s01.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch02s02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03s01.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03s02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03s03.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03s04.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04s01.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04s02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04s03.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04s04.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04s05.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04s06.html
>+%%PORTDOCS%%%%DOCSDIR%%/images/add_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/archive_comment_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/archive_properties.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/extract_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/multi_extract_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/new_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/password_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/pref_dialog.png
>+%%PORTDOCS%%%%DOCSDIR%%/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/xarchiver.css
> share/icons/hicolor/16x16/apps/xarchiver.png
> share/icons/hicolor/24x24/apps/xarchiver.png
> share/icons/hicolor/48x48/apps/xarchiver.png
> share/icons/hicolor/scalable/apps/xarchiver.svg
>+%%NLS%%share/locale/ar/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/ast/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/bg/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/ca/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/da/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/de/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/dz/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/el/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/en_GB/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/es/LC_MESSAGES/xarchiver.mo
>@@ -54,19 +51,35 @@
> %%NLS%%share/locale/eu/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/fi/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/gl/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/he/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/hr/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/hu/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/id/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/xarchiver.mo
>-%%NLS%%share/locale/nb_NO/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/kk/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/ku/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/lv/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/nb/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/pa/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/pl/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/pt_BR/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/pt_PT/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/ro/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/si/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/sk/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/sq/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/te/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/tr/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/ug/LC_MESSAGES/xarchiver.mo
> %%NLS%%share/locale/uk/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/ur/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xarchiver.mo
>+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xarchiver.mo
> share/pixmaps/xarchiver/xarchiver-add.png
> share/pixmaps/xarchiver/xarchiver-extract.png
> share/pixmaps/xarchiver/xarchiver-html.png

Actions: View | Diff

Attachments on bug 208748: 169247