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
|
diff -Nur mcomix-1.2.orig/mcomix/about_dialog.py mcomix-1.2/mcomix/about_dialog.py
--- mcomix-1.2.orig/mcomix/about_dialog.py 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/mcomix/about_dialog.py 2016-01-31 21:39:06.342015422 -0300
@@ -27,7 +27,7 @@
comment = \
_('%s is an image viewer specifically designed to handle comic books.') % \
constants.APPNAME + u' ' + \
- _('It reads ZIP, RAR and tar archives, as well as plain image files.')
+ _('It reads ZIP and tar archives, as well as plain image files.')
self.set_comments(comment)
license = \
diff -Nur mcomix-1.2.orig/mcomix/archive_tools.py mcomix-1.2/mcomix/archive_tools.py
--- mcomix-1.2.orig/mcomix/archive_tools.py 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/mcomix/archive_tools.py 2016-01-31 22:09:38.195175163 -0300
@@ -14,8 +14,6 @@
from mcomix.archive import (
lha_external,
pdf_external,
- rar,
- rar_external,
sevenzip_external,
tar,
zip,
@@ -45,12 +43,6 @@
# No LZMA support in Python 2 tarfile module.
sevenzip_external.TarArchive,
),
- constants.RAR: (
- rar.RarArchive,
- rar_external.RarArchive,
- # Last resort: some versions of 7z support RAR.
- sevenzip_external.SevenZipArchive,
- ),
# Prefer 7z over lha executable for Unicode support.
constants.LHA: (
sevenzip_external.SevenZipArchive,
@@ -80,9 +72,6 @@
def szip_available():
return _is_available(constants.SEVENZIP)
-def rar_available():
- return _is_available(constants.RAR)
-
def lha_available():
return _is_available(constants.LHA)
@@ -94,7 +83,6 @@
for name, formats, is_available in (
('ZIP', constants.ZIP_FORMATS , True ),
('Tar', constants.TAR_FORMATS , True ),
- ('RAR', constants.RAR_FORMATS , rar_available() ),
('7z' , constants.SZIP_FORMATS, szip_available()),
('LHA', constants.LHA_FORMATS , lha_available() ),
('PDF', constants.PDF_FORMATS , pdf_available() ),
@@ -149,9 +137,6 @@
else:
return constants.TAR
- if magic[0:4] == 'Rar!':
- return constants.RAR
-
if magic[0:4] == '7z\xBC\xAF':
return constants.SEVENZIP
diff -Nur mcomix-1.2.orig/mcomix/constants.py mcomix-1.2/mcomix/constants.py
--- mcomix-1.2.orig/mcomix/constants.py 2016-01-30 18:04:11.000000000 -0300
+++ mcomix-1.2/mcomix/constants.py 2016-01-31 22:21:59.453285549 -0300
@@ -42,7 +42,7 @@
LAST_INDEX = -1
UNION_INDEX = -2
-ZIP, RAR, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(10)
+ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(9)
NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4)
LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3)
AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \
@@ -70,9 +70,6 @@
ZIP_FORMATS = (
('application/x-zip', 'application/zip', 'application/x-zip-compressed', 'application/x-cbz'),
('zip', 'cbz'))
-RAR_FORMATS = (
- ('application/x-rar', 'application/x-cbr'),
- ('rar', 'cbr'))
TAR_FORMATS = (
('application/x-tar', 'application/x-gzip', 'application/x-bzip2', 'application/x-cbt'),
('tar', 'gz', 'bz2', 'bzip2', 'cbt'))
diff -Nur mcomix-1.2.orig/mcomix/messages/mcomix.pot mcomix-1.2/mcomix/messages/mcomix.pot
--- mcomix-1.2.orig/mcomix/messages/mcomix.pot 2016-01-30 18:04:09.000000000 -0300
+++ mcomix-1.2/mcomix/messages/mcomix.pot 2016-01-31 21:42:59.834350189 -0300
@@ -24,7 +24,7 @@
msgstr ""
#: mcomix/about_dialog.py:30
-msgid "It reads ZIP, RAR and tar archives, as well as plain image files."
+msgid "It reads ZIP and tar archives, as well as plain image files."
msgstr ""
#: mcomix/about_dialog.py:34
@@ -1504,10 +1504,6 @@
msgid "ZIP archive"
msgstr ""
-#: mcomix/strings.py:10
-msgid "RAR archive"
-msgstr ""
-
#: mcomix/strings.py:11
msgid "Tar archive"
msgstr ""
diff -Nur mcomix-1.2.orig/mcomix/strings.py mcomix-1.2/mcomix/strings.py
--- mcomix-1.2.orig/mcomix/strings.py 2016-01-30 18:04:34.000000000 -0300
+++ mcomix-1.2/mcomix/strings.py 2016-01-31 21:57:22.180159427 -0300
@@ -3,11 +3,10 @@
This file should only be imported after gettext has been correctly initialized
and installed in the global namespace. """
-from mcomix.constants import ZIP, RAR, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL
+from mcomix.constants import ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL
ARCHIVE_DESCRIPTIONS = {
ZIP : _('ZIP archive'),
- RAR : _('RAR archive'),
TAR : _('Tar archive'),
GZIP : _('Gzip compressed tar archive'),
BZIP2 : _('Bzip2 compressed tar archive'),
diff -Nur mcomix-1.2.orig/mcomix.egg-info/SOURCES.txt mcomix-1.2/mcomix.egg-info/SOURCES.txt
--- mcomix-1.2.orig/mcomix.egg-info/SOURCES.txt 2016-01-30 18:18:31.000000000 -0300
+++ mcomix-1.2/mcomix.egg-info/SOURCES.txt 2016-01-31 22:13:52.793076397 -0300
@@ -84,8 +84,6 @@
mcomix/archive/archive_recursive.py
mcomix/archive/lha_external.py
mcomix/archive/pdf_external.py
-mcomix/archive/rar.py
-mcomix/archive/rar_external.py
mcomix/archive/sevenzip_external.py
mcomix/archive/tar.py
mcomix/archive/zip.py
@@ -187,26 +185,21 @@
mime/mcomix.desktop
mime/mcomix.xml
mime/icons/16x16/application-x-cb7.png
-mime/icons/16x16/application-x-cbr.png
mime/icons/16x16/application-x-cbt.png
mime/icons/16x16/application-x-cbz.png
mime/icons/22x22/application-x-cb7.png
-mime/icons/22x22/application-x-cbr.png
mime/icons/22x22/application-x-cbt.png
mime/icons/22x22/application-x-cbz.png
mime/icons/24x24/application-x-cb7.png
-mime/icons/24x24/application-x-cbr.png
mime/icons/24x24/application-x-cbt.png
mime/icons/24x24/application-x-cbz.png
mime/icons/32x32/application-x-cb7.png
-mime/icons/32x32/application-x-cbr.png
mime/icons/32x32/application-x-cbt.png
mime/icons/32x32/application-x-cbz.png
mime/icons/48x48/application-x-cb7.png
-mime/icons/48x48/application-x-cbr.png
mime/icons/48x48/application-x-cbt.png
mime/icons/48x48/application-x-cbz.png
test/test_archive_tools.py
test/test_archives.py
test/test_image_tools.py
-test/test_process.py
\ No newline at end of file
+test/test_process.py
diff -Nur mcomix-1.2.orig/mime/comicbook.schemas mcomix-1.2/mime/comicbook.schemas
--- mcomix-1.2.orig/mime/comicbook.schemas 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/mime/comicbook.schemas 2016-01-31 21:39:06.345348599 -0300
@@ -1,28 +1,6 @@
<gconfschemafile>
<schemalist>
<schema>
- <key>/schemas/desktop/gnome/thumbnailers/application@x-cbr/enable</key>
- <applyto>/desktop/gnome/thumbnailers/application@x-cbr/enable</applyto>
- <owner>comicthumb</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/thumbnailers/application@x-cbr/command</key>
- <applyto>/desktop/gnome/thumbnailers/application@x-cbr/command</applyto>
- <owner>comicthumb</owner>
- <type>string</type>
- <default>comicthumb %i %o %s</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
- <schema>
<key>/schemas/desktop/gnome/thumbnailers/application@x-cbz/enable</key>
<applyto>/desktop/gnome/thumbnailers/application@x-cbz/enable</applyto>
<owner>comicthumb</owner>
diff -Nur mcomix-1.2.orig/mime/comicthumb mcomix-1.2/mime/comicthumb
--- mcomix-1.2.orig/mime/comicthumb 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/mime/comicthumb 2016-01-31 21:39:06.345348599 -0300
@@ -7,7 +7,7 @@
comicthumb was originally written by Christoph Wolk, this version was
re-written from scratch for Comix 4 by Pontus Ekberg.
-Supported formats: ZIP, RAR and tar (.cbz, .cbr, .cbt)
+Supported formats: ZIP and tar (.cbz, .cbt)
Usage: comicthumb INFILE OUTFILE [SIZE]
"""
diff -Nur mcomix-1.2.orig/mime/mcomix.desktop mcomix-1.2/mime/mcomix.desktop
--- mcomix-1.2.orig/mime/mcomix.desktop 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/mime/mcomix.desktop 2016-01-31 21:41:54.964074577 -0300
@@ -19,4 +19,4 @@
Type=Application
StartupNotify=true
Categories=Graphics;Viewer;
-MimeType=application/x-cb7;application/x-ext-cb7;application/x-cbr;application/x-ext-cbr;application/x-cbt;application/x-ext-cbt;application/x-cbz;application/x-ext-cbz;application/pdf;application/x-pdf;application/x-ext-pdf;image/bmp;image/x-MS-bmp;image/x-bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;
+MimeType=application/x-cb7;application/x-ext-cb7;application/x-cbt;application/x-ext-cbt;application/x-cbz;application/x-ext-cbz;application/pdf;application/x-pdf;application/x-ext-pdf;image/bmp;image/x-MS-bmp;image/x-bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;
diff -Nur mcomix-1.2.orig/mime/mcomix.xml mcomix-1.2/mime/mcomix.xml
--- mcomix-1.2.orig/mime/mcomix.xml 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/mime/mcomix.xml 2016-01-31 21:40:31.544671061 -0300
@@ -5,11 +5,6 @@
<comment xml:lang="en">Comic Book Archive (Zip compressed)</comment>
<glob pattern="*.cbz"/>
</mime-type>
- <mime-type type="application/x-cbr">
- <sub-class-of type="application/x-rar"/>
- <comment xml:lang="en">Comic Book Archive (RAR compressed)</comment>
- <glob pattern="*.cbr"/>
- </mime-type>
<mime-type type="application/x-cbt">
<sub-class-of type="application/x-compressed-tar"/>
<sub-class-of type="application/x-bzip-compressed-tar"/>
diff -Nur mcomix-1.2.orig/setup.py mcomix-1.2/setup.py
--- mcomix-1.2.orig/setup.py 2016-01-30 18:04:07.000000000 -0300
+++ mcomix-1.2/setup.py 2016-01-31 21:40:31.544671061 -0300
@@ -75,23 +75,18 @@
('share/icons/hicolor/48x48/apps', ['mcomix/images/48x48/mcomix.png']),
('share/icons/hicolor/16x16/mimetypes',
['mime/icons/16x16/application-x-cbz.png',
- 'mime/icons/16x16/application-x-cbr.png',
'mime/icons/16x16/application-x-cbt.png']),
('share/icons/hicolor/22x22/mimetypes',
['mime/icons/22x22/application-x-cbz.png',
- 'mime/icons/22x22/application-x-cbr.png',
'mime/icons/22x22/application-x-cbt.png']),
('share/icons/hicolor/24x24/mimetypes',
['mime/icons/24x24/application-x-cbz.png',
- 'mime/icons/24x24/application-x-cbr.png',
'mime/icons/24x24/application-x-cbt.png']),
('share/icons/hicolor/32x32/mimetypes',
['mime/icons/32x32/application-x-cbz.png',
- 'mime/icons/32x32/application-x-cbr.png',
'mime/icons/32x32/application-x-cbt.png']),
('share/icons/hicolor/48x48/mimetypes',
['mime/icons/48x48/application-x-cbz.png',
- 'mime/icons/48x48/application-x-cbr.png',
'mime/icons/48x48/application-x-cbt.png'])],
# Package metadata
|
