1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
|
--- xarchiver-0.5.4.6.orig/doc/html/ch01s01.html 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/doc/html/ch01s01.html 2016-04-12 15:42:24.032705366 -0500
@@ -8,7 +8,7 @@
to work. The package <span class="emphasis"><em>xdg-utils</em></span> is optional.
</p><p>
Xarchiver presents the following characteristic:
- </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">Archive directories can be browsed just like a file manager</li><li class="listitem">Mime icon for each of the archive entries</li><li class="listitem">The most used archiver's command line options are supported in the Add and Extract dialogs</li><li class="listitem">Tabs Firefox style support</li><li class="listitem">Multi-extract facility</li><li class="listitem">Dump of the whole archive content as HTML or text file</li><li class="listitem">Context menu on each of the archive entries with cut/copy/paste/rename abilities</li><li class="listitem">Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz</li><li class="listitem">Drag and drop from and to Xarchiver window</li><li class="listitem">Progress window when using Xarchiver from the command line or from a file-manager</li><li class="listitem">ARJ, RAR and ZIP archive comment are supported</li><li class="listitem">Ability to convert the archive to self-extracting for those archive types which support it</li><li class="listitem">Smart detection of arj, zip and rar password encrypted archives</li><li class="listitem">All the the output of the command line archiver is displayed in the Xarchiver window</li><li class="listitem">All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, rar, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)</li><li class="listitem">Deb and Rpm packages are handled internally, their package managers are NOT required.</li><li class="listitem">Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)</li></ul></div><p>
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">Archive directories can be browsed just like a file manager</li><li class="listitem">Mime icon for each of the archive entries</li><li class="listitem">The most used archiver's command line options are supported in the Add and Extract dialogs</li><li class="listitem">Tabs Firefox style support</li><li class="listitem">Multi-extract facility</li><li class="listitem">Dump of the whole archive content as HTML or text file</li><li class="listitem">Context menu on each of the archive entries with cut/copy/paste/rename abilities</li><li class="listitem">Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz</li><li class="listitem">Drag and drop from and to Xarchiver window</li><li class="listitem">Progress window when using Xarchiver from the command line or from a file-manager</li><li class="listitem">ARJ and ZIP archive comment are supported</li><li class="listitem">Ability to convert the archive to self-extracting for those archive types which support it</li><li class="listitem">Smart detection of arj and zip password encrypted archives</li><li class="listitem">All the the output of the command line archiver is displayed in the Xarchiver window</li><li class="listitem">All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)</li><li class="listitem">Deb and Rpm packages are handled internally, their package managers are NOT required.</li><li class="listitem">Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)</li></ul></div><p>
</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 1.
Introduction
</td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Where to get it</td></tr></table></div></body></html>
\ No newline at end of file
--- xarchiver-0.5.4.6.orig/doc/html/ch03s03.html 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/doc/html/ch03s03.html 2016-04-12 15:41:13.299755226 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>General</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch03.html" title="Chapter 3. Usage" /><link rel="prev" href="ch03s02.html" title="Command line options" /><link rel="next" href="ch03s04.html" title="Xarchiver menu" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">General</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Usage</th><td width="20%" align="right"> <a accesskey="n" href="ch03s04.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="usage_general"></a>General</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="general_startup"></a>Startup</h3></div></div></div><p>
- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script <span class="emphasis"><em>xdg-open</em></span> for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created.
+ At startup, Xarchiver detects the available installed archivers (tar,zip etc) and the script <span class="emphasis"><em>xdg-open</em></span> for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available.
</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="how_it_works"></a>How it works</h3></div></div></div><p>
Xarchiver will run in the background the command line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. Starting with release 0.5 the files in the archive can be opened within Xarchiver. The script <span class="emphasis"><em>xdg-open</em></span> will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it.
</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="dnd"></a>Drag and Drop</h3></div></div></div><p>
--- xarchiver-0.5.4.6.orig/doc/html/ch04s02.html 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/doc/html/ch04s02.html 2016-04-12 15:39:11.457081971 -0500
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>How can I create an archive with some files password protected and others not?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s01.html" title="Why are ace archives not supported?" /><link rel="next" href="ch04s03.html" title="Why does Xarchiver emit this error message when handling tar archives?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">How can I create an archive with some files password protected and others not?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s01.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> <a accesskey="n" href="ch04s03.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_2"></a>How can I create an archive with some files password protected and others not?</h2></div></div></div><p>First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>How can I create an archive with some files password protected and others not?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s01.html" title="Why are ace archives not supported?" /><link rel="next" href="ch04s03.html" title="Why does Xarchiver emit this error message when handling tar archives?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">How can I create an archive with some files password protected and others not?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s01.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> <a accesskey="n" href="ch04s03.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_2"></a>How can I create an archive with some files password protected and others not?</h2></div></div></div><p>First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and
enter your password. From now on all the files you add to the archive will be password protected.
</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch04s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch04.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch04s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Why are ace archives not supported? </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Why does Xarchiver emit this error message when handling tar archives?</td></tr></table></div></body></html>
\ No newline at end of file
--- xarchiver-0.5.4.6.orig/doc/html/ch04s06.html 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/doc/html/ch04s06.html 2016-04-12 15:38:34.257283499 -0500
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s05.html" title="Why does Xarchiver sometimes report errors but the Error messages window is empty?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s05.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_6"></a>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</h2></div></div></div><p>Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path.
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</title><link rel="stylesheet" type="text/css" href="xarchiver.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><link rel="home" href="index.html" title="Xarchiver 0.5.4" /><link rel="up" href="ch04.html" title="Chapter 4. FAQ" /><link rel="prev" href="ch04s05.html" title="Why does Xarchiver sometimes report errors but the Error messages window is empty?" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s05.html">Prev</a> </td><th width="60%" align="center">Chapter 4. FAQ</th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="faq_6"></a>Why Xarchiver doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</h2></div></div></div><p>Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path.
</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch04s05.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch04.html">Up</a></td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Why does Xarchiver sometimes report errors but the Error messages window is empty? </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
\ No newline at end of file
--- xarchiver-0.5.4.6.orig/doc/xarchiver.docbook 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/doc/xarchiver.docbook 2016-04-12 15:37:03.884439758 -0500
@@ -56,13 +56,13 @@
<listitem><para>Archives are detected by their magic header and not by the extension except for .tar.bz2 and .tar.gz</para></listitem>
<listitem><para>Drag and drop from and to &app; window</para></listitem>
<listitem><para>Progress window when using &app; from the command line or from a file-manager</para></listitem>
- <listitem><para>ARJ, RAR and ZIP archive comment are supported</para></listitem>
+ <listitem><para>ARJ and ZIP archive comment are supported</para></listitem>
<listitem><para>Ability to convert the archive to self-extracting for those archive types which support it</para></listitem>
- <listitem><para>Smart detection of arj, zip and rar password encrypted archives</para></listitem>
+ <listitem><para>Smart detection of arj and zip password encrypted archives</para></listitem>
<listitem><para>All the the output of the command line archiver is displayed in the &app; window</para></listitem>
- <listitem><para>All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, rar, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)</para></listitem>
+ <listitem><para>All common formats are supported: arj, bzip2, gzip, lha, lzma, 7z, tar, tar.bz2, tar.gz, tar.lzma, tar.lzop, zip, deb and rpm packages (open and extract only)</para></listitem>
<listitem><para>Deb and Rpm packages are handled internally, their package managers are NOT required.</para></listitem>
- <listitem><para>Zip, rar, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)</para></listitem>
+ <listitem><para>Zip, arj and 7z password encrypted archives are fully supported (7z automatic password detection is not supported)</para></listitem>
</itemizedlist>
</para>
</section>
@@ -209,7 +209,7 @@
<section id="general_startup">
<title>Startup</title>
<para>
- At startup, &app; detects the available installed archivers (tar,rar,zip etc) and the script <emphasis>xdg-open</emphasis> for handling different file types. Since &app; is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, &app; can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created.
+ At startup, &app; detects the available installed archivers (tar,zip etc) and the script <emphasis>xdg-open</emphasis> for handling different file types. Since &app; is a frontend (a graphic user interface to the command line executables) it can't create archives whose archiver is not available.
</para>
</section>
<section id="how_it_works">
@@ -435,7 +435,7 @@
</section>
<section id="faq_2">
<title>How can I create an archive with some files password protected and others not?</title>
- <para>First of all choose 'New' and select one of arj, 7zip, rar or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and
+ <para>First of all choose 'New' and select one of arj, 7zip or zip archive formats and choose 'Add' from the Action menu. Do NOT check "Password" in the Add dialog. Add your files and then reopen the Add dialog again but this time check "Password" and
enter your password. From now on all the files you add to the archive will be password protected.
</para>
</section>
@@ -456,7 +456,7 @@
</section>
<section id="faq_6">
<title>Why &app; doesn't allow me to choose the archive self-extracting path as it happens with zip and 7z?</title>
- <para>Because rar and arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path.
+ <para>Because arj executable do not allow to do so. Zip and 7z convertion to self-extracting is made by appending an sfx module to the archive so it's possible to choose a different path.
</para>
</section>
</chapter>
--- xarchiver-0.5.4.6.orig/po/POTFILES.in 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/po/POTFILES.in 2016-04-12 15:27:20.210935122 -0500
@@ -12,7 +12,6 @@
src/new_dialog.c
src/open-with-dlg.c
src/pref_dialog.c
-src/rar.c
src/rpm.c
src/tar.c
src/window.c
--- xarchiver-0.5.4.6.orig/src/Makefile.am 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/Makefile.am 2016-04-12 15:26:39.234490444 -0500
@@ -33,8 +33,6 @@
open-with-dlg.h \
pref_dialog.c \
pref_dialog.h \
- rar.c \
- rar.h \
rpm.c \
rpm.h \
sexy-icon-entry.c \
--- xarchiver-0.5.4.6.orig/src/Makefile.in 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/Makefile.in 2016-04-12 15:25:55.908058496 -0500
@@ -112,7 +112,7 @@
xarchiver-lha.$(OBJEXT) xarchiver-main.$(OBJEXT) \
xarchiver-mime.$(OBJEXT) xarchiver-new_dialog.$(OBJEXT) \
xarchiver-open-with-dlg.$(OBJEXT) \
- xarchiver-pref_dialog.$(OBJEXT) xarchiver-rar.$(OBJEXT) \
+ xarchiver-pref_dialog.$(OBJEXT) \
xarchiver-rpm.$(OBJEXT) xarchiver-sexy-icon-entry.$(OBJEXT) \
xarchiver-socket.$(OBJEXT) xarchiver-string_utils.$(OBJEXT) \
xarchiver-support.$(OBJEXT) xarchiver-tar.$(OBJEXT) \
@@ -420,8 +420,6 @@
open-with-dlg.h \
pref_dialog.c \
pref_dialog.h \
- rar.c \
- rar.h \
rpm.c \
rpm.h \
sexy-icon-entry.c \
@@ -564,7 +562,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-new_dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-open-with-dlg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-pref_dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-rpm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-sexy-icon-entry.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarchiver-socket.Po@am__quote@
@@ -806,20 +803,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-pref_dialog.obj `if test -f 'pref_dialog.c'; then $(CYGPATH_W) 'pref_dialog.c'; else $(CYGPATH_W) '$(srcdir)/pref_dialog.c'; fi`
-xarchiver-rar.o: rar.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.o -MD -MP -MF $(DEPDIR)/xarchiver-rar.Tpo -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xarchiver-rar.Tpo $(DEPDIR)/xarchiver-rar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rar.c' object='xarchiver-rar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.o `test -f 'rar.c' || echo '$(srcdir)/'`rar.c
-
-xarchiver-rar.obj: rar.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rar.obj -MD -MP -MF $(DEPDIR)/xarchiver-rar.Tpo -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xarchiver-rar.Tpo $(DEPDIR)/xarchiver-rar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rar.c' object='xarchiver-rar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -c -o xarchiver-rar.obj `if test -f 'rar.c'; then $(CYGPATH_W) 'rar.c'; else $(CYGPATH_W) '$(srcdir)/rar.c'; fi`
-
xarchiver-rpm.o: rpm.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xarchiver_CFLAGS) $(CFLAGS) -MT xarchiver-rpm.o -MD -MP -MF $(DEPDIR)/xarchiver-rpm.Tpo -c -o xarchiver-rpm.o `test -f 'rpm.c' || echo '$(srcdir)/'`rpm.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xarchiver-rpm.Tpo $(DEPDIR)/xarchiver-rpm.Po
--- xarchiver-0.5.4.6.orig/src/interface.c 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/interface.c 2016-04-12 15:22:08.385957756 -0500
@@ -47,7 +47,7 @@
static gulong selchghid;
-extern gboolean unarj,unrar,batch_mode;
+extern gboolean unarj,batch_mode;
static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid *pid);
static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid *pid);
@@ -601,7 +601,7 @@
if (selection != NULL)
xa_row_selected(selection,archive[id]);
- if (archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_ARJ)
+ if (archive[id]->type == XARCHIVETYPE_ZIP || archive[id]->type == XARCHIVETYPE_ARJ)
gtk_widget_set_sensitive (comment_menu,TRUE);
else
gtk_widget_set_sensitive (comment_menu,FALSE);
@@ -624,12 +624,7 @@
{
gtk_widget_show(selected_frame);
gtk_widget_set_sensitive(deselect_all,TRUE);
- if (archive[id]->type == XARCHIVETYPE_RAR && unrar)
- {
- gtk_widget_set_sensitive (delete_menu,FALSE);
- gtk_widget_set_sensitive (rename_menu,FALSE);
- }
- else if (archive[id]->type == XARCHIVETYPE_ARJ && unarj)
+ if (archive[id]->type == XARCHIVETYPE_ARJ && unarj)
{
gtk_widget_set_sensitive (delete_menu,FALSE);
gtk_widget_set_sensitive (rename_menu,FALSE);
--- xarchiver-0.5.4.6.orig/src/main.c 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/main.c 2016-04-12 15:18:19.947195315 -0500
@@ -34,7 +34,6 @@
gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract;
gboolean batch_mode = FALSE;
gboolean unarj = FALSE;
-gboolean unrar = FALSE;
gboolean xdg_open = FALSE;
const gchar *sevenz = NULL;
static gboolean tbz2, tgz, tlz, txz, tzo, zip;
@@ -325,7 +324,6 @@
open_archive[XARCHIVETYPE_GZIP] = &xa_open_gzip;
open_archive[XARCHIVETYPE_LZMA] = &xa_open_bzip2_lzma;
open_archive[XARCHIVETYPE_XZ] = &xa_open_bzip2_lzma;
- open_archive[XARCHIVETYPE_RAR] = &xa_open_rar;
open_archive[XARCHIVETYPE_RPM] = &xa_open_rpm;
open_archive[XARCHIVETYPE_TAR] = open_archive[XARCHIVETYPE_TAR_BZ2] = open_archive[XARCHIVETYPE_TAR_GZ] = open_archive[XARCHIVETYPE_TAR_LZMA] = open_archive[XARCHIVETYPE_TAR_XZ] = open_archive[XARCHIVETYPE_TAR_LZOP] = &xa_open_tar;
open_archive[XARCHIVETYPE_ZIP] = &xa_open_zip;
@@ -337,7 +335,6 @@
delete[XARCHIVETYPE_ARJ] = &xa_arj_delete;
delete[XARCHIVETYPE_DEB] = 0;
delete[XARCHIVETYPE_BZIP2] = delete[XARCHIVETYPE_GZIP] = delete[XARCHIVETYPE_LZMA] = delete[XARCHIVETYPE_XZ] = delete[XARCHIVETYPE_LZOP] = &xa_tar_delete;
- delete[XARCHIVETYPE_RAR] = &xa_rar_delete;
delete[XARCHIVETYPE_RPM] = 0;
delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete;
delete[XARCHIVETYPE_ZIP] = &xa_zip_delete;
@@ -349,7 +346,6 @@
add[XARCHIVETYPE_ARJ] = &xa_arj_add;
add[XARCHIVETYPE_DEB] = 0;
add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = add[XARCHIVETYPE_LZOP] = &xa_tar_add;
- add[XARCHIVETYPE_RAR] = &xa_rar_add;
add[XARCHIVETYPE_RPM] = 0;
add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add;
add[XARCHIVETYPE_ZIP] = &xa_zip_add;
@@ -360,7 +356,6 @@
extract[XARCHIVETYPE_ARJ] = &xa_arj_extract;
extract[XARCHIVETYPE_DEB] = &xa_deb_extract;;
extract[XARCHIVETYPE_BZIP2] = extract[XARCHIVETYPE_GZIP] = extract[XARCHIVETYPE_LZMA] = extract[XARCHIVETYPE_XZ] = extract[XARCHIVETYPE_LZOP] = &xa_tar_extract;
- extract[XARCHIVETYPE_RAR] = &xa_rar_extract;
extract[XARCHIVETYPE_RPM] = &xa_rpm_extract;
extract[XARCHIVETYPE_TAR] = extract[XARCHIVETYPE_TAR_BZ2] = extract[XARCHIVETYPE_TAR_GZ] = extract[XARCHIVETYPE_TAR_LZMA] = extract[XARCHIVETYPE_TAR_XZ] = extract[XARCHIVETYPE_TAR_LZOP] = &xa_tar_extract;
extract[XARCHIVETYPE_ZIP] = &xa_zip_extract;
@@ -370,7 +365,6 @@
test[XARCHIVETYPE_7ZIP] = &xa_7zip_test;
test[XARCHIVETYPE_ARJ] = &xa_arj_test;
test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = test[XARCHIVETYPE_LZOP] = &xa_tar_test;
- test[XARCHIVETYPE_RAR] = &xa_rar_test;
test[XARCHIVETYPE_RPM] = 0;
test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = &xa_tar_test;
test[XARCHIVETYPE_ZIP] = &xa_zip_test;
@@ -479,31 +473,6 @@
g_free (absolute_path);
}
- absolute_path = g_find_program_in_path ("rar");
- if ( absolute_path )
- {
- ArchiveType = g_list_append(ArchiveType, "rar");
- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
- if (xa_rar_checkversion(absolute_path) == 5)
- {
- ArchiveType = g_list_append(ArchiveType, "rar5");
- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
- }
- g_free (absolute_path);
- }
- else
- {
- absolute_path = g_find_program_in_path("unrar");
- if ( absolute_path )
- {
- unrar = TRUE;
- xa_rar_checkversion(absolute_path);
- ArchiveType = g_list_append(ArchiveType, "rar");
- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar");
- g_free (absolute_path);
- }
- }
-
absolute_path = g_find_program_in_path("cpio");
if ( absolute_path )
{
--- xarchiver-0.5.4.6.orig/src/mime.c 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/mime.c 2016-04-12 15:09:26.186753610 -0500
@@ -69,7 +69,6 @@
strcmp(mime,"application/x-lzma") == 0 ||
strcmp(mime,"application/x-lzma-compressed-tar") == 0 ||
strcmp(mime,"application/x-lzop") == 0 ||
- strcmp(mime,"application/x-rar") == 0 ||
strcmp(mime,"application/x-rpm") == 0 ||
strcmp(mime,"application/x-source-rpm") == 0 ||
strcmp(mime,"application/x-tar") == 0 ||
--- xarchiver-0.5.4.6.orig/src/new_dialog.c 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/new_dialog.c 2016-04-12 15:07:58.673894375 -0500
@@ -24,7 +24,7 @@
#include "string_utils.h"
#include "main.h"
-extern gboolean unarj, unrar;
+extern gboolean unarj;
extern Prefs_dialog_data *prefs_window;
gchar *current_new_directory = NULL;
gint new_combo_box = -1;
@@ -159,8 +159,7 @@
while (Name)
{
if (!(*(char *) Name->data == 0 ||
- (strncmp(Name->data, "arj", 3) == 0 && unarj) ||
- (strncmp(Name->data, "rar", 3) == 0 && unrar)))
+ (strncmp(Name->data, "arj", 3) == 0 && unarj)))
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),Name->data);
Name = g_list_next (Name);
}
@@ -284,16 +283,6 @@
type = XARCHIVETYPE_LZOP;
format = "LZOP";
}
- else if (strcmp (ComboArchiveType,"rar") == 0)
- {
- type = XARCHIVETYPE_RAR;
- format = "RAR";
- }
- else if (strcmp (ComboArchiveType,"rar5") == 0)
- {
- type = XARCHIVETYPE_RAR;
- format = "RAR5";
- }
else if (strcmp (ComboArchiveType,"tar") == 0)
{
type = XARCHIVETYPE_TAR;
--- xarchiver-0.5.4.6.orig/src/pref_dialog.c 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/pref_dialog.c 2016-04-12 15:03:58.515195426 -0500
@@ -23,7 +23,7 @@
#include "main.h"
#include "support.h"
-extern gboolean unarj, unrar;
+extern gboolean unarj;
extern gboolean xdg_open;
extern Extract_dialog_data *extract_window;
extern Add_dialog_data *add_window;
@@ -104,8 +102,7 @@
while ( archive_type != NULL )
{
if (!(*(char *) archive_type->data == 0 ||
- (strncmp(archive_type->data, "arj", 3) == 0 && unarj) ||
- (strncmp(archive_type->data, "rar", 3) == 0 && unrar)))
+ (strncmp(archive_type->data, "arj", 3) == 0 && unarj)))
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs_data->combo_prefered_format),archive_type->data );
archive_type = g_list_next (archive_type);
}
--- xarchiver-0.5.4.6.orig/src/window.c 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/window.c 2016-04-12 15:01:10.642771536 -0500
@@ -26,7 +26,7 @@
extern GList *ArchiveType;
extern GList *ArchiveSuffix;
-extern gboolean unarj, unrar;
+extern gboolean unarj;
extern gboolean xdg_open;
extern Prefs_dialog_data *prefs_window;
extern Extract_dialog_data *extract_window;
@@ -323,9 +323,7 @@
/* Does the user open an archive from the command line whose archiver is not installed? */
gchar *ext = NULL;
- if (type == XARCHIVETYPE_RAR)
- ext = "rar";
- else if (type == XARCHIVETYPE_7ZIP)
+ if (type == XARCHIVETYPE_7ZIP)
ext = "7z";
else if (type == XARCHIVETYPE_ARJ)
ext = "arj";
@@ -353,7 +351,7 @@
g_free (path);
return;
}
- /* Detect archive comment,rar one is detected in rar.c */
+ /* Detect archive comment */
if (type == XARCHIVETYPE_ZIP)
archive[current_page]->has_comment = xa_detect_archive_comment (XARCHIVETYPE_ZIP,path,archive[current_page]);
else if (type == XARCHIVETYPE_ARJ)
@@ -778,12 +776,6 @@
archive[idx]->status = XA_ARCHIVESTATUS_SFX;
switch ( archive[idx]->type)
{
- case XARCHIVETYPE_RAR:
- command = g_strconcat ("rar s -o+ ",archive[idx]->escaped_path,NULL);
- list = g_slist_append(list,command);
- xa_run_command (archive[idx],list);
- break;
-
case XARCHIVETYPE_ZIP:
{
gchar *archive_name = NULL;
@@ -968,7 +960,7 @@
"LHA and DEB support:\nŁukasz Zemczak <sil2100@vexillium.org>\n",
"LZMA support:\nThomas Dy <dysprosium66@gmail.com>\n",
"LZOP support:\nKevin Day\n",
- "RARv5, XZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",
+ "XZ, TAR.XZ support:\nFrederick GUERIN <fguerin01@gmail.com>\n",
"GTK+ 3 port:\nBalló György <ballogyor@gmail.com>\n",
NULL
};
@@ -1134,8 +1126,6 @@
xx = XARCHIVETYPE_ZIP;
else if (memcmp (magic,"\x60\xea",2) == 0)
xx = XARCHIVETYPE_ARJ;
- else if (memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x00",7) == 0 || memcmp ( magic,"\x52\x61\x72\x21\x1a\x07\x01",7) == 0)
- xx = XARCHIVETYPE_RAR;
else if (memcmp ( magic,"\x42\x5a\x68",3) == 0)
xx = XARCHIVETYPE_BZIP2;
else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0)
@@ -1496,7 +1486,6 @@
pos = 3;
break;
- case XARCHIVETYPE_RAR:
case XARCHIVETYPE_ARJ:
case XARCHIVETYPE_7ZIP:
pos = 2;
@@ -1561,7 +1550,6 @@
pos = 3;
break;
- case XARCHIVETYPE_RAR:
case XARCHIVETYPE_ARJ:
case XARCHIVETYPE_7ZIP:
pos = 2;
@@ -1599,7 +1587,7 @@
gtk_widget_show(selected_frame);
gtk_widget_set_sensitive(deselect_all,TRUE);
}
- if ((archive->type == XARCHIVETYPE_ARJ && unarj) || (archive->type == XARCHIVETYPE_RAR && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
+ if ((archive->type == XARCHIVETYPE_ARJ && unarj) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP)
{
gtk_widget_set_sensitive (delete_menu,FALSE);
gtk_widget_set_sensitive (rename_menu,FALSE);
@@ -1823,11 +1811,6 @@
xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install arj package!"));
return;
}
- if (archive[idx]->type == XARCHIVETYPE_RAR && unrar)
- {
- xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!"));
- return;
- }
if (archive[idx]->type == XARCHIVETYPE_DEB || archive[idx]->type == XARCHIVETYPE_RPM)
{
gchar *msg;
@@ -2139,10 +2122,6 @@
command = g_strconcat ("arj c ",archive[idx]->escaped_path," -z",tmp,NULL);
break;
- case XARCHIVETYPE_RAR:
- command = g_strconcat ("rar c ",archive[idx]->escaped_path," -z",tmp,NULL);
- break;
-
case XARCHIVETYPE_ZIP:
command = g_strconcat ("sh -c \"zip ",archive[idx]->escaped_path," -z <",tmp,"\"",NULL);
break;
--- xarchiver-0.5.4.6.orig/src/window.h 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/src/window.h 2016-04-12 14:36:54.387327416 -0500
@@ -40,7 +40,6 @@
#include "deb.h"
#include "lha.h"
#include "zip.h"
-#include "rar.h"
#include "tar.h"
#include "7zip.h"
#include "bzip2.h"
--- xarchiver-0.5.4.6.orig/xarchiver.desktop.in 2016-03-09 10:25:48.000000000 -0500
+++ xarchiver-0.5.4.6/xarchiver.desktop.in 2016-04-12 14:35:46.771027058 -0500
@@ -9,4 +9,4 @@
Terminal=false
Categories=GTK;Archiving;Utility;
StartupNotify=true
-MimeType=application/gzip;application/vnd.debian.binary-package;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-java-archive;application/x-lha;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-rar;application/x-rpm;application/x-source-rpm;application/x-tar;application/x-tzo;application/x-xz;application/x-xz-compressed-tar;application/zip;
+MimeType=application/gzip;application/vnd.debian.binary-package;application/x-7z-compressed;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-java-archive;application/x-lha;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-rpm;application/x-source-rpm;application/x-tar;application/x-tzo;application/x-xz;application/x-xz-compressed-tar;application/zip;
|