[upd] bump to 2.0.0

5 files changed, 87 insertions, 174 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0704d0301a22..0fbce75ad59c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Apr 21 00:55:28 UTC 2019
 pkgbase = mcomix-git
 	pkgdesc = A user-friendly, customizable image viewer specifically designed to handle comic books
-	pkgver = r1495.486f02e
+	pkgver = r1577.3cc19b4
 	pkgrel = 1
 	url = https://sourceforge.net/projects/mcomix/
 	install = mcomix-git.install
@@ -10,24 +8,24 @@ pkgbase = mcomix-git
 	license = GPL
 	makedepends = gettext
 	makedepends = intltool
+	depends = gtk3
 	depends = pygtk
-	depends = python2-pillow
+	depends = python-pillow>=6.0.0
 	depends = xdg-utils
-	depends = python2
+	depends = python>=3.7
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
-	depends = python2-setuptools
+	depends = python-gobject
+	depends = python-cairo
 	optdepends = libunrar: for rar compressed comics
 	optdepends = p7zip: for 7z compressed comics
 	optdepends = unrar: for rar compressed comics
 	optdepends = unzip: for zip compressed comics
+	optdepends = lhasa: for lha compressed comics
 	optdepends = mupdf: for PDF comics
 	provides = mcomix
 	conflicts = mcomix
 	source = mcomix-git::git+http://git.code.sf.net/p/mcomix/git
-	source = save_as_tweaks_1.3.patch
 	sha256sums = SKIP
-	sha256sums = 10fcc2045e49dac348de37d9ea8d0491b6d74300267396054a913ffac8fefdab
 
 pkgname = mcomix-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f86ad44fb2f2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore built packages
+*.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index e428d9041426..6b09e0e07a3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,70 @@
-# Maintainer: dysphoria <>
+# Maintainer: TH Campbell (dysphoria) <thcampbell (at) protonmail (dot) com>
+# Contributor: Justin Wong <jusw85 at hotmail dot com>
+# Contributor: Matt Parnell/ilikenwf <parwok@gmail.com>
 # Contributor: Mitsu <archlinux AT suumitsu DOT eu>
 # Contributor: schuay <jakob.gruber@gmail.com>
 # Contributor: Ray Powell <ray_al@xphoniexx.net>
 
 pkgname=mcomix-git
-pkgver=r1495.486f02e
+pkgver=r1577.3cc19b4
 pkgrel=1
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
+pkgdesc='A user-friendly, customizable image viewer specifically designed to handle comic books'
 arch=('any')
-url="https://sourceforge.net/projects/mcomix/"
+url='https://sourceforge.net/projects/mcomix/'
 license=('GPL')
-depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
-         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
+depends=('gtk3' 'pygtk' 'python-pillow>=6.0.0' 'xdg-utils' 'python>=3.7'
+         'desktop-file-utils' 'hicolor-icon-theme'
+         'python-gobject' 'python-cairo')
 makedepends=('gettext' 'intltool')
-optdepends=('libunrar: for rar compressed comics' \
-            'p7zip: for 7z compressed comics' \
-            'unrar: for rar compressed comics' \
-            'unzip: for zip compressed comics' \
-            'mupdf: for PDF comics')
-provides=("mcomix")
-conflicts=("mcomix")
-source=("${pkgname}::git+http://git.code.sf.net/p/mcomix/git"
-        'save_as_tweaks_1.3.patch')
-sha256sums=('SKIP'
-            '10fcc2045e49dac348de37d9ea8d0491b6d74300267396054a913ffac8fefdab')
-install=${pkgname}.install
+optdepends=(
+            'libunrar: for rar compressed comics'
+            'p7zip: for 7z compressed comics'
+            'unrar: for rar compressed comics'
+            'unzip: for zip compressed comics'
+            'lhasa: for lha compressed comics'
+            'mupdf: for PDF comics'
+           )
+provides=('mcomix')
+conflicts=('mcomix')
+source=(
+        "${pkgname}::git+http://git.code.sf.net/p/mcomix/git"
+       )
+sha256sums=('SKIP')
+install=mcomix-git.install
 
 pkgver() {
-    cd "${pkgname}"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-    cd "${pkgname}"
-    patch -Np1 -i "${srcdir}/save_as_tweaks_1.3.patch"
+        cd "${pkgname}"
+        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    mkdir -p ${pkgdir}/usr
-    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
-    install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
-}
+        cd "${srcdir}/${pkgname}"
+        mkdir -p "${pkgdir}/usr/bin"
+
+        _PYVERSION=$(python3 --version | sed -e 's/Python /python/')
+        _ICONDIR="${pkgdir}/usr/lib/${_PYVERSION%.*}/site-packages/mcomix/images"
+
+        install -dm755 "$_ICONDIR"
 
+        python3 setup.py install --prefix=/usr --optimize=1 \
+                --single-version-externally-managed --root="${pkgdir}/"
+
+        install -Dm755 mcomix/images/*.png "${_ICONDIR}"
+
+        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"
+        install -Dm644 mime/comicbook.schemas "${pkgdir}/usr/share/gconf/schemas/mcomix.schemas"
+        install -Dm644 mime/mcomix.desktop "${pkgdir}/usr/share/applications/mcomix.desktop"
+        install -Dm644 mime/mcomix.appdata.xml "${pkgdir}/usr/share/metainfo/mcomix.appdata.xml"
+
+        for size in 16x16 22x22 24x24 32x32 48x48
+        do
+                install -dm755 "${pkgdir}/usr/share/icons/hicolor/${size}/apps/"
+                install -Dm644 "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-cbr.png" "${pkgdir}/usr/share/icons/hicolor/${size}/mimetypes/application-x-cbr.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
+}
diff --git a/mcomix-git.install b/mcomix-git.install
index 4ad5abf511f7..78c6ba086231 100644
--- a/mcomix-git.install
+++ b/mcomix-git.install
@@ -1,35 +1,37 @@
-pkgname=mcomix
-
 post_install() {
-    if [ -f usr/bin/xdg-icon-resource ]; then
-        xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    fi
-    if [ -f usr/sbin/gconfpkg ]; then
-        usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
-    fi
-    update-desktop-database -q
-    update-mime-database /usr/share/mime
+        if [ -f usr/bin/xdg-icon-resource ]; then
+                xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+        fi
+
+        if [ -f usr/sbin/gconfpkg ]; then
+                usr/sbin/gconfpkg --install mcomix &> /dev/null
+        fi
+
+        update-desktop-database -q
+        update-mime-database /usr/share/mime
 }
 
 pre_upgrade() {
-    pre_remove $1
+        pre_remove $1
 }
 
 post_upgrade() {
-    echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf'
-    post_install $1
+        echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf'
+        post_install $1
 }
 
 pre_remove() {
-    if [ -f usr/sbin/gconfpkg ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
-    fi
+        if [ -f usr/sbin/gconfpkg ]; then
+                usr/sbin/gconfpkg --uninstall mcomix &> /dev/null
+        fi
 }
 
 post_remove() {
-    if [ -f usr/bin/xdg-icon-resource ]; then
-        xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    fi
-    update-desktop-database -q
-    update-mime-database /usr/share/mime &> /dev/null
+        if [ -f usr/bin/xdg-icon-resource ]; then
+                xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+        fi
+
+        update-desktop-database -q
+        update-mime-database /usr/share/mime &> /dev/null
 }
+
diff --git a/save_as_tweaks_1.3.patch b/save_as_tweaks_1.3.patch
deleted file mode 100644
index 0917ed759c21..000000000000
--- a/save_as_tweaks_1.3.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/mcomix/main.py b/mcomix/main.py
-index 80f74dc..d341238 100644
---- a/mcomix/main.py
-+++ b/mcomix/main.py
-@@ -278,6 +278,8 @@ class MainWindow(gtk.Window):
-         if show_library:
-             self.actiongroup.get_action('library').activate()
- 
-+        self.last_used_directory=None
-+
-         self.cursor_handler.auto_hide_on()
-         # Make sure we receive *all* mouse motion events,
-         # even if a modal dialog is being shown.
-@@ -984,6 +986,7 @@ class MainWindow(gtk.Window):
-     def extract_page(self, *args):
-         """ Derive some sensible filename (archive name + _ + filename should do) and offer
-         the user the choice to save the current page with the selected name. """
-+
-         if self.filehandler.archive_type is not None:
-             archive_name = self.filehandler.get_pretty_current_filename()
-             file_name = self.imagehandler.get_path_to_page()
-@@ -995,15 +998,50 @@ class MainWindow(gtk.Window):
-         save_dialog = gtk.FileChooserDialog(_('Save page as'), self,
-             gtk.FILE_CHOOSER_ACTION_SAVE, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT,
-             gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
--        save_dialog.set_do_overwrite_confirmation(True)
-         save_dialog.set_current_name(suggested_name.encode('utf-8'))
-+        save_dialog.set_do_overwrite_confirmation(True)
- 
--        if save_dialog.run() == gtk.RESPONSE_ACCEPT and save_dialog.get_filename():
--            shutil.copy(self.imagehandler.get_path_to_page(),
--                save_dialog.get_filename().decode('utf-8'))
-+        if self.last_used_directory is not None and prefs['store recently saved in directory']:
-+            # Automatically select previously used directory:
-+            save_dialog.set_current_folder(self.last_used_directory)
-+        else:
-+            self.last_used_directory = os.getcwd()
-+
-+        if prefs['append number to suggested name']:
-+            last_used_directory_plus_suggested_name = os.path.join(self.last_used_directory, suggested_name)
-+            try_number = 1
-+            # If the suggested filename already exists we try to suggest a new one:
-+            if os.path.exists(last_used_directory_plus_suggested_name):
-+                temp_suggested_name = suggested_name
-+                lastpath_plus_new_suggested_name = last_used_directory_plus_suggested_name
-+
-+                while os.path.exists(lastpath_plus_new_suggested_name):
-+                    temp_suggested_name_loop = self.generate_numbered_filename(temp_suggested_name.encode('utf-8'), try_number)
-+                    lastpath_plus_new_suggested_name = self.last_used_directory + os.sep + temp_suggested_name_loop
-+                    try_number += 1
-+                    if not os.path.exists(lastpath_plus_new_suggested_name):
-+                        # Keep this unused appended number
-+                        break
-+                save_dialog.set_current_name(temp_suggested_name_loop)
- 
-+        if save_dialog.run() == gtk.RESPONSE_ACCEPT and save_dialog.get_filename():
-+            try:
-+                shutil.copy(self.imagehandler.get_path_to_page(),
-+                    save_dialog.get_filename().decode('utf-8'))
-+            except Exception, ex:
-+                log.warning('An error occured: %s', ex)
-+
-+        if prefs['store recently saved in directory']:
-+            self.last_used_directory = save_dialog.get_current_folder()
-         save_dialog.destroy()
- 
-+    def generate_numbered_filename(self, filename, number):
-+        """ Generate the same filename with an appended (number) before the .extension"""
-+        file_no_ext = os.path.splitext(filename)[0]
-+        ext = os.path.splitext(filename)[1]
-+        new_name_with_number = file_no_ext + (" (%s)" %(number)) + ext
-+        return new_name_with_number
-+
-     def delete(self, *args):
-         """ The currently opened file/archive will be deleted after showing
-         a confirmation dialog. """
-diff --git a/mcomix/preferences.py b/mcomix/preferences.py
-index 3803c18..9beaac8 100644
---- a/mcomix/preferences.py
-+++ b/mcomix/preferences.py
-@@ -51,6 +51,8 @@ prefs = {
-     'smart scroll percentage': 0.5,
-     'flip with wheel': True,
-     'store recent file info': True,
-+    'store recently saved in directory': False,
-+    'append number to suggested name': False,
-     'hide all': False,
-     'hide all in fullscreen': True,
-     'stored hide all values': [True, True, True, True, True],
-diff --git a/mcomix/preferences_dialog.py b/mcomix/preferences_dialog.py
-index 6fdbef7..4d4230e 100644
---- a/mcomix/preferences_dialog.py
-+++ b/mcomix/preferences_dialog.py
-@@ -305,6 +305,13 @@ class _PreferencesDialog(gtk.Dialog):
-         page.add_row(gtk.Label(_('Animation mode:')),
-             self._create_animation_mode_combobox())
- 
-+        page.new_section(_('Save as Dialog'))
-+        page.add_row(self._create_pref_check_button(_('Automatically select the last used directory'),
-+            'store recently saved in directory', 'Directs the Save As dialog to the last used directory automatically.'))
-+        # FIXME: disable the following checkbutton if the previous one is disabled
-+        page.add_row(self._create_pref_check_button(_('Append numbers to suggested filename if it already exists'),
-+            'append number to suggested name', 'Appends a number at the end of the suggested filename in case a similar filename already exists in the current directory.'))
-+
-         return page
- 
-     def _init_shortcuts_tab(self):