v2.9

3 files changed, 8 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 364ab6f8cab8..c4534f82fb8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = mnemosyne
 	pkgdesc = A flash-card tool with a sophisticated card review algorithm
-	pkgver = 2.8
-	pkgrel = 3
+	pkgver = 2.9
+	pkgrel = 1
 	url = https://www.mnemosyne-proj.org
-	install = mnemosyne.install
 	arch = any
 	license = GPL
 	makedepends = python-setuptools
@@ -24,9 +23,7 @@ pkgbase = mnemosyne
 	optdepends = python-google_trans_new: support for google translate
 	optdepends = python-gtts: support for text-to-speech
 	conflicts = mnemosyne-bzr
-	source = https://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.8.tar.gz
-	source = make-deps-optional.patch::https://github.com/mnemosyne-proj/mnemosyne/commit/b0e85fbb54a23add1fe8a0d56123b2ddb056b325.patch
-	sha256sums = 63949ad4b44188501915a0465f32d3ca066698c58f86c46cf3196f9d601f6900
-	sha256sums = 086691d23ab73354af338ba69c42d7facf36c2a6663271c95e242b35679a8ead
+	source = https://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.9.tar.gz
+	sha256sums = 190587c4dc935bd717a16b3f9710d7cc3e7ed6e2124e22e39315e562a929033a
 
 pkgname = mnemosyne
diff --git a/PKGBUILD b/PKGBUILD
index c44c489f6cb0..3e4e73f5a702 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=mnemosyne
-pkgver=2.8
-pkgrel=3
+pkgver=2.9
+pkgrel=1
 pkgdesc="A flash-card tool with a sophisticated card review algorithm"
 arch=('any')
 url='https://www.mnemosyne-proj.org'
@@ -23,13 +23,10 @@ optdepends=('texlive-core: support for mathematical formulae in cards'
         'python-google_trans_new: support for google translate'
         'python-gtts: support for text-to-speech')
 conflicts=('mnemosyne-bzr')
-install='mnemosyne.install'
 
 _dlurl="https://github.com/mnemosyne-proj/mnemosyne"
-source=("https://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz"
-        "make-deps-optional.patch::$_dlurl/commit/b0e85fbb54a23add1fe8a0d56123b2ddb056b325.patch")
-sha256sums=('63949ad4b44188501915a0465f32d3ca066698c58f86c46cf3196f9d601f6900'
-            '086691d23ab73354af338ba69c42d7facf36c2a6663271c95e242b35679a8ead')
+source=("https://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz")
+sha256sums=('190587c4dc935bd717a16b3f9710d7cc3e7ed6e2124e22e39315e562a929033a')
 
 prepare() {
   cd "Mnemosyne-${pkgver}/"
@@ -37,14 +34,10 @@ prepare() {
   # Fix Windows line endings
   sed -i "s/\r//g" mnemosyne/pyqt_ui/mnemosyne
   find -name '*py' -exec sed -i "s/\r//g" {} \;
-
-  # patch to make google transate and goole text to speak optional
-  patch --forward -p1 --input="$srcdir/make-deps-optional.patch"
 }
 
 build() {
   cd "Mnemosyne-${pkgver}/"
-
   python setup.py build
 }
 
diff --git a/mnemosyne.install b/mnemosyne.install
deleted file mode 100644
index adfe7f90ad22..000000000000
--- a/mnemosyne.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "    When started, Mnemosyne 2.x looks for a Mnemosyne 1.x database in"
-  echo "    ~/.mnemosyne/ and tries to automatically import it. It won't overwrite"
-  echo "    it, though, as it stores its own database in ~/.local/share/mnemosyne/."
-  echo "    After it has been successfully imported once, manually delete the old"
-  echo "    ~/.mnemosyne/ folder so it won't be automatically imported again."
-}