mnemosyne 2.10.1-2: Fix license and python-pyqt6-webengine dependency

3 files changed, 27 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 701b3b47466d..c447c2a050c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = mnemosyne
 	pkgdesc = A flash-card tool with a sophisticated card review algorithm
 	pkgver = 2.10.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mnemosyne-proj.org
 	arch = any
-	license = GPL
+	license = LGPL3
+	license = custom:AGPL3 with Mnemosyne attribution requirement
 	makedepends = python-setuptools
 	depends = python-pyqt6
-	depends = qt6-webengine
+	depends = python-pyqt6-webengine
 	depends = qt6-multimedia
 	depends = python-argon2_cffi
 	depends = python-pillow
 	depends = python-matplotlib
 	depends = python-cherrypy
 	depends = python-webob
-	depends = python-pyqtwebengine
 	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
@@ -23,8 +23,9 @@ pkgbase = mnemosyne
 	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 = https://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-2.10.1.tar.gz
+	source = https://github.com/mnemosyne-proj/mnemosyne/releases/download/2.10.1/Mnemosyne-2.10.1.tar.gz
+	source = LICENSE-2.10.1::https://github.com/mnemosyne-proj/mnemosyne/raw/2.10.1/mnemosyne/LICENSE
 	sha256sums = cc8efd8ae4576f94b463ceca7dd1be1ca7345d535038070147b66dfce75a04fe
+	sha256sums = dfb5787cc91234cb13b794c55bfaa7890839c0f0b45b61784143d62f95704183
 
 pkgname = mnemosyne
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b73905529f23..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.tar
-*.tar.*
-*.jar
-*.exe
-*.msi
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-
-pkg/
-src/
diff --git a/PKGBUILD b/PKGBUILD
index 078a65b1dbfd..81d61fad696a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
-# Maintainer: Alex Dewar <alex.dewar@gmx.co.uk>
+# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
+# Contributor: Alex Dewar <alex.dewar@gmx.co.uk>
 # Contributor: Marcin Mielniczuk <marmistrz dot dev at zoho dot eu>
 # Contributor: Sam S. <smls75@gmail.com>
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=mnemosyne
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A flash-card tool with a sophisticated card review algorithm"
 arch=('any')
 url='https://www.mnemosyne-proj.org'
-license=('GPL')
-depends=('python-pyqt6' 'qt6-webengine' 'qt6-multimedia' 'python-argon2_cffi'
-         'python-pillow' 'python-matplotlib' 'python-cherrypy' 'python-webob'
-         'python-pyqtwebengine')
+license=('LGPL3' 'custom:AGPL3 with Mnemosyne attribution requirement')
+depends=('python-pyqt6' 'python-pyqt6-webengine' 'qt6-multimedia'
+         'python-argon2_cffi' 'python-pillow' 'python-matplotlib'
+         'python-cherrypy' 'python-webob')
 makedepends=('python-setuptools')
 optdepends=('texlive-core: support for mathematical formulae in cards'
             'ttf-ms-fonts: support for non-latin labels on statistic plots'
@@ -20,16 +21,15 @@ optdepends=('texlive-core: support for mathematical formulae in cards'
             'python-opengl: mentioned in a non-fatal warning'
             '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')
-
-_dlurl="https://github.com/mnemosyne-proj/mnemosyne"
-source=("https://downloads.sourceforge.net/mnemosyne-proj/Mnemosyne-${pkgver}.tar.gz")
-sha256sums=('cc8efd8ae4576f94b463ceca7dd1be1ca7345d535038070147b66dfce75a04fe')
+            'python-google_trans_new: support for google translate'
+            'python-gtts: support for text-to-speech')
+source=("https://github.com/mnemosyne-proj/mnemosyne/releases/download/${pkgver}/Mnemosyne-${pkgver}.tar.gz"
+        "LICENSE-${pkgver}::https://github.com/mnemosyne-proj/mnemosyne/raw/${pkgver}/mnemosyne/LICENSE")
+sha256sums=('cc8efd8ae4576f94b463ceca7dd1be1ca7345d535038070147b66dfce75a04fe'
+            'dfb5787cc91234cb13b794c55bfaa7890839c0f0b45b61784143d62f95704183')
 
 prepare() {
-  cd "Mnemosyne-${pkgver}/"
+  cd "${srcdir}/Mnemosyne-${pkgver}"
 
   # Fix Windows line endings
   sed -i "s/\r//g" mnemosyne/pyqt_ui/mnemosyne
@@ -37,12 +37,15 @@ prepare() {
 }
 
 build() {
-  cd "Mnemosyne-${pkgver}/"
+  cd "${srcdir}/Mnemosyne-${pkgver}"
+
   python setup.py build
 }
 
 package() {
-  cd "Mnemosyne-${pkgver}/"
+  cd "${srcdir}/Mnemosyne-${pkgver}"
+
   python setup.py install --root="${pkgdir}" --optimize=1
+  install -Dm644 "${srcdir}/LICENSE-${pkgver}" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-