v2.7

4 files changed, 62 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86f7ad1fd5ff..b9e7ae0e839a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = mnemosyne
 	pkgdesc = A flash-card tool with a sophisticated card review algorithm
-	pkgver = 2.6.1
-	pkgrel = 2
+	pkgver = 2.7
+	pkgrel = 1
 	url = http://www.mnemosyne-proj.org
 	install = mnemosyne.install
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPL
 	makedepends = python-setuptools
 	depends = python-pyqt5
@@ -15,13 +14,17 @@ pkgbase = mnemosyne
 	depends = python-cherrypy
 	depends = python-webob
 	depends = python-pyqtwebengine
+	depends = python-googletrans
+	depends = python-gtts
 	optdepends = texlive-core: support for mathematical formulae in cards
 	optdepends = ttf-ms-fonts: support for non-latin labels on statistic plots
 	optdepends = python-cheroot: support for starting a sync server
 	optdepends = python-opengl: mentioned in a non-fatal warning
 	conflicts = mnemosyne-bzr
-	source = http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.6.1.tar.gz
-	sha256sums = 6331241bc7caf26fed2e4d32c3c18da33116389b67af621da679a950f08c9c75
+	source = http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.7.tar.gz
+	source = python38.patch
+	sha256sums = 44e0a61a77ef91410da89a02c4407527e225562a44a792a9206ca83be806a753
+	sha256sums = 362bb526d2eb55dbf026d6a0e4436ee3757da0f4bf11600982099993c3ae7e79
 
 pkgname = mnemosyne
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b73905529f23
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index d3dc034ba6d3..7a4686212ab3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=mnemosyne
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.7
+pkgrel=1
 pkgdesc="A flash-card tool with a sophisticated card review algorithm"
-arch=('i686' 'x86_64')
+arch=('any')
 url='http://www.mnemosyne-proj.org'
 license=('GPL')
 depends=('python-pyqt5' 'qt5-webengine'
          'python-pillow' 'python-matplotlib' 'python-cherrypy' 'python-webob'
-         'python-pyqtwebengine')
+         'python-pyqtwebengine' 'python-googletrans' 'python-gtts')
 makedepends=('python-setuptools')
 optdepends=('texlive-core: support for mathematical formulae in cards'
             'ttf-ms-fonts: support for non-latin labels on statistic plots'
@@ -20,12 +20,18 @@ optdepends=('texlive-core: support for mathematical formulae in cards'
 conflicts=('mnemosyne-bzr')
 install='mnemosyne.install'
 
-source=("http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz")
-sha256sums=('6331241bc7caf26fed2e4d32c3c18da33116389b67af621da679a950f08c9c75')
+source=("http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz"
+        "python38.patch")
+sha256sums=('44e0a61a77ef91410da89a02c4407527e225562a44a792a9206ca83be806a753'
+            '362bb526d2eb55dbf026d6a0e4436ee3757da0f4bf11600982099993c3ae7e79')
+prepare() {
+    cd "Mnemosyne-${pkgver}"
+    patch -p1 < ../python38.patch
+}
 
 build() {
   cd "Mnemosyne-${pkgver}/"
-  
+
   python setup.py build
 }
 
diff --git a/python38.patch b/python38.patch
new file mode 100644
index 000000000000..4b92513d4862
--- /dev/null
+++ b/python38.patch
@@ -0,0 +1,27 @@
+
+diff --git a/openSM2sync/server.py b/openSM2sync/server.py
+index 50c1e0f6..1a7d6da4 100755
+--- a/openSM2sync/server.py
++++ b/openSM2sync/server.py
+@@ -5,11 +5,11 @@
+
+ import os
+ import sys
+-import cgi
+ import time
+ import types
+ import select
+ import socket
++import urllib
+ import tarfile
+ import http.client
+ import tempfile
+@@ -152,7 +152,7 @@ def get_method(self, environ):
+         # Convert e.g. GET /foo_bar into get_foo_bar.
+         method = (environ["REQUEST_METHOD"] + \
+                   environ["PATH_INFO"].replace("/", "_")).lower()
+-        args = cgi.parse_qs(environ["QUERY_STRING"])
++        args = urllib.parse.parse_qs(environ["QUERY_STRING"])
+         args = dict([(key, val[0]) for key, val in list(args.items())])
+         # Login method.
+         if method == "put_login" or method == "get_status":