Release 2.0.2

3 files changed, 8 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8534ab2aac97..5d0cb1ad3022 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mcomix
 	pkgdesc = A user-friendly, customizable image viewer specifically designed to handle comic books
-	pkgver = 2.0.1
-	pkgrel = 3
+	pkgver = 2.0.2
+	pkgrel = 1
 	url = https://sourceforge.net/p/mcomix/wiki/Home/
 	arch = any
 	license = GPL
@@ -19,9 +19,7 @@ pkgbase = mcomix
 	optdepends = unzip: for zip compressed comics
 	optdepends = lhasa: for lha compressed comics
 	optdepends = mupdf-tools: for PDF comics
-	source = https://downloads.sourceforge.net/project/mcomix/MComix-2.0.1/mcomix-2.0.1.tar.gz
-	source = b6fe038db.patch
-	md5sums = afa6e2ba9c843e82b346b21d316dbc15
-	md5sums = 6dab75dc1be41f522ce9271e1c3d62a2
+	source = https://downloads.sourceforge.net/project/mcomix/MComix-2.0.2/mcomix-2.0.2.tar.gz
+	md5sums = 43c1b65fc21168ac8c7eaee71ee79c1b
 
 pkgname = mcomix
diff --git a/PKGBUILD b/PKGBUILD
index 29563b224877..2efe7b2b6be5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=mcomix
 # Might want to move to date-based versions.
-pkgver=2.0.1
-pkgrel=3
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
 arch=('any')
 url="https://sourceforge.net/p/mcomix/wiki/Home/"
@@ -17,17 +17,8 @@ optdepends=('libunrar: for rar compressed comics'
             'unzip: for zip compressed comics'
             'lhasa: for lha compressed comics'
             'mupdf-tools: for PDF comics')
-source=("https://downloads.sourceforge.net/project/${pkgname}/MComix-${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "b6fe038db.patch"
-)
-md5sums=('afa6e2ba9c843e82b346b21d316dbc15'
-         '6dab75dc1be41f522ce9271e1c3d62a2'
-)
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  patch -p1 < ../b6fe038db.patch
-}
+source=("https://downloads.sourceforge.net/project/${pkgname}/MComix-${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('43c1b65fc21168ac8c7eaee71ee79c1b')
 
 build(){
   cd "${pkgname}-${pkgver}"
diff --git a/b6fe038db.patch b/b6fe038db.patch
deleted file mode 100644
index 736e2af124d7..000000000000
--- a/b6fe038db.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit b6fe038db5e9ee10b22b08f7c3203f66f378ce96
-Author: Oddegamra <oddegamra@users.sourceforge.net>
-Date:   Sat Apr 2 15:17:28 2022 +0200
-
-    fix: Missing resource files after "setup.py install"
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 90d97d2..935a30d 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -1,5 +1,5 @@
- recursive-include mcomix/images *.png
--recursive-include mcomix/messages *.po *.mo *.pot
-+recursive-include mcomix/messages *.mo
- recursive-include mime *.*
- include mime/comicthumb mime/comicthumb.thumbnailer
- include mcomix.1.gz ChangeLog COPYING mcomixstarter.py
-diff --git a/setup.py b/setup.py
-index 2967ef7..4144ce5 100755
---- a/setup.py
-+++ b/setup.py
-@@ -11,44 +11,16 @@ Example usage:
-     $ ./setup.py install --single-version-externally-managed --root /tmp/mcomix --prefix /usr
- """
- 
--import os
--import glob
- import setuptools
- 
- from mcomix import constants
- 
- 
--def get_data_patterns(directory, *patterns):
--    """ Build a list of patterns for all subdirectories of <directory>
--    to be passed into package_data. """
--
--    olddir = os.getcwd()
--    os.chdir(os.path.join(constants.BASE_PATH, directory))
--    allfiles = []
--    for dirpath, _, _ in os.walk("."):
--        for pattern in patterns:
--            current_pattern = os.path.normpath(os.path.join(dirpath, pattern))
--            if glob.glob(current_pattern):
--                # Forward slashes only for distutils.
--                allfiles.append(current_pattern.replace('\\', '/'))
--    os.chdir(olddir)
--    return allfiles
--
--# Filter unnecessary image files. Replace wildcard pattern with actual files.
--images = get_data_patterns('mcomix/images', '*.png')
--images.remove('*.png')
--images.extend([ os.path.basename(img)
--    for img in glob.glob(os.path.join(constants.BASE_PATH, 'mcomix/images', '*.png'))
--    if os.path.basename(img) not in
--        ('mcomix-large.png', )])
--
- setuptools.setup(
-     name = constants.APPNAME.lower(),
-     version = constants.VERSION,
-     packages = ['mcomix', 'mcomix.archive', 'mcomix.library'],
--    package_data = {
--        'mcomix' : get_data_patterns('mcomix/messages', '*.mo') + images,
--    },
-+    include_package_data=True,
-     entry_points = {
-         'console_scripts' : [ 'mcomix = mcomix.run:run' ],
-         'setuptools.installation': [ 'eggsecutable=mcomix.run:run' ],