From f6081a7c57987d5a5b342110f1e4f7fce3caeb1d Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 17 Sep 2014 22:37:04 +0000 Subject: Update to 2.7.2 and fix build with py-sphinx-1.2.3. 2.7.2 (2014-01-25) Fixed amount parsing issue. (#379) Don't repeatedly fetch currency rates we can never get. (#374) Fixed date parsing issue. [Windows, Linux] (#381) Fixed view plugins which were broken. --- finance/moneyguru/Makefile | 7 ++++--- finance/moneyguru/PLIST | 12 +++++++----- finance/moneyguru/distinfo | 9 +++++---- finance/moneyguru/patches/patch-hscommon_sphinxgen.py | 16 ++++++++++++++++ 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 finance/moneyguru/patches/patch-hscommon_sphinxgen.py (limited to 'finance/moneyguru') diff --git a/finance/moneyguru/Makefile b/finance/moneyguru/Makefile index 0e4a56cf882..44761addb42 100644 --- a/finance/moneyguru/Makefile +++ b/finance/moneyguru/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2014/05/17 16:10:44 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/09/17 22:37:04 wiz Exp $ # # any of ~* is fine, they are the same and just there for Ubuntu # so moneyguru's built for all releases -DISTNAME= 2.7.1 +DISTNAME= 2.7.2 PKGNAME= moneyguru-${DISTNAME} -PKGREVISION= 1 CATEGORIES= finance MASTER_SITES= https://github.com/hsoft/moneyguru/archive/ @@ -49,6 +48,8 @@ do-install: cd ${WRKSRC} && pax -pp -rw ambuttonbar build cocoa cocoalib core data help hscommon images locale plugin_examples psmtabbarcontrol qt qtlib run.py ${DESTDIR}${PREFIX}/share/moneyguru ${INSTALL_DATA} ${WRKSRC}/debian/moneyguru.desktop ${DESTDIR}${PREFIX}/share/applications ${LN} -s ${DESTDIR}${PREFIX}/share/moneyguru/run.py ${DESTDIR}${PREFIX}/bin/moneyguru +# remove after patches/patch-hscommon_sphinxgen.py is gone + ${RM} ${DESTDIR}${PREFIX}/share/moneyguru/hscommon/sphinxgen.py.orig .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/finance/moneyguru/PLIST b/finance/moneyguru/PLIST index e693579e557..984c97f82ce 100644 --- a/finance/moneyguru/PLIST +++ b/finance/moneyguru/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2014/05/10 06:52:03 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/09/17 22:37:04 wiz Exp $ bin/moneyguru share/applications/moneyguru.desktop share/moneyguru/ambuttonbar/AMButtonBar.h @@ -707,10 +707,11 @@ share/moneyguru/data/stylesheet_win.css share/moneyguru/help/__init__.py share/moneyguru/help/changelog share/moneyguru/help/conf.tmpl +share/moneyguru/help/credits.rst share/moneyguru/help/cs/basics.rst share/moneyguru/help/cs/cash.rst share/moneyguru/help/cs/changelog.tmpl -share/moneyguru/help/cs/credits.rst +share/moneyguru/help/cs/credits.tmpl share/moneyguru/help/cs/currencies.rst share/moneyguru/help/cs/editing.rst share/moneyguru/help/cs/faq.rst @@ -722,7 +723,7 @@ share/moneyguru/help/cs/reconciliation.rst share/moneyguru/help/de/basics.rst share/moneyguru/help/de/cash.rst share/moneyguru/help/de/changelog.tmpl -share/moneyguru/help/de/credits.rst +share/moneyguru/help/de/credits.tmpl share/moneyguru/help/de/currencies.rst share/moneyguru/help/de/editing.rst share/moneyguru/help/de/faq.rst @@ -737,6 +738,7 @@ share/moneyguru/help/en/changelog.rst share/moneyguru/help/en/changelog.tmpl share/moneyguru/help/en/conf.py share/moneyguru/help/en/credits.rst +share/moneyguru/help/en/credits.tmpl share/moneyguru/help/en/currencies.rst share/moneyguru/help/en/developer/api/document.rst share/moneyguru/help/en/developer/api/index.rst @@ -757,7 +759,7 @@ share/moneyguru/help/en/reconciliation.rst share/moneyguru/help/fr/basics.rst share/moneyguru/help/fr/cash.rst share/moneyguru/help/fr/changelog.tmpl -share/moneyguru/help/fr/credits.rst +share/moneyguru/help/fr/credits.tmpl share/moneyguru/help/fr/currencies.rst share/moneyguru/help/fr/editing.rst share/moneyguru/help/fr/faq.rst @@ -811,7 +813,7 @@ share/moneyguru/help/image_win/reconciliation_checkmark.png share/moneyguru/help/it/basics.rst share/moneyguru/help/it/cash.rst share/moneyguru/help/it/changelog.tmpl -share/moneyguru/help/it/credits.rst +share/moneyguru/help/it/credits.tmpl share/moneyguru/help/it/currencies.rst share/moneyguru/help/it/editing.rst share/moneyguru/help/it/faq.rst diff --git a/finance/moneyguru/distinfo b/finance/moneyguru/distinfo index db382c369e5..cb95d6c5bab 100644 --- a/finance/moneyguru/distinfo +++ b/finance/moneyguru/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2014/01/25 11:11:20 wiz Exp $ +$NetBSD: distinfo,v 1.3 2014/09/17 22:37:04 wiz Exp $ -SHA1 (moneyguru/2.7.1.tar.gz) = 3920ac8ba29f83cb9684755efa88a8dd9436dd65 -RMD160 (moneyguru/2.7.1.tar.gz) = 940d964302dcd318cd90b47fdedb6aa839b955dc -Size (moneyguru/2.7.1.tar.gz) = 3128081 bytes +SHA1 (moneyguru/2.7.2.tar.gz) = 5d28f6970653ef5d3ffea0b79c04c83fbb3f4081 +RMD160 (moneyguru/2.7.2.tar.gz) = 77192c2b67400e4e9a3f1c749542048ff01d3d74 +Size (moneyguru/2.7.2.tar.gz) = 3126811 bytes +SHA1 (patch-hscommon_sphinxgen.py) = 7fa6569d833ba57c4cd529476ad9eff0d200b5c7 diff --git a/finance/moneyguru/patches/patch-hscommon_sphinxgen.py b/finance/moneyguru/patches/patch-hscommon_sphinxgen.py new file mode 100644 index 00000000000..ef61a85f6c0 --- /dev/null +++ b/finance/moneyguru/patches/patch-hscommon_sphinxgen.py @@ -0,0 +1,16 @@ +$NetBSD: patch-hscommon_sphinxgen.py,v 1.1 2014/09/17 22:37:04 wiz Exp $ + +Fix build with sphinx-1.2.3, from +https://github.com/hsoft/moneyguru/commit/53ee31a909c9e6021573167dd797b6a9cf8873a1 + +--- hscommon/sphinxgen.py.orig 2014-01-25 19:13:23.000000000 +0000 ++++ hscommon/sphinxgen.py +@@ -66,4 +66,7 @@ def gen(basepath, destpath, changelogpat + # missing dependencies which are in the virtualenv). Here, we do exactly what is done when + # calling the command from bash. + cmd = load_entry_point('Sphinx', 'console_scripts', 'sphinx-build') +- cmd(['sphinx-build', basepath, destpath]) ++ try: ++ cmd(['sphinx-build', basepath, destpath]) ++ except SystemExit: ++ print("Sphinx called sys.exit(), but we're cancelling it because we don't acutally want to exit") -- cgit v1.2.3