Attachment #161041 for bug #203103

View | Details | Raw Unified | Return to bug 203103
Collapse All | Expand All

Lines 3-8 Link Here

(-)archivers/xarchiver/Makefile (-2 / +13 lines)
3		3
4	PORTNAME= xarchiver	4	PORTNAME= xarchiver
5	PORTVERSION= 0.5.4	5	PORTVERSION= 0.5.4
		6	PORTREVISION= 1
6	CATEGORIES= archivers	7	CATEGORIES= archivers
7	MASTER_SITES= SF/${PORTNAME:tl}	8	MASTER_SITES= SF/${PORTNAME:tl}
8		9
Lines 13-28 Link Here
13		14
14	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \	15	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
15	7zr:${PORTSDIR}/archivers/p7zip \	16	7zr:${PORTSDIR}/archivers/p7zip \
16	zip:${PORTSDIR}/archivers/zip	17	zip:${PORTSDIR}/archivers/zip \
		18	zipinfo:${PORTSDIR}/archivers/unzip
17		19
18	USES= tar:bzip2 gmake pkgconfig desktop-file-utils	20	USES= desktop-file-utils gmake pkgconfig tar:bzip2
19	USE_GNOME= glib20 gtk20 intltool	21	USE_GNOME= glib20 gtk20 intltool
20	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
21	INSTALLS_ICONS= yes	23	INSTALLS_ICONS= yes
22		24
23	OPTIONS_DEFINE= DOCS NLS	25	OPTIONS_DEFINE= DOCS NLS
		26	OPTIONS_GROUP= FORMATS
		27	OPTIONS_GROUP_FORMATS= ARJ LZO
24	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
25		29
		30	FORMATS_DESC= Additional compression formats support
		31	ARJ_DESC= ARJ compression support
		32	LZO_DESC= LZO compression support
		33
		34	ARJ_RUN_DEPENDS= arj:${PORTSDIR}/archivers/arj
		35	LZO_RUN_DEPENDS= lzop:${PORTSDIR}/archivers/lzop
		36
26	NLS_USES= gettext	37	NLS_USES= gettext
27	NLS_CPPFLAGS+= -I${LOCALBASE}/include	38	NLS_CPPFLAGS+= -I${LOCALBASE}/include
28	NLS_LDFLAGS+= -L${LOCALBASE}/lib	39	NLS_LDFLAGS+= -L${LOCALBASE}/lib




--- src/bzip2.c.orig	2014-02-09 15:26:24 UTC
+++ src/bzip2.c
@@ -171,11 +171,11 @@ void xa_open_tar_compressed_file(XArchiv
 	if (archive->type == XARCHIVETYPE_TAR_BZ2)
 		command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL);
 	else if (archive->type == XARCHIVETYPE_TAR_LZMA)
-		command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL);
+		command = g_strconcat(tar," tv --use-compress-program='lzma -d' -f ",archive->escaped_path,NULL);
 	else if (archive->type == XARCHIVETYPE_TAR_XZ)
-		command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL);
+		command = g_strconcat(tar," tv --use-compress-program='xz -d' -f ",archive->escaped_path,NULL);
 	else if (archive->type == XARCHIVETYPE_TAR_LZOP)
-		command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL);
+		command = g_strconcat(tar," tv --use-compress-program='lzop -d' -f ",archive->escaped_path,NULL);
 	/* else fail? */
 
 	archive->has_properties = archive->can_add = archive->can_extract = archive->has_test = TRUE;




--- src/tar.c.orig	2014-09-28 20:10:38 UTC
+++ src/tar.c
@@ -331,7 +331,7 @@ gboolean xa_tar_extract(XArchive *archiv
 						#else
 								archive->overwrite ? " --overwrite" : " --keep-old-files",
 						#endif
-								archive->tar_touch ? " --touch" : "",
+								archive->tar_touch ? " -m" : "",
 								" -C ",archive->extraction_path," ",names->str,NULL);
 		}
 		else
@@ -350,7 +350,7 @@ gboolean xa_tar_extract(XArchive *archiv
 						#else
 								archive->overwrite ? " --overwrite" : " --keep-old-files",
 						#endif
-								archive->tar_touch ? " --touch" : "",
+								archive->tar_touch ? " -m" : "",
 								" -C ",archive->extraction_path," ",names->str,NULL);
 		}
 		else
@@ -369,7 +369,7 @@ gboolean xa_tar_extract(XArchive *archiv
 						#else
 								archive->overwrite ? " --overwrite" : " --keep-old-files",
 						#endif
-								archive->tar_touch ? " --touch" : "",
+								archive->tar_touch ? " -m" : "",
 								" -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",
 						#else
 								archive->overwrite ? " --overwrite" : " --keep-old-files",
 						#endif
-								archive->tar_touch ? " --touch" : "",
+								archive->tar_touch ? " -m" : "",
 								" -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",
 						#else
 								archive->overwrite ? " --overwrite" : " --keep-old-files",
 						#endif
-								archive->tar_touch ? " --touch" : "",
+								archive->tar_touch ? " -m" : "",
 								" -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",
 						#else
 								archive->overwrite ? " --overwrite" : " --keep-old-files",
 						#endif
-								archive->tar_touch ? " --touch" : "",
+								archive->tar_touch ? " -m" : "",
 								" -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:

Line 0 Link Here

(-)archivers/xarchiver/files/patch-src_window.c (+11 lines)
	1	--- src/window.c.orig 2014-09-28 20:42:37 UTC
	2	+++ src/window.c
	3	@@ -1130,7 +1130,7 @@ XArchiveType xa_detect_archive_type (gch
	4	xx = XARCHIVETYPE_BZIP2;
	5	else if (memcmp ( magic,"\x1f\x8b",2) == 0 \|\| memcmp ( magic,"\x1f\x9d",2) == 0)
	6	xx = XARCHIVETYPE_GZIP;
	7	- else if (memcmp ( magic,"\x5d\x00\x00\x80",4) == 0)
	8	+ else if (memcmp ( magic,"\x5d\x00\x00",3) == 0)
	9	xx = XARCHIVETYPE_LZMA;
	10	else if (memcmp ( magic,"\xfd\x37\x7a\x58\x5a",5) == 0)
	11	xx = XARCHIVETYPE_XZ;

Return to bug 203103

Line 0 Link Here

(-)archivers/xarchiver/files/patch-src_bzip2.c (+17 lines)
	1	--- src/bzip2.c.orig 2014-02-09 15:26:24 UTC
	2	+++ src/bzip2.c
	3	@@ -171,11 +171,11 @@ void xa_open_tar_compressed_file(XArchiv
	4	if (archive->type == XARCHIVETYPE_TAR_BZ2)
	5	command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL);
	6	else if (archive->type == XARCHIVETYPE_TAR_LZMA)
	7	- command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL);
	8	+ command = g_strconcat(tar," tv --use-compress-program='lzma -d' -f ",archive->escaped_path,NULL);
	9	else if (archive->type == XARCHIVETYPE_TAR_XZ)
	10	- command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL);
	11	+ command = g_strconcat(tar," tv --use-compress-program='xz -d' -f ",archive->escaped_path,NULL);
	12	else if (archive->type == XARCHIVETYPE_TAR_LZOP)
	13	- command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL);
	14	+ command = g_strconcat(tar," tv --use-compress-program='lzop -d' -f ",archive->escaped_path,NULL);
	15	/* else fail? */
	16
	17	archive->has_properties = archive->can_add = archive->can_extract = archive->has_test = TRUE;

Line 0 Link Here

(-)archivers/xarchiver/files/patch-src_tar.c (+123 lines)
		1	--- src/tar.c.orig 2014-09-28 20:10:38 UTC
		2	+++ src/tar.c
		3	@@ -331,7 +331,7 @@ gboolean xa_tar_extract(XArchive *archiv
		4	#else
		5	archive->overwrite ? " --overwrite" : " --keep-old-files",
		6	#endif
		7	- archive->tar_touch ? " --touch" : "",
		8	+ archive->tar_touch ? " -m" : "",
		9	" -C ",archive->extraction_path," ",names->str,NULL);
		10	}
		11	else
		12	@@ -350,7 +350,7 @@ gboolean xa_tar_extract(XArchive *archiv
		13	#else
		14	archive->overwrite ? " --overwrite" : " --keep-old-files",
		15	#endif
		16	- archive->tar_touch ? " --touch" : "",
		17	+ archive->tar_touch ? " -m" : "",
		18	" -C ",archive->extraction_path," ",names->str,NULL);
		19	}
		20	else
		21	@@ -369,7 +369,7 @@ gboolean xa_tar_extract(XArchive *archiv
		22	#else
		23	archive->overwrite ? " --overwrite" : " --keep-old-files",
		24	#endif
		25	- archive->tar_touch ? " --touch" : "",
		26	+ archive->tar_touch ? " -m" : "",
		27	" -C ",archive->extraction_path," ",names->str,NULL);
		28	}
		29	else
		30	@@ -382,18 +382,18 @@ gboolean xa_tar_extract(XArchive *archiv
		31	case XARCHIVETYPE_TAR_LZMA:
		32	if (archive->full_path \|\| multi_extract)
		33	{
		34	- command = g_strconcat (tar, " --use-compress-program=lzma -xvf " , archive->escaped_path,
		35	+ command = g_strconcat (tar, " --use-compress-program='lzma -d' -xvf " , archive->escaped_path,
		36	#ifdef __FreeBSD__
		37	archive->overwrite ? " " : " -k",
		38	#else
		39	archive->overwrite ? " --overwrite" : " --keep-old-files",
		40	#endif
		41	- archive->tar_touch ? " --touch" : "",
		42	+ archive->tar_touch ? " -m" : "",
		43	" -C ",archive->extraction_path," ",names->str,NULL);
		44	}
		45	else
		46	{
		47	- result = xa_extract_tar_without_directories ( "tar --use-compress-program=lzma -xvf ",archive,names->str);
		48	+ result = xa_extract_tar_without_directories ( "tar --use-compress-program='lzma -d' -xvf ",archive,names->str);
		49	command = NULL;
		50	}
		51	break;
		52	@@ -401,18 +401,18 @@ gboolean xa_tar_extract(XArchive *archiv
		53	case XARCHIVETYPE_TAR_LZOP:
		54	if (archive->full_path \|\| multi_extract)
		55	{
		56	- command = g_strconcat (tar, " --use-compress-program=lzop -xvf " , archive->escaped_path,
		57	+ command = g_strconcat (tar, " --use-compress-program='lzop -d' -xvf " , archive->escaped_path,
		58	#ifdef __FreeBSD__
		59	archive->overwrite ? " " : " -k",
		60	#else
		61	archive->overwrite ? " --overwrite" : " --keep-old-files",
		62	#endif
		63	- archive->tar_touch ? " --touch" : "",
		64	+ archive->tar_touch ? " -m" : "",
65	" -C ",archive->extraction_path," ",names->str,NULL);
66	}
67	else
68	{
69	- result = xa_extract_tar_without_directories ( "tar --use-compress-program=lzop -xvf ",archive,names->str);
70	+ result = xa_extract_tar_without_directories ( "tar --use-compress-program='lzop -d' -xvf ",archive,names->str);
71	command = NULL;
72	}
73	break;
74	@@ -420,18 +420,18 @@ gboolean xa_tar_extract(XArchive *archiv
75	case XARCHIVETYPE_TAR_XZ:
76	if (archive->full_path \|\| multi_extract)
77	{
78	- command = g_strconcat (tar, " --use-compress-program=xz -xvf " , archive->escaped_path,
79	+ command = g_strconcat (tar, " --use-compress-program='xz -d' -xvf " , archive->escaped_path,
80	#ifdef __FreeBSD__
81	archive->overwrite ? " " : " -k",
82	#else
83	archive->overwrite ? " --overwrite" : " --keep-old-files",
84	#endif
85	- archive->tar_touch ? " --touch" : "",
86	+ archive->tar_touch ? " -m" : "",
87	" -C ",archive->extraction_path," ",names->str,NULL);
88	}
89	else
90	{
91	- result = xa_extract_tar_without_directories ( "tar --use-compress-program=xz -xvf ",archive,names->str);
92	+ result = xa_extract_tar_without_directories ( "tar --use-compress-program='xz -d' -xvf ",archive,names->str);
93	command = NULL;
94	}
95	break;
96	@@ -567,7 +567,7 @@ gboolean xa_extract_tar_without_director
97	archive->overwrite ? " --overwrite" : " --keep-old-files",
98	" --no-wildcards ",
99	#endif
100	- archive->tar_touch ? " --touch" : "",
101	+ archive->tar_touch ? " -m" : "",
102	"-C ",archive->tmp," ",files_to_extract,NULL);
103	list = g_slist_append(list,command);
104	if (strstr(files_to_extract,"/") \|\| strcmp(archive->tmp,archive->extraction_path) != 0)
105	@@ -618,15 +618,15 @@ void xa_tar_test(XArchive *archive)
106	break;
107
108	case XARCHIVETYPE_TAR_LZMA:
109	- command = g_strconcat (tar, " --use-compress-program=lzma -tvf ",archive->path, NULL);
110	+ command = g_strconcat (tar, " --use-compress-program='lzma -d' -tvf ",archive->path, NULL);
111	break;
112
113	case XARCHIVETYPE_TAR_LZOP:
114	- command = g_strconcat (tar, " --use-compress-program=lzop -tvf ",archive->path, NULL);
115	+ command = g_strconcat (tar, " --use-compress-program='lzop -d' -tvf ",archive->path, NULL);
116	break;
117
118	case XARCHIVETYPE_TAR_XZ:
119	- command = g_strconcat (tar, " --use-compress-program=xz -tvf ",archive->path, NULL);
120	+ command = g_strconcat (tar, " --use-compress-program='xz -d' -tvf ",archive->path, NULL);
121	break;
122
123	case XARCHIVETYPE_LZMA: