diff options
| -rw-r--r-- | libre/mcomix/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/mcomix/libre.patch | 343 | ||||
| -rw-r--r-- | libre/mcomix/mcomix.install | 8 |
3 files changed, 116 insertions, 245 deletions
diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD index 27ce9f419..f77b1877d 100644 --- a/libre/mcomix/PKGBUILD +++ b/libre/mcomix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106934 2014-03-10 18:30:38Z schuay $ +# $Id: PKGBUILD 159677 2016-01-31 09:13:54Z schuay $ # Maintainer (Arch): schuay <jakob.gruber@gmail.com> # Contributor (Arch): Ray Powell <ray_al@xphoniexx.net> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=mcomix -pkgver=1.01 +pkgver=1.2 pkgrel=1.parabola1 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar support" arch=('any') @@ -23,7 +23,7 @@ prepare() { cd ${srcdir}/${pkgname}-${pkgver} # Remove nonfree unRAR support - rm -v mcomix/archive/rar{,file}.py + rm -v mcomix/archive/rar{,_external}.py rm -v mime/icons/*/application-x-cbr.png patch -Np1 -i ${srcdir}/libre.patch } @@ -55,5 +55,5 @@ package() { install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas } -md5sums=('c2837c3baf226798246db834d22d1de8' - '6ba9f4c88c18440a48bb84a03940d4a7') +md5sums=('c879c6eb5888a80781b87c10c5de826c' + '2fc7a69a673fbc4be5d1567489dd9b6e') diff --git a/libre/mcomix/libre.patch b/libre/mcomix/libre.patch index 916f46e6c..e9698c634 100644 --- a/libre/mcomix/libre.patch +++ b/libre/mcomix/libre.patch @@ -1,6 +1,6 @@ -diff -Nur a/mcomix/about_dialog.py b/mcomix/about_dialog.py ---- a/mcomix/about_dialog.py 2014-07-20 14:41:41.000000000 -0300 -+++ b/mcomix/about_dialog.py 2015-02-03 20:06:18.707598152 -0200 +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.') % \ @@ -10,110 +10,84 @@ diff -Nur a/mcomix/about_dialog.py b/mcomix/about_dialog.py self.set_comments(comment) license = \ -diff -Nur a/mcomix/archive_tools.py b/mcomix/archive_tools.py ---- a/mcomix/archive_tools.py 2014-07-28 11:32:51.000000000 -0300 -+++ b/mcomix/archive_tools.py 2015-02-03 20:10:46.137856205 -0200 -@@ -11,7 +11,6 @@ - from mcomix import log - from mcomix.archive import zip - from mcomix.archive import zip_external --from mcomix.archive import rar - from mcomix.archive import tar - from mcomix.archive import sevenzip - from mcomix.archive import lha -@@ -20,9 +19,6 @@ +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 sevenzip.SevenZipArchive.is_available() + return _is_available(constants.SEVENZIP) -def rar_available(): -- return rar.RarArchive.is_available() or szip_available() +- return _is_available(constants.RAR) - def lha_available(): - return lha.LhaArchive.is_available() or szip_available() + return _is_available(constants.LHA) -@@ -35,9 +31,6 @@ - if szip_available(): - formats.extend(constants.SZIP_FORMATS[1]) - -- if rar_available(): -- formats.extend(constants.RAR_FORMATS[1]) -- - if lha_available(): - formats.extend(constants.LHA_FORMATS[1]) - -@@ -81,10 +74,7 @@ +@@ -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 - -- elif magic[0:4] == '7z\xBC\xAF': -+ if magic[0:4] == '7z\xBC\xAF': + if magic[0:4] == '7z\xBC\xAF': return constants.SEVENZIP - # Headers for TAR-XZ and TAR-LZMA that aren't supported by tarfile -@@ -143,11 +133,6 @@ - return sevenzip.SevenZipArchive(path) - elif type in (constants.TAR, constants.GZIP, constants.BZIP2): - return tar.TarArchive(path) -- elif type == constants.RAR and rar.RarArchive.is_available(): -- return rar.RarArchive(path) -- elif type == constants.RAR and sevenzip.SevenZipArchive.is_available(): -- log.info('Using Sevenzip for RAR archives.') -- return sevenzip.SevenZipArchive(path) - elif type == constants.SEVENZIP and sevenzip.SevenZipArchive.is_available(): - return sevenzip.SevenZipArchive(path) - elif type == constants.LHA and lha.LhaArchive.is_available(): -diff -Nur a/mcomix/constants.py b/mcomix/constants.py ---- a/mcomix/constants.py 2015-01-31 06:06:26.000000000 -0200 -+++ b/mcomix/constants.py 2015-02-03 20:11:54.983850230 -0200 -@@ -41,7 +41,7 @@ +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, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(9) -+ZIP, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA, ZIP_EXTERNAL = range(8) +-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')) + ('zip', 'cbz')) -RAR_FORMATS = ( - ('application/x-rar', 'application/x-cbr'), -- ('*.rar', '*.cbr')) +- ('rar', 'cbr')) TAR_FORMATS = ( ('application/x-tar', 'application/x-gzip', 'application/x-bzip2', 'application/x-cbt'), - ('*.tar', '*.gz', '*.bz2', '*.bzip2', '*.cbt')) -diff -Nur a/mcomix/file_chooser_base_dialog.py b/mcomix/file_chooser_base_dialog.py ---- a/mcomix/file_chooser_base_dialog.py 2014-01-18 06:01:42.000000000 -0200 -+++ b/mcomix/file_chooser_base_dialog.py 2015-02-03 20:13:45.971467307 -0200 -@@ -88,9 +88,6 @@ - # extractor availability. - mimetypes = constants.ZIP_FORMATS[0] + constants.TAR_FORMATS[0] - patterns = constants.ZIP_FORMATS[1] + constants.TAR_FORMATS[1] -- if archive_tools.rar_available(): -- mimetypes += constants.RAR_FORMATS[0] -- patterns += constants.RAR_FORMATS[1] - if archive_tools.szip_available(): - mimetypes += constants.SZIP_FORMATS[0] - patterns += constants.SZIP_FORMATS[1] -@@ -107,10 +104,6 @@ - self.add_filter(_('Tar archives'), - *constants.TAR_FORMATS) - -- if archive_tools.rar_available(): -- self.add_filter(_('RAR archives'), -- *constants.RAR_FORMATS) -- - if archive_tools.szip_available(): - self.add_filter(_('7z archives'), - *constants.SZIP_FORMATS) -diff -Nur a/mcomix/messages/mcomix.pot b/mcomix/messages/mcomix.pot ---- a/mcomix/messages/mcomix.pot 2015-01-31 05:55:44.000000000 -0200 -+++ b/mcomix/messages/mcomix.pot 2015-02-03 20:32:26.271598749 -0200 + ('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 "" @@ -123,111 +97,77 @@ diff -Nur a/mcomix/messages/mcomix.pot b/mcomix/messages/mcomix.pot msgstr "" #: mcomix/about_dialog.py:34 -@@ -242,10 +242,6 @@ - msgid "Tar archives" - msgstr "" - --#: mcomix/file_chooser_base_dialog.py:111 --msgid "RAR archives" --msgstr "" -- - #: mcomix/file_chooser_base_dialog.py:115 - msgid "7z archives" - msgstr "" -@@ -1568,10 +1564,6 @@ - msgid "Bzip2 compressed tar archive" +@@ -1504,10 +1504,6 @@ + msgid "ZIP archive" msgstr "" --#: mcomix/strings.py:13 +-#: mcomix/strings.py:10 -msgid "RAR archive" -msgstr "" - - #: mcomix/strings.py:14 - msgid "7z archive" + #: mcomix/strings.py:11 + msgid "Tar archive" msgstr "" -diff -Nur a/mcomix/process.py b/mcomix/process.py ---- a/mcomix/process.py 2014-07-25 13:37:00.000000000 -0300 -+++ b/mcomix/process.py 2015-02-03 20:16:10.747046736 -0200 -@@ -20,10 +20,7 @@ - class Process: - - """The subprocess and popen2 modules in Python are broken (see issue -- #1336). The problem (i.e. complete crash) they can cause happen fairly -- often (once is too often) in MComix when calling "rar" or "unrar" to -- extract specific files from archives. We roll our own very simple -- process spawning module here instead. -+ #1336). We roll our own very simple process spawning module here instead. - """ - # TODO: I can no longer reproduce the issue. Check if this version of - # process.py still solves it. -diff -Nur a/mcomix/recent.py b/mcomix/recent.py ---- a/mcomix/recent.py 2014-06-09 03:08:26.000000000 -0300 -+++ b/mcomix/recent.py 2015-02-03 20:17:14.779514387 -0200 -@@ -31,8 +31,7 @@ - rfilter.add_pixbuf_formats() - - mimetypes, patterns = itertools.izip(constants.ZIP_FORMATS, -- constants.RAR_FORMATS, constants.TAR_FORMATS, -- constants.SZIP_FORMATS) -+ constants.TAR_FORMATS, constants.SZIP_FORMATS) - - for mimetype in itertools.chain.from_iterable(mimetypes): - rfilter.add_mime_type(mimetype) -diff -Nur a/mcomix/strings.py b/mcomix/strings.py ---- a/mcomix/strings.py 2014-01-18 06:01:42.000000000 -0200 -+++ b/mcomix/strings.py 2015-02-03 20:18:10.421674128 -0200 -@@ -3,14 +3,13 @@ +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, TAR, GZIP, BZIP2, RAR, SEVENZIP, LHA -+from mcomix.constants import ZIP, TAR, GZIP, BZIP2, SEVENZIP, LHA +-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'), - TAR: _('Tar archive'), - GZIP: _('Gzip compressed tar archive'), - BZIP2: _('Bzip2 compressed tar archive'), -- RAR: _('RAR archive'), - SEVENZIP: _('7z archive'), - LHA: _('LHA archive') - } -diff -Nur a/mcomix.egg-info/SOURCES.txt b/mcomix.egg-info/SOURCES.txt ---- a/mcomix.egg-info/SOURCES.txt 2015-01-31 06:08:19.000000000 -0200 -+++ b/mcomix.egg-info/SOURCES.txt 2015-02-03 20:19:25.537920559 -0200 + 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.py - mcomix/archive/pdf.py + mcomix/archive/lha_external.py + mcomix/archive/pdf_external.py -mcomix/archive/rar.py --mcomix/archive/rarfile.py - mcomix/archive/sevenzip.py +-mcomix/archive/rar_external.py + mcomix/archive/sevenzip_external.py mcomix/archive/tar.py mcomix/archive/zip.py -@@ -184,18 +182,13 @@ +@@ -187,26 +185,21 @@ mime/mcomix.desktop - mime/mcomix.thumbnailer 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 + 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 -+mime/icons/48x48/application-x-cbz.png -diff -Nur a/mime/comicbook.schemas b/mime/comicbook.schemas ---- a/mime/comicbook.schemas 2013-01-08 14:26:46.000000000 -0200 -+++ b/mime/comicbook.schemas 2015-02-03 20:20:10.809688373 -0200 ++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> @@ -257,9 +197,9 @@ diff -Nur a/mime/comicbook.schemas b/mime/comicbook.schemas <key>/schemas/desktop/gnome/thumbnailers/application@x-cbz/enable</key> <applyto>/desktop/gnome/thumbnailers/application@x-cbz/enable</applyto> <owner>comicthumb</owner> -diff -Nur a/mime/comicthumb b/mime/comicthumb ---- a/mime/comicthumb 2013-01-13 14:35:00.000000000 -0200 -+++ b/mime/comicthumb 2015-02-03 20:22:30.481808283 -0200 +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. @@ -269,87 +209,18 @@ diff -Nur a/mime/comicthumb b/mime/comicthumb Usage: comicthumb INFILE OUTFILE [SIZE] """ -@@ -28,16 +28,13 @@ - print __doc__ - sys.exit(1) - --ZIP, RAR, TAR, GZIP, BZIP2 = range(5) -+ZIP, TAR, GZIP, BZIP2 = range(5) - - - class Process: - - """The subprocess and popen2 modules in Python are broken (see issue -- #1336). The problem (i.e. complete crash) they can cause happen fairly -- often (once is too often) in Comix when calling "rar" or "unrar" to -- extract specific files from archives. We roll our own very simple -- process spawning module here instead. -+ #1336). We roll our own very simple process spawning module here instead. - """ - # TODO: I can no longer reproduce the issue. Check if this version of - # process.py still solves it. -@@ -94,19 +91,6 @@ - elif self._type in [TAR, GZIP, BZIP2]: - self._tfile = tarfile.open(src, 'r') - self._files = self._tfile.getnames() -- elif self._type == RAR: -- self._rar = None -- for command in ('unrar', 'rar'): -- if Process([command]).spawn() is not None: -- self._rar = command -- if self._rar == None: -- print '! Could not find the "rar" or "unrar" executable.' -- sys.exit(1) -- proc = Process([self._rar, 'vb', src]) -- fobj = proc.spawn() -- self._files = fobj.readlines() -- proc.wait() -- self._files = [name.rstrip('\n') for name in self._files] - - def get_files(self): - """Return a list of the files in the archive.""" -@@ -121,11 +105,6 @@ - return cStringIO.StringIO(self._zfile.read(chosen)) - elif self._type in [TAR, GZIP, BZIP2]: - return cStringIO.StringIO(self._tfile.extractfile(chosen).read()) -- elif self._type == RAR: -- proc = Process([self._rar, 'p', '-inul', '-p-', '--', -- self._src, chosen]) -- fobj = proc.spawn() -- return cStringIO.StringIO(fobj.read()) - - - def archive_mime_type(path): -@@ -145,8 +124,6 @@ - if magic.startswith('\037\213'): - return GZIP - return TAR -- if magic == 'Rar!': -- return RAR - except Exception: - print '! Error while reading', path - return None -diff -Nur a/mime/mcomix.desktop b/mime/mcomix.desktop ---- a/mime/mcomix.desktop 2013-01-08 14:26:46.000000000 -0200 -+++ b/mime/mcomix.desktop 2015-02-03 20:24:12.805803236 -0200 +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-cbz;application/x-cbr;application/x-cbt;image/jpeg;image/png;image/gif;image/tiff;image/bmp;image/x-icon;image/x-xpixmap;image/x-xbitmap;application/x-zip;application/zip;application/x-rar;application/x-tar;application/x-gzip;application/x-bzip2;image/svg+xml;image/svg;image/svg-xml;image/vnd.adobe.svg+xml;text/xml-svg;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-pcx;image/x-cmu-raster;image/x-sun-raster;image/x-tga;application/x-7z-compressed;application/x-cb7;application/x-lzh;application/x-lha;application/x-lzh-compressed; -+MimeType=application/x-cbz;application/x-cbt;image/jpeg;image/png;image/gif;image/tiff;image/bmp;image/x-icon;image/x-xpixmap;image/x-xbitmap;application/x-zip;application/zip;application/x-tar;application/x-gzip;application/x-bzip2;image/svg+xml;image/svg;image/svg-xml;image/vnd.adobe.svg+xml;text/xml-svg;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-pcx;image/x-cmu-raster;image/x-sun-raster;image/x-tga;application/x-7z-compressed;application/x-cb7;application/x-lzh;application/x-lha;application/x-lzh-compressed; -diff -Nur a/mime/mcomix.thumbnailer b/mime/mcomix.thumbnailer ---- a/mime/mcomix.thumbnailer 2014-01-18 06:01:42.000000000 -0200 -+++ b/mime/mcomix.thumbnailer 2015-02-03 20:27:12.596127651 -0200 -@@ -1,4 +1,4 @@ - [Thumbnailer Entry] - TryExec=comicthumb - Exec=comicthumb %u %o %s --MimeType=application/x-cbr;application/x-cbz;application/x-cbt; -+MimeType=application/x-cbz;application/x-cbt; -diff -Nur a/mime/mcomix.xml b/mime/mcomix.xml ---- a/mime/mcomix.xml 2013-01-08 14:26:46.000000000 -0200 -+++ b/mime/mcomix.xml 2015-02-03 20:27:36.940405337 -0200 +-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"/> @@ -362,10 +233,10 @@ diff -Nur a/mime/mcomix.xml b/mime/mcomix.xml <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 a/setup.py b/setup.py ---- a/setup.py 2014-06-09 03:08:26.000000000 -0300 -+++ b/setup.py 2015-02-03 20:28:30.005795579 -0200 -@@ -79,23 +79,18 @@ +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', diff --git a/libre/mcomix/mcomix.install b/libre/mcomix/mcomix.install index 982ff97fa..82047a202 100644 --- a/libre/mcomix/mcomix.install +++ b/libre/mcomix/mcomix.install @@ -1,8 +1,8 @@ pkgname=mcomix post_install() { - if [ -f usr/bin/gconfpkg ]; then - usr/bin/gconfpkg --install ${pkgname} &> /dev/null + if [ -f usr/sbin/gconfpkg ]; then + usr/sbin/gconfpkg --install ${pkgname} &> /dev/null fi xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q @@ -19,8 +19,8 @@ post_upgrade() { } pre_remove() { - if [ -f usr/bin/gconfpkg ]; then - usr/bin/gconfpkg --uninstall ${pkgname} &> /dev/null + if [ -f usr/sbin/gconfpkg ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null fi } |