v2.7.3

3 files changed, 11 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9e7ae0e839a..4996a7f2c242 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mnemosyne
 	pkgdesc = A flash-card tool with a sophisticated card review algorithm
-	pkgver = 2.7
+	pkgver = 2.7.3
 	pkgrel = 1
 	url = http://www.mnemosyne-proj.org
 	install = mnemosyne.install
@@ -21,10 +21,8 @@ pkgbase = mnemosyne
 	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.7.tar.gz
-	source = python38.patch
-	sha256sums = 44e0a61a77ef91410da89a02c4407527e225562a44a792a9206ca83be806a753
-	sha256sums = 362bb526d2eb55dbf026d6a0e4436ee3757da0f4bf11600982099993c3ae7e79
+	source = http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.7.3.tar.gz
+	sha256sums = 08e03e750d52db71f63a42ecc71b6e5bbf14cccd75bdc3bd90fddb9af6e2c808
 
 pkgname = mnemosyne
 
diff --git a/PKGBUILD b/PKGBUILD
index f27117bfe268..780dc022f606 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=mnemosyne
-pkgver=2.7
+pkgver=2.7.3
 pkgrel=1
 pkgdesc="A flash-card tool with a sophisticated card review algorithm"
 arch=('any')
@@ -21,13 +21,14 @@ 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"
-        "python38.patch")
-sha256sums=('44e0a61a77ef91410da89a02c4407527e225562a44a792a9206ca83be806a753'
-            '362bb526d2eb55dbf026d6a0e4436ee3757da0f4bf11600982099993c3ae7e79')
+source=("http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz")
+sha256sums=('08e03e750d52db71f63a42ecc71b6e5bbf14cccd75bdc3bd90fddb9af6e2c808')
+
 prepare() {
-    cd "Mnemosyne-${pkgver}"
-    patch -p1 < ../python38.patch
+  cd "Mnemosyne-${pkgver}/"
+
+  # Fix windows line endings
+  sed -i "s/\r//g" mnemosyne/pyqt_ui/mnemosyne
 }
 
 build() {
diff --git a/python38.patch b/python38.patch
deleted file mode 100644
index 4b92513d4862..000000000000
--- a/python38.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-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":