Make TTS and google translate support optional

2 files changed, 25 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b25c5f39db57..62df404e3eed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = mnemosyne
 	pkgdesc = A flash-card tool with a sophisticated card review algorithm
 	pkgver = 2.8
-	pkgrel = 1
-	url = http://www.mnemosyne-proj.org
+	pkgrel = 2
+	url = https://www.mnemosyne-proj.org
 	install = mnemosyne.install
 	arch = any
 	license = GPL
@@ -15,16 +15,18 @@ pkgbase = mnemosyne
 	depends = python-cherrypy
 	depends = python-webob
 	depends = python-pyqtwebengine
-	depends = python-googletrans
-	depends = python-google_trans_new
-	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
 	optdepends = mplayer: for playing audio and video externally
+	optdepends = python-googletrans: support for google translate
+	optdepends = python-google_trans_new: support for google translate
+	optdepends = python-gtts: support for text-to-speech
 	conflicts = mnemosyne-bzr
-	source = http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.8.tar.gz
+	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 = c5a57b1486dda325d53c3692fdd63778d8224efa0774ac750434e04f2162f3a2
 
 pkgname = mnemosyne
diff --git a/PKGBUILD b/PKGBUILD
index f2d0c0472d30..0ad14eee56d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,31 +5,41 @@
 
 pkgname=mnemosyne
 pkgver=2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A flash-card tool with a sophisticated card review algorithm"
 arch=('any')
-url='http://www.mnemosyne-proj.org'
+url='https://www.mnemosyne-proj.org'
 license=('GPL')
 depends=('python-pyqt5' 'qt5-webengine' 'python-argon2_cffi'
          'python-pillow' 'python-matplotlib' 'python-cherrypy' 'python-webob'
-         'python-pyqtwebengine' 'python-googletrans' 'python-google_trans_new' 'python-gtts')
+         'python-pyqtwebengine')
 makedepends=('python-setuptools')
 optdepends=('texlive-core: support for mathematical formulae in cards'
             'ttf-ms-fonts: support for non-latin labels on statistic plots'
             'python-cheroot: support for starting a sync server'
             'python-opengl: mentioned in a non-fatal warning'
-	    'mplayer: for playing audio and video externally')
+            'mplayer: for playing audio and video externally'
+            'python-googletrans: support for google translate'
+        'python-google_trans_new: support for google translate'
+        'python-gtts: support for text-to-speech')
 conflicts=('mnemosyne-bzr')
 install='mnemosyne.install'
 
-source=("http://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz")
-sha256sums=('63949ad4b44188501915a0465f32d3ca066698c58f86c46cf3196f9d601f6900')
+_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'
+            'c5a57b1486dda325d53c3692fdd63778d8224efa0774ac750434e04f2162f3a2')
 
 prepare() {
   cd "Mnemosyne-${pkgver}/"
 
-  # Fix windows line endings
+  # 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() {