From b6cfecdd5f0ebb64eff423f33227a96d78c77acf Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 11 Apr 2020 10:24:55 -0500 Subject: mcomix-1.3.0.dev0-2.parabola1: updating version --- libre/mcomix/486f02.patch | 15 --- libre/mcomix/PKGBUILD | 65 +++++----- libre/mcomix/libre.patch | 295 ++++++++++++++++++++++------------------------ 3 files changed, 175 insertions(+), 200 deletions(-) delete mode 100644 libre/mcomix/486f02.patch (limited to 'libre/mcomix') diff --git a/libre/mcomix/486f02.patch b/libre/mcomix/486f02.patch deleted file mode 100644 index 055884047..000000000 --- a/libre/mcomix/486f02.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/mcomix/run.py -+++ b/mcomix/run.py -@@ -203,7 +203,11 @@ - - try: - import PIL.Image -- assert PIL.Image.VERSION >= '1.1.5' -+ try: -+ assert PIL.Image.VERSION >= '1.1.5' -+ except AttributeError: -+ # Field VERSION deprecated in Pillow 5.2.0 and dropped in 6.0.0 -+ assert PIL.__version__ >= '5.2.0' - - except AssertionError: - log.error( _("You don't have the required version of the Python Imaging"), end=' ') diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD index 1cf844b11..1729fe341 100644 --- a/libre/mcomix/PKGBUILD +++ b/libre/mcomix/PKGBUILD @@ -4,52 +4,57 @@ # Maintainer: Omar Vega Ramos pkgname=mcomix -pkgver=1.2.1 -pkgrel=5 +pkgver=1.3.0.dev0 +pkgrel=2 pkgrel+=.parabola1 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books" pkgdesc+=", without nonfree libunrar support" arch=('any') -url="https://sourceforge.net/projects/mcomix/" +url="https://github.com/multiSnow/mcomix3" license=('GPL') -depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \ - 'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools') -makedepends=('gettext' 'intltool') +depends=('gtk3' 'python-cairo' 'python-gobject' 'python-pillow') +makedepends=('git') optdepends=('mupdf-tools: for pdf comics' 'p7zip: for 7zip compressed comics') conflicts=('mcomix-libre') replaces=('mcomix-libre') -source=("https://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2" - "486f02.patch" +_commit=2f82616f34154624c78fb6eca3bc0cc5cdef0cf3 # gtk3 +source=("git+https://github.com/multiSnow/mcomix3.git#commit=$_commit" 'libre.patch') -md5sums=('1d05ed7596bd670e5b3a97896e6d4d47' - 'e033a538925e6119a540bf084f1de878' - '2fc7a69a673fbc4be5d1567489dd9b6e') -sha256sums=('7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b' - 'be0f41404b079931bd899642fa256ac757bb3adc95f36b8cb38dec61781d87fc' - '9037996a36782b970c736a55a315c421956bbd08511e4881d780f7c41d8945a6') +sha256sums=('SKIP' + '24f8302cc6d7b969c44883bb361137f59d13b21c959ed9c88918bc370c70351a') prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 < ${srcdir}/486f02.patch - + cd mcomix3 # Remove nonfree unRAR support - rm -v mcomix/archive/rar{,_external}.py + rm -v mcomix/mcomix/archive/rar{,_external}.py rm -v mime/icons/*/application-x-cbr.png patch -Np1 -i ${srcdir}/libre.patch } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/ - mkdir -p $PYTHONPATH - - python2 setup.py install --prefix=/usr --optimize=1 \ - --single-version-externally-managed --root=${pkgdir} - - install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb - install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz - install -Dm644 mime/comicthumb.thumbnailer ${pkgdir}/usr/share/thumbnailers/comicthumb.thumbnailer + cd mcomix3 + + python installer.py --srcdir=mcomix --target="${pkgdir}"/usr/share + + install -dm755 "$pkgdir"/usr/bin + ln -s /usr/share/mcomix/mcomixstarter.py "$pkgdir"/usr/bin/mcomix + ln -s /usr/share/mcomix/comicthumb.py "$pkgdir"/usr/bin/comicthumb + + install -Dm644 mime/mcomix.desktop "$pkgdir"/usr/share/applications/mcomix.desktop + install -Dm644 mime/mcomix.appdata.xml "$pkgdir"/usr/share/metainfo/mcomix.appdata.xml + install -Dm644 mime/mcomix.xml "$pkgdir"/usr/share/mime/packages/mcomix.xml + install -Dm644 mime/comicthumb.thumbnailer "$pkgdir"/usr/share/thumbnailers/comicthumb.thumbnailer + + for size in 16x16 22x22 24x24 32x32 48x48 + do + install -dm755 "$pkgdir"/usr/share/icons/hicolor/$size/apps/ + install -Dm644 mcomix/mcomix/images/$size/mcomix.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/mcomix.png + install -Dm644 mime/icons/$size/application-x-cb7.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cb7.png + install -Dm644 mime/icons/$size/application-x-cbt.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbt.png + install -Dm644 mime/icons/$size/application-x-cbz.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbz.png + done + + install -Dm644 man/mcomix.1 "$pkgdir"/usr/share/man/man1/mcomix.1 + install -Dm644 man/comicthumb.1 "$pkgdir"/usr/share/man/man1/comicthumb.1 } - diff --git a/libre/mcomix/libre.patch b/libre/mcomix/libre.patch index e9698c634..cedb7700c 100644 --- a/libre/mcomix/libre.patch +++ b/libre/mcomix/libre.patch @@ -1,30 +1,71 @@ -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 @@ +diff --git a/man/comicthumb.1 b/man/comicthumb.1 +index 4af1791..6546014 100644 +--- a/man/comicthumb.1 ++++ b/man/comicthumb.1 +@@ -1,7 +1,7 @@ + .TH comicthumb 1 + + .SH NAME +-\fBcomicthumb\fP - Thumbnailer for cbz, cbr and cbt archives. ++\fBcomicthumb\fP - Thumbnailer for cbz and cbt archives. + + .SH SYNOPSIS + .nf +diff --git a/man/mcomix.1 b/man/mcomix.1 +index 5361e86..37b0698 100644 +--- a/man/mcomix.1 ++++ b/man/mcomix.1 +@@ -12,7 +12,7 @@ + .B MComix + is a user-friendly, customizable image viewer. It is specifically designed to + handle comic books (both Western comics and manga) and supports a variety of +-container formats (including CBR, CBZ, CB7, CBT, LHA and PDF). ++container formats (including CBZ, CB7, CBT, LHA and PDF). + + .SH OPTIONS + .TP +diff --git a/mcomix/comicthumb.py b/mcomix/comicthumb.py +index 3606091..150a1f5 100755 +--- a/mcomix/comicthumb.py ++++ b/mcomix/comicthumb.py +@@ -34,7 +34,7 @@ def main(): + parser=argparse.ArgumentParser( + prog='comicthumb', + description='Thumbnailer for comic book archives', +- epilog='Supported formats: ZIP, RAR and tar (.cbz, .cbr, .cbt)', ++ epilog='Supported formats: ZIP and tar (.cbz, .cbt)', + ) + parser.add_argument('infile',default=None,metavar='INFILE', + help='input archive') +diff --git a/mcomix/mcomix/about_dialog.py b/mcomix/mcomix/about_dialog.py +index ba64a40..0160ed9 100644 +--- a/mcomix/mcomix/about_dialog.py ++++ b/mcomix/mcomix/about_dialog.py +@@ -28,7 +28,7 @@ class _AboutDialog(Gtk.AboutDialog): comment = \ _('%s is an image viewer specifically designed to handle comic books.') % \ - constants.APPNAME + u' ' + \ + constants.APPNAME + ' ' + \ - _('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 ( +diff --git a/mcomix/mcomix/archive_tools.py b/mcomix/mcomix/archive_tools.py +index 6583a7f..00c37f4 100644 +--- a/mcomix/mcomix/archive_tools.py ++++ b/mcomix/mcomix/archive_tools.py +@@ -15,8 +15,6 @@ from mcomix.archive import ( + archivemount, lha_external, pdf_external, - rar, - rar_external, sevenzip_external, + squashfs, tar, - zip, -@@ -45,12 +43,6 @@ - # No LZMA support in Python 2 tarfile module. - sevenzip_external.TarArchive, +@@ -47,12 +45,6 @@ _HANDLERS = { + constants.XZ: ( + tar.TarArchive, ), - constants.RAR: ( - rar.RarArchive, @@ -32,10 +73,10 @@ diff -Nur mcomix-1.2.orig/mcomix/archive_tools.py mcomix-1.2/mcomix/archive_tool - # Last resort: some versions of 7z support RAR. - sevenzip_external.SevenZipArchive, - ), - # Prefer 7z over lha executable for Unicode support. constants.LHA: ( + # Prefer 7z over lha executable for Unicode support. sevenzip_external.SevenZipArchive, -@@ -80,9 +72,6 @@ +@@ -86,9 +78,6 @@ def _is_available(archive_type): def szip_available(): return _is_available(constants.SEVENZIP) @@ -45,133 +86,92 @@ diff -Nur mcomix-1.2.orig/mcomix/archive_tools.py mcomix-1.2/mcomix/archive_tool 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 @@ +@@ -164,9 +153,6 @@ def archive_mime_type(path): else: return constants.TAR -- if magic[0:4] == 'Rar!': +- if magic.startswith(b'Rar!\x1a\x07'): - return constants.RAR - - if magic[0:4] == '7z\xBC\xAF': + if magic[0:6] == b'7z\xbc\xaf\x27\x1c': 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 +diff --git a/mcomix/mcomix/constants.py b/mcomix/mcomix/constants.py +index 470acdc..04fd006 100644 +--- a/mcomix/mcomix/constants.py ++++ b/mcomix/mcomix/constants.py +@@ -49,7 +49,7 @@ ANIMATION_NORMAL = 1 # loop as animation setting + ANIMATION_ONCE = 1<<1 # loop only once + ANIMATION_INF = 1<<2 # loop infinity --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) +-ZIP, RAR, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(11) ++ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(10) 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')) +@@ -84,13 +84,6 @@ ZIP_FORMATS = ( + ('.cbz', 'application/vnd.comicbook+zip'), + ) + -RAR_FORMATS = ( -- ('application/x-rar', 'application/x-cbr'), -- ('rar', 'cbr')) +- # https://www.iana.org/assignments/media-types/application/vnd.rar +- ('.rar', 'application/vnd.rar'), +- # https://www.iana.org/assignments/media-types/application/vnd.comicbook-rar +- ('.cbr', 'application/vnd.comicbook-rar'), +-) +- 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 @@ + # not registed in IANA + ('.tar', 'application/x-tar'), +diff --git a/mcomix/mcomix/messages/mcomix.pot b/mcomix/mcomix/messages/mcomix.pot +index e622347..02528c3 100644 +--- a/mcomix/mcomix/messages/mcomix.pot ++++ b/mcomix/mcomix/messages/mcomix.pot +@@ -24,7 +24,7 @@ msgid "%s is an image viewer specifically designed to handle comic books." msgstr "" - #: mcomix/about_dialog.py:30 + #: mcomix/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 @@ + #: mcomix/mcomix/about_dialog.py:34 +@@ -1523,10 +1523,6 @@ msgstr "" msgid "ZIP archive" msgstr "" --#: mcomix/strings.py:10 +-#: mcomix/mcomix/strings.py:10 -msgid "RAR archive" -msgstr "" - - #: mcomix/strings.py:11 + #: mcomix/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 +diff --git a/mcomix/mcomix/strings.py b/mcomix/mcomix/strings.py +index 0eb2ea7..c534f5f 100644 +--- a/mcomix/mcomix/strings.py ++++ b/mcomix/mcomix/strings.py @@ -3,11 +3,10 @@ This file should only be imported after gettext has been correctly initialized - and installed in the global namespace. """ + 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 @@ + ZIP : _('ZIP archive'), +- RAR : _('RAR archive'), + TAR : _('Tar archive'), + GZIP : _('Gzip compressed tar archive'), + BZIP2 : _('Bzip2 compressed tar archive'), +diff --git a/mime/comicbook.schemas b/mime/comicbook.schemas +index 94a8395..07f14c0 100644 +--- a/mime/comicbook.schemas ++++ b/mime/comicbook.schemas +@@ -1,27 +1,5 @@ - +- - /schemas/desktop/gnome/thumbnailers/application@x-cbr/enable - /desktop/gnome/thumbnailers/application@x-cbr/enable - comicthumb @@ -193,34 +193,46 @@ diff -Nur mcomix-1.2.orig/mime/comicbook.schemas mcomix-1.2/mime/comicbook.schem - - - -- + /schemas/desktop/gnome/thumbnailers/application@x-cbz/enable /desktop/gnome/thumbnailers/application@x-cbz/enable - comicthumb -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 @@ +diff --git a/mime/comicthumb.thumbnailer b/mime/comicthumb.thumbnailer +index b536ddf..a0761c9 100644 +--- a/mime/comicthumb.thumbnailer ++++ b/mime/comicthumb.thumbnailer +@@ -1,4 +1,4 @@ + [Thumbnailer Entry] + TryExec=comicthumb + Exec=comicthumb %u %o %s +-MimeType=application/x-cb7;application/x-cbr;application/x-cbt;application/x-cbz;application/x-ext-cb7;application/x-ext-cbr;application/x-ext-cbt;application/x-ext-cbz; ++MimeType=application/x-cb7;application/x-cbt;application/x-cbz;application/x-ext-cb7;application/x-ext-cbt;application/x-ext-cbz; +diff --git a/mime/mcomix.appdata.xml b/mime/mcomix.appdata.xml +index 514f95d..b07b474 100644 +--- a/mime/mcomix.appdata.xml ++++ b/mime/mcomix.appdata.xml +@@ -10,7 +10,7 @@ +

+ MComix is a user-friendly, customizable image viewer. It is specifically + designed to handle comic books (both Western comics and manga) and supports +- a variety of container formats (including CBR, CBZ, CB7, CBT, LHA and PDF). ++ a variety of container formats (including CBZ, CB7, CBT, LHA and PDF). +

+

+ MComix is a fork of the Comix project, and aims to add bug fixes and +diff --git a/mime/mcomix.desktop b/mime/mcomix.desktop +index eb2ec8f..240ac0e 100644 +--- a/mime/mcomix.desktop ++++ b/mime/mcomix.desktop +@@ -19,4 +19,4 @@ Terminal=false 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 +diff --git a/mime/mcomix.xml b/mime/mcomix.xml +index ec2a28e..c4c61da 100644 +--- a/mime/mcomix.xml ++++ b/mime/mcomix.xml @@ -5,11 +5,6 @@ Comic Book Archive (Zip compressed) @@ -233,30 +245,3 @@ diff -Nur mcomix-1.2.orig/mime/mcomix.xml mcomix-1.2/mime/mcomix.xml -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 -- cgit v1.2.3