gnucash: update to 3.3.

This commit is contained in:
Helmut Pozimski 2018-10-01 10:11:38 +02:00
parent 40ec652855
commit 8c040caa16
2 changed files with 7 additions and 70 deletions

View File

@ -26,64 +26,3 @@ Reason: compatibility of the remaining code with python3
self.ip.magic('colors LightBG')
sys.excepthook = excepthook
self.iter_more = 0
--- gnucash/python/pycons/shell.py 2018-09-27 12:47:04.181700180 +0200
+++ gnucash/python/pycons/shell.py 2018-09-27 12:47:53.483011434 +0200
@@ -153,9 +153,9 @@
console.write (buf, 'output')
if len(buf) < 256: break
# Command output
- print(`r`)
+ print(repr(r))
except SyntaxError:
- exec self.command in self.globals
+ exec(self.command in self.globals)
except:
if hasattr (sys, 'last_type') and sys.last_type == SystemExit:
console.quit()
--- gnucash/python/pycons/console.py 2018-09-27 12:48:04.043863853 +0200
+++ gnucash/python/pycons/console.py 2018-09-27 12:49:32.770623486 +0200
@@ -31,10 +31,12 @@
import re
import tempfile
import readline
+import gi
+gi.require_version('Gtk', '3.0')
from gi.repository import GObject
from gi.repository import Gtk
from gi.repository import Pango
-from StringIO import StringIO
+import io
import shell
try: import ishell
except: pass
@@ -79,8 +81,8 @@
def writelines(self, l):
for s in l:
self.console.write (s, self.style)
- def seek(self, a): raise IOError, (29, 'Illegal seek')
- def tell(self): raise IOError, (29, 'Illegal seek')
+ def seek(self, a): raise IOError(29, 'Illegal seek')
+ def tell(self): raise IOError(29, 'Illegal seek')
truncate = tell
@@ -113,8 +115,8 @@
def readlines(self): return []
def write(self, s): return None
def writelines(self, l): return None
- def seek(self, a): raise IOError, (29, 'Illegal seek')
- def tell(self): raise IOError, (29, 'Illegal seek')
+ def seek(self, a): raise IOError(29, 'Illegal seek')
+ def tell(self): raise IOError(29, 'Illegal seek')
truncate = tell
@@ -179,7 +181,7 @@
# Console stuff
self.argv = argv
self.history_init(filename, size)
- self.cout = StringIO()
+ self.cout = io.StringIO()
self.cout.truncate(0)
if shelltype=='ipython':
self.shell = ishell.Shell(argv,locals(),globals(),

View File

@ -1,31 +1,29 @@
# Template file for 'gnucash'
pkgname=gnucash
version=3.2
revision=4
version=3.3
revision=1
build_style=cmake
configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
hostmakedepends="pkg-config guile python3 libxslt perl"
makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel guile-devel
gwenhywfar-devel ktoblzcheck-devel libofx-devel libsecret-devel
libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3"
depends="dconf guile"
depends="dconf guile perl"
short_desc="Financial-accounting software"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="http://www.gnucash.org"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=63e5b00c148ed0f7021ebc03e4e70c4a9c549feb3ea49d6c810f2abaaf592452
checksum=8396ed8d2a88ac358ecf458c253cf38f55a13aaba7958e4fde3dd85c222e393f
pycompile_module="gnucash"
pycompile_dirs="usr/share/gnucash/python"
conf_files="/etc/gnucash/environment"
nocross="fails to compile guile code when cross-compiling"
case "$XBPS_TARGET_MACHINE" in
*-musl) CXXFLAGS="-Wno-error"
export LC_ALL="C";;
*) CXXFLAGS="-Wno-deprecated-declarations";;
esac
CXXFLAGS="-Wno-error"
CFLAGS="-Wno-error"
export LC_ALL="C"
post_install() {
case "$XBPS_TARGET_MACHINE" in