Attachment 213608 Details for Bug 245738 – diff against py-mcomix r527560

[patch] diff against py-mcomix r527560

py-mcomix.diff (text/plain), 7.77 KB, created by Stefan Ehmann on 2020-04-20 17:26:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Ehmann

Created: 2020-04-20 17:26:13 UTC

Size: 7.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 527560)
>+++ Makefile	(working copy)
>@@ -2,30 +2,35 @@
> # $FreeBSD$
> 
> PORTNAME=	mcomix
>-PORTVERSION=	1.2.1
>-PORTREVISION=	3
>+PORTVERSION=	1.2.1g20200418
> CATEGORIES=	graphics
>-MASTER_SITES=	SF/${PORTNAME}/MComix-${PORTVERSION}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	ashish@FreeBSD.org
>-COMMENT=	GTK2 comic book viewer
>+COMMENT=	GTK3 comic book viewer
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-DEPRECATED=	Old, uses EOLed python27
>-EXPIRATION_DATE=	2020-03-01
>-
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=5.2.0:graphics/py-pillow6@${PY_FLAVOR}
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=5.2.0:graphics/py-pillow@${PY_FLAVOR}
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>+NO_ARCH=	yes
>+NO_BUILD=	yes
> 
>-USES=		gnome python:2.7 tar:bzip2
>-USE_GNOME=	pygtk2
>-USE_PYTHON=	autoplist distutils
>+USES=		gnome python shebangfix
>+USE_GNOME=	gtk30 pygobject3
>+USE_PYTHON=	flavors
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	multiSnow
>+GH_PROJECT=	mcomix3
>+GH_TAGNAME=	cd39ae5
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|g' \
>-		${WRKSRC}/setup.py
>+SHEBANG_FILES=	mcomix/mcomixstarter.py
> 
>+do-install:
>+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/mcomix
>+	(cd ${WRKSRC}/mcomix/mcomix && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/mcomix)
>+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/mcomix
>+	${INSTALL} ${WRKSRC}/mcomix/mcomixstarter.py ${STAGEDIR}/${PREFIX}/bin/mcomix
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 527560)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (mcomix-1.2.1.tar.bz2) = 7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b
>-SIZE (mcomix-1.2.1.tar.bz2) = 571128
>+TIMESTAMP = 1587280741
>+SHA256 (multiSnow-mcomix3-1.2.1g20200418-cd39ae5_GH0.tar.gz) = d76951a703d17af8bca6fe4ea9d72b8a1797971447bd235cb490afb7e4f7e376
>+SIZE (multiSnow-mcomix3-1.2.1g20200418-cd39ae5_GH0.tar.gz) = 3885475
>Index: files/patch-mcomix_image__tools.py
>===================================================================
>--- files/patch-mcomix_image__tools.py	(revision 527560)
>+++ files/patch-mcomix_image__tools.py	(nonexistent)
>@@ -1,115 +0,0 @@
>---- mcomix/image_tools.py.orig	2016-02-12 18:51:58 UTC
>-+++ mcomix/image_tools.py
>-@@ -9,7 +9,6 @@ import gtk
>- from PIL import Image
>- from PIL import ImageEnhance
>- from PIL import ImageOps
>--from PIL.JpegImagePlugin import _getexif
>- try:
>-     from PIL import PILLOW_VERSION
>-     PIL_VERSION = ('Pillow', PILLOW_VERSION)
>-@@ -51,7 +50,38 @@ assert MISSING_IMAGE_ICON
>- GTK_GDK_COLOR_BLACK = gtk.gdk.color_parse('black')
>- GTK_GDK_COLOR_WHITE = gtk.gdk.color_parse('white')
>- 
>-+def _getexif(im):
>-+    exif={}
>-+    try:
>-+        exif.update(im.getexif())
>-+    except AttributeError:
>-+        pass
>-+    if exif:
>-+        return exif
>- 
>-+    # Exif of PNG is still buggy in Pillow 6.0.0
>-+    try:
>-+        l1,l2,size,lines=im.info.get('Raw profile type exif').splitlines()
>-+        if l2!='exif':
>-+            # Not valid Exif data.
>-+            return {}
>-+        size=int(size)
>-+        data=binascii.unhexlify(''.join(lines))
>-+        if len(data)!=size:
>-+            # Size not match.
>-+            return {}
>-+        im.info['exif']=data
>-+    except:
>-+        # Not valid Exif data.
>-+        return {}
>-+
>-+    # load Exif again
>-+    try:
>-+        exif.update(im.getexif())
>-+    except AttributeError:
>-+        pass
>-+    return exif
>-+
>- def rotate_pixbuf(src, rotation):
>-     rotation %= 360
>-     if 0 == rotation:
>-@@ -300,14 +330,7 @@ def pil_to_pixbuf(im, keep_orientation=False):
>-     )
>-     if keep_orientation:
>-         # Keep orientation metadata.
>--        orientation = None
>--        exif = im.info.get('exif')
>--        if exif is not None:
>--            exif = _getexif(im)
>--            orientation = exif.get(274, None)
>--        if orientation is None:
>--            # Maybe it's a PNG? Try alternative method.
>--            orientation = _get_png_implied_rotation(im)
>-+        orientation = _getexit(im).get(274, None)
>-         if orientation is not None:
>-             setattr(pixbuf, 'orientation', str(orientation))
>-     return pixbuf
>-@@ -385,39 +408,6 @@ def enhance(pixbuf, brightness=1.0, contrast=1.0, satu
>-         im = ImageEnhance.Sharpness(im).enhance(sharpness)
>-     return pil_to_pixbuf(im)
>- 
>--def _get_png_implied_rotation(pixbuf_or_image):
>--    """Same as <get_implied_rotation> for PNG files.
>--
>--    Lookup for Exif data in the tEXt chunk.
>--    """
>--    if isinstance(pixbuf_or_image, gtk.gdk.Pixbuf):
>--        exif = pixbuf_or_image.get_option('tEXt::Raw profile type exif')
>--    elif isinstance(pixbuf_or_image, Image.Image):
>--        exif = pixbuf_or_image.info.get('Raw profile type exif')
>--    else:
>--        raise ValueError()
>--    if exif is None:
>--        return None
>--    exif = exif.split('\n')
>--    if len(exif) < 4 or 'exif' != exif[1]:
>--        # Not valid Exif data.
>--        return None
>--    size = int(exif[2])
>--    try:
>--        data = binascii.unhexlify(''.join(exif[3:]))
>--    except TypeError:
>--        # Not valid hexadecimal content.
>--        return None
>--    if size != len(data):
>--        # Sizes should match.
>--        return None
>--    im = namedtuple('FakeImage', 'info')({ 'exif': data })
>--    exif = _getexif(im)
>--    orientation = exif.get(274, None)
>--    if orientation is not None:
>--        orientation = str(orientation)
>--    return orientation
>--
>- def get_implied_rotation(pixbuf):
>-     """Return the implied rotation in degrees: 0, 90, 180, or 270.
>- 
>-@@ -429,9 +419,6 @@ def get_implied_rotation(pixbuf):
>-     orientation = getattr(pixbuf, 'orientation', None)
>-     if orientation is None:
>-         orientation = pixbuf.get_option('orientation')
>--    if orientation is None:
>--        # Maybe it's a PNG? Try alternative method.
>--        orientation = _get_png_implied_rotation(pixbuf)
>-     if orientation == '3':
>-         return 180
>-     elif orientation == '6':
>
>Property changes on: files/patch-mcomix_image__tools.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-mcomix_run.py
>===================================================================
>--- files/patch-mcomix_run.py	(revision 527560)
>+++ files/patch-mcomix_run.py	(nonexistent)
>@@ -1,15 +0,0 @@
>---- mcomix/run.py.orig	2016-02-12 18:52:12 UTC
>-+++ mcomix/run.py
>-@@ -203,7 +203,11 @@ def run():
>- 
>-     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=' ')
>
>Property changes on: files/patch-mcomix_run.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 527560)
>+++ pkg-descr	(working copy)
>@@ -3,4 +3,4 @@
> generic viewer. It reads images in ZIP, RAR, 7Zip or tar archives as
> well as plain image files.
> 
>-WWW: https://sourceforge.net/projects/mcomix/
>+WWW: https://github.com/multiSnow/mcomix3

Actions: View | Diff

Attachments on bug 245738: 213558 | 213608 | 213702