Attachment 235037 Details for Bug 264988 – updated patch

[patch] updated patch

py39-frescobaldi-3.2.diff (text/plain), 2.32 KB, created by Martin Neubauer on 2022-07-02 17:47:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2022-07-02 17:47:32 UTC

Size: 2.32 KB

patch

obsolete

>diff --git a/print/py-frescobaldi/Makefile b/print/py-frescobaldi/Makefile
>index 75bc7e317c29..36b7b6158215 100644
>--- a/print/py-frescobaldi/Makefile
>+++ b/print/py-frescobaldi/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	frescobaldi
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	3.1.3
>-PORTREVISION=	5
>+DISTVERSION=	3.2
> CATEGORIES=	print kde python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -14,7 +13,8 @@ LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5 #@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}qpageview>=0:graphics/py-qpageview@${PY_FLAVOR}
> 
> USES=		desktop-file-utils gettext gmake pyqt:5 python:3.5+ qmake qt:5
> USE_GITHUB=	yes
>diff --git a/print/py-frescobaldi/distinfo b/print/py-frescobaldi/distinfo
>index 32928ed8cce6..da5a0c42151e 100644
>--- a/print/py-frescobaldi/distinfo
>+++ b/print/py-frescobaldi/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1608989986
>-SHA256 (frescobaldi-frescobaldi-v3.1.3_GH0.tar.gz) = f97256ce15ab621593536e219584a2ed744c1933148ac7ed98fcef6a3a9510a6
>-SIZE (frescobaldi-frescobaldi-v3.1.3_GH0.tar.gz) = 9354762
>+TIMESTAMP = 1654555318
>+SHA256 (frescobaldi-frescobaldi-v3.2_GH0.tar.gz) = f7bb9b5f708f902f8f512ab6f0de1a6272d9e176f678027e576b06e5ceec8fe8
>+SIZE (frescobaldi-frescobaldi-v3.2_GH0.tar.gz) = 9353050
>diff --git a/print/py-frescobaldi/files/patch-frescobaldi__app_portmidi_____init____.py b/print/py-frescobaldi/files/patch-frescobaldi__app_portmidi_____init____.py
>new file mode 100644
>index 000000000000..7ed521e86959
>--- /dev/null
>+++ b/print/py-frescobaldi/files/patch-frescobaldi__app_portmidi_____init____.py
>@@ -0,0 +1,20 @@
>+--- frescobaldi_app/portmidi/__init__.py.orig	2020-12-26 10:15:52 UTC
>++++ frescobaldi_app/portmidi/__init__.py
>+@@ -264,16 +264,7 @@ def _setup():
>+ 
>+     """
>+     global pypm
>+-    if pypm is None:
>+-        for name in try_order:
>+-            try:
>+-                pypm = globals()['_do_import_' + name]()
>+-                break
>+-            except ImportError:
>+-                continue
>+-        else:
>+-            pypm = False
>+-    return bool(pypm)
>++    return False
>+ 
>+ def _load_module(name):
>+     """Loads and returns a single module.

Flags:

m.ne: maintainer-approval+

Actions: View | Diff

Attachments on bug 264988: 235033 | 235037 | 235038