mnemosyne 2.11-2: Fix icon search path and missing UI files

3 files changed, 26 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7dc27ad2037..3ce1a9818e68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mnemosyne
 	pkgdesc = A flash-card tool with a sophisticated card review algorithm
 	pkgver = 2.11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mnemosyne-proj.org
 	arch = any
 	license = LGPL3
@@ -25,6 +25,8 @@ pkgbase = mnemosyne
 	optdepends = python-google_trans_new: support for google translate
 	optdepends = python-gtts: support for text-to-speech
 	source = mnemosyne-2.11.tar.gz::https://github.com/mnemosyne-proj/mnemosyne/archive/refs/tags/2.11.tar.gz
+	source = fix-icon-search-path.patch
 	sha256sums = a042252c2fb8c69c44d048e3f3cfca142189fe7d1bb55e0ad98f8edeeb3ae1cd
+	sha256sums = 9aa6f5d2f15009169eba0ab5143f97cbf0e9b4522b8c00141c20d7fe5f9194ef
 
 pkgname = mnemosyne
diff --git a/PKGBUILD b/PKGBUILD
index 438e47c02417..2b9eed4111c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mnemosyne
 pkgver=2.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A flash-card tool with a sophisticated card review algorithm"
 arch=('any')
 url='https://www.mnemosyne-proj.org'
@@ -23,12 +23,15 @@ optdepends=('texlive-core: support for mathematical formulae in cards'
             'python-googletrans: support for google translate'
             'python-google_trans_new: support for google translate'
             'python-gtts: support for text-to-speech')
-source=("mnemosyne-${pkgver}.tar.gz::https://github.com/mnemosyne-proj/mnemosyne/archive/refs/tags/${pkgver}.tar.gz")
-sha256sums=('a042252c2fb8c69c44d048e3f3cfca142189fe7d1bb55e0ad98f8edeeb3ae1cd')
+source=("mnemosyne-${pkgver}.tar.gz::https://github.com/mnemosyne-proj/mnemosyne/archive/refs/tags/${pkgver}.tar.gz"
+        "fix-icon-search-path.patch")
+sha256sums=('a042252c2fb8c69c44d048e3f3cfca142189fe7d1bb55e0ad98f8edeeb3ae1cd'
+            '9aa6f5d2f15009169eba0ab5143f97cbf0e9b4522b8c00141c20d7fe5f9194ef')
 
 prepare() {
   cd "${srcdir}/mnemosyne-${pkgver}"
 
+  patch -Np1 < "${srcdir}/fix-icon-search-path.patch"
   # Fix Windows line endings
   find -name '*py' -exec sed -i "s/\r//g" {} \;
 }
@@ -39,6 +42,11 @@ build() {
   # Newer, standards-based build system doesn't seem to install properly (at
   # least the desktop entry and gettext catalogs are missing and some other
   # files in seemingly strange locations). Will figure that out later.
+  pushd mnemosyne/pyqt_ui
+  for i in *.ui; do
+    ./pyuic6 "$i" > "ui_${i%.ui}.py"
+  done
+  popd
   python setup.py build
 }
 
diff --git a/fix-icon-search-path.patch b/fix-icon-search-path.patch
new file mode 100644
index 000000000000..c9ce8a082f16
--- /dev/null
+++ b/fix-icon-search-path.patch
@@ -0,0 +1,12 @@
+diff -aur package.pristine/mnemosyne/pyqt_ui/mnemosyne package.new/mnemosyne/pyqt_ui/mnemosyne
+--- package.pristine/mnemosyne/pyqt_ui/mnemosyne	2023-11-12 09:10:02.000000000 +0100
++++ package.new/mnemosyne/pyqt_ui/mnemosyne	2023-11-12 11:40:05.003659947 +0100
+@@ -209,7 +209,7 @@
+ 
+ # For system install:
+ QtCore.QDir.addSearchPath("icons", 
+-    os.path.abspath(__file__ + "/../../../pixmaps"))
++    os.path.abspath(__file__ + "/../../pixmaps"))
+ # For Windows installer:
+ QtCore.QDir.addSearchPath("icons", 
+     "pixmaps")