Attachment 179657 Details for Bug 216826 – corrected diff

[patch] corrected diff

frescobaldi.diff (text/plain), 5.34 KB, created by martin.dieringer on 2017-02-05 21:31:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: martin.dieringer

Created: 2017-02-05 21:31:12 UTC

Size: 5.34 KB

patch

obsolete

>diff -ruN /usr/ports//print/frescobaldi/distinfo ./distinfo
>--- /usr/ports//print/frescobaldi/distinfo	2014-06-09 19:42:25.000000000 +0200
>+++ ./distinfo	2017-02-05 22:25:13.402582000 +0100
>@@ -1,2 +1,3 @@
>-SHA256 (frescobaldi-2.0.15.tar.gz) = 1f9d56fc1e4de90c93b327d78b6c086ed2fc575b67503bdbb852545ff75daa17
>-SIZE (frescobaldi-2.0.15.tar.gz) = 3747346
>+TIMESTAMP = 1486329913
>+SHA256 (wbsoft-frescobaldi-v2.19.0_GH0.tar.gz) = a00857f32c77fc5ff364c33f07c4d5b513aa69b76059c4557096469276b2e35b
>+SIZE (wbsoft-frescobaldi-v2.19.0_GH0.tar.gz) = 7136513
>diff -ruN /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_menu.py ./files/patch-frescobaldi_app_menu.py
>--- /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_menu.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-frescobaldi_app_menu.py	2017-02-05 14:11:47.289572000 +0100
>@@ -0,0 +1,18 @@
>+--- frescobaldi_app/menu.py.orig	2016-04-22 00:40:35.000000000 +0200
>++++ frescobaldi_app/menu.py	2017-02-05 14:09:26.684495000 +0100
>+@@ -23,11 +23,12 @@
>+ 
>+ from __future__ import unicode_literals
>+ 
>+-try:
>++import sys
>++if sys.version_info >= (3, 0):
>+     import builtins # py3
>+-except ImportError:
>++else:
>+     import __builtin__ as builtins # py2
>+-
>++    
>+ from PyQt4.QtCore import QSettings
>+ from PyQt4.QtGui import QMenu
>+ 
>diff -ruN /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_po___init__.py ./files/patch-frescobaldi_app_po___init__.py
>--- /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_po___init__.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-frescobaldi_app_po___init__.py	2017-02-05 14:22:58.325214000 +0100
>@@ -0,0 +1,15 @@
>+--- frescobaldi_app/po/__init__.py.orig	2017-02-05 14:16:17.835755000 +0100
>++++ frescobaldi_app/po/__init__.py	2017-02-05 14:16:33.882129000 +0100
>+@@ -21,9 +21,10 @@
>+ Internationalization of Frescobaldi.
>+ """
>+ 
>+-try:
>++import sys
>++if sys.version_info >= (3, 0):
>+     import builtins # py3
>+-except ImportError:
>++else:
>+     import __builtin__ as builtins # py2
>+ 
>+ import os
>diff -ruN /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_snippet_builtin.py ./files/patch-frescobaldi_app_snippet_builtin.py
>--- /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_snippet_builtin.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-frescobaldi_app_snippet_builtin.py	2017-02-05 14:23:46.533559000 +0100
>@@ -0,0 +1,15 @@
>+--- frescobaldi_app/snippet/builtin.py.orig	2017-02-05 14:16:35.255975000 +0100
>++++ frescobaldi_app/snippet/builtin.py	2017-02-05 14:16:41.278222000 +0100
>+@@ -23,9 +23,10 @@
>+ 
>+ from __future__ import unicode_literals
>+ 
>+-try:
>++import sys
>++if sys.version_info >= (3, 0):
>+     import builtins # py3
>+-except ImportError:
>++else:
>+     import __builtin__ as builtins # py2
>+ 
>+ import collections
>diff -ruN /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_snippet_expand.py ./files/patch-frescobaldi_app_snippet_expand.py
>--- /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_snippet_expand.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-frescobaldi_app_snippet_expand.py	2017-02-05 14:23:53.164892000 +0100
>@@ -0,0 +1,15 @@
>+--- frescobaldi_app/snippet/expand.py.orig	2017-02-05 14:16:41.282834000 +0100
>++++ frescobaldi_app/snippet/expand.py	2017-02-05 14:16:46.047771000 +0100
>+@@ -23,9 +23,10 @@
>+ 
>+ from __future__ import unicode_literals
>+ 
>+-try:
>++import sys
>++if sys.version_info >= (3, 0):
>+     import builtins # py3
>+-except ImportError:
>++else:
>+     import __builtin__ as builtins # py2
>+ 
>+ import time
>diff -ruN /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_snippet_highlight.py ./files/patch-frescobaldi_app_snippet_highlight.py
>--- /usr/ports//print/frescobaldi/files/patch-frescobaldi_app_snippet_highlight.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-frescobaldi_app_snippet_highlight.py	2017-02-05 14:24:00.050270000 +0100
>@@ -0,0 +1,15 @@
>+--- frescobaldi_app/snippet/highlight.py.orig	2017-02-05 14:16:46.052245000 +0100
>++++ frescobaldi_app/snippet/highlight.py	2017-02-05 14:16:50.590542000 +0100
>+@@ -23,9 +23,10 @@
>+ 
>+ from __future__ import unicode_literals
>+ 
>+-try:
>++import sys
>++if sys.version_info >= (3, 0):
>+     import builtins # py3
>+-except ImportError:
>++else:
>+     import __builtin__ as builtins # py2
>+ 
>+ import keyword
>diff -ruN /usr/ports//print/frescobaldi/Makefile ./Makefile
>--- /usr/ports//print/frescobaldi/Makefile	2016-08-24 10:20:31.000000000 +0200
>+++ ./Makefile	2017-02-05 22:28:40.150816000 +0100
>@@ -2,10 +2,12 @@
> # $FreeBSD: head/print/frescobaldi/Makefile 420774 2016-08-24 08:20:31Z tcberner $
> 
> PORTNAME=	frescobaldi
>-PORTVERSION=	2.0.15
>-PORTREVISION=	2
>+PORTVERSION=	2.19.0
> CATEGORIES=	print kde
>-MASTER_SITES=	https://github.com/wbsoft/frescobaldi/releases/download/v${PORTVERSION}/
>+DISTVERSIONPREFIX=      v
>+USE_GITHUB=     yes
>+GH_ACCOUNT=     wbsoft
>+GH_PROJECT=     ${PORTNAME}
> 
> MAINTAINER=	martin.dieringer@gmx.de
> COMMENT=	Music score editor for lilypond
>@@ -14,14 +16,12 @@
> LICENSE_COMB=	dual
> 
> RUN_DEPENDS=	lilypond:print/lilypond \
>-		${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4
>+		${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
>+		ly:print/py-python-ly
> 
> USES=		gettext kde:4 python
> INSTALLS_ICONS=	yes
> USE_KDE=	kdelibs pykde4_build pykde4_run
> USE_PYTHON=	distutils autoplist
> 
>-post-patch:
>-	@${REINPLACE_CMD} '/install-script=frescobaldi-wininst.py/d' ${WRKSRC}/setup.cfg
>-
> .include <bsd.port.mk>

Flags:

martin.dieringer: maintainer-approval+

Actions: View | Diff

Attachments on bug 216826: 179646 | 179657