Update to 24.04.1 and deprecating the patch

3 files changed, 18 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44d40dd30f99..d5e6e3f5942d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = anki-bin
 	pkgdesc = Helps you remember facts (like words/phrases in a foreign language) efficiently. Installed with wheel.
-	pkgver = 24.04
+	pkgver = 24.04.1
 	pkgrel = 1
 	url = https://apps.ankiweb.net/
 	arch = x86_64
@@ -25,34 +25,31 @@ pkgbase = anki-bin
 	optdepends = lame: record sound
 	optdepends = mpv: play sound. prefered over mplayer
 	optdepends = mplayer: play sound
-	provides = anki=24.04
+	provides = anki=24.04.1
 	conflicts = anki
-	noextract = anki-24.04-cp39-abi3-manylinux_2_28_x86_64.whl
-	noextract = aqt-24.04-py3-none-any.whl
+	noextract = anki-24.04.1-cp39-abi3-manylinux_2_28_x86_64.whl
+	noextract = aqt-24.04.1-py3-none-any.whl
 	noextract = runanki.py
 	noextract = anki.1
 	noextract = anki.desktop
 	noextract = anki.png
 	noextract = anki.xml
 	noextract = anki.xpm
-	noextract = ignore-pip_system_certs.patch
-	source = https://files.pythonhosted.org/packages/cp39/a/anki/anki-24.04-cp39-abi3-manylinux_2_28_x86_64.whl
-	source = https://files.pythonhosted.org/packages/py3/a/aqt/aqt-24.04-py3-none-any.whl
-	source = runanki-24.04.py::https://raw.githubusercontent.com/ankitects/anki/24.04/qt/runanki.py
-	source = anki-24.04.1::https://raw.githubusercontent.com/ankitects/anki/24.04/qt/bundle/lin/anki.1
-	source = anki-24.04.desktop::https://raw.githubusercontent.com/ankitects/anki/24.04/qt/bundle/lin/anki.desktop
-	source = anki-24.04.png::https://raw.githubusercontent.com/ankitects/anki/24.04/qt/bundle/lin/anki.png
-	source = anki-24.04.xml::https://raw.githubusercontent.com/ankitects/anki/24.04/qt/bundle/lin/anki.xml
-	source = anki-24.04.xpm::https://raw.githubusercontent.com/ankitects/anki/24.04/qt/bundle/lin/anki.xpm
-	source = ignore-pip_system_certs.patch
-	sha256sums = cfc89e1608c9817f1f3fea156e64a7e8824dbf88e7dabc7d49c5f1ff63d8361c
-	sha256sums = db1f77a93b134fd516ba5524927b6de86cab2207a9be09fe50efe0bf77eac602
+	source = https://files.pythonhosted.org/packages/cp39/a/anki/anki-24.04.1-cp39-abi3-manylinux_2_28_x86_64.whl
+	source = https://files.pythonhosted.org/packages/py3/a/aqt/aqt-24.04.1-py3-none-any.whl
+	source = runanki-24.04.1.py::https://raw.githubusercontent.com/ankitects/anki/24.04.1/qt/runanki.py
+	source = anki-24.04.1.1::https://raw.githubusercontent.com/ankitects/anki/24.04.1/qt/bundle/lin/anki.1
+	source = anki-24.04.1.desktop::https://raw.githubusercontent.com/ankitects/anki/24.04.1/qt/bundle/lin/anki.desktop
+	source = anki-24.04.1.png::https://raw.githubusercontent.com/ankitects/anki/24.04.1/qt/bundle/lin/anki.png
+	source = anki-24.04.1.xml::https://raw.githubusercontent.com/ankitects/anki/24.04.1/qt/bundle/lin/anki.xml
+	source = anki-24.04.1.xpm::https://raw.githubusercontent.com/ankitects/anki/24.04.1/qt/bundle/lin/anki.xpm
+	sha256sums = 0ac1ffae65ee6e4f2a9e657de3311b04fa4166776b3ce89913539f7524f612a5
+	sha256sums = 6b4814321e82e94c018d6f002543b148efe6a7c1d17c263f9660a97868f7baad
 	sha256sums = 9648e7e915f51f08e05c48ef5f39b4015922fe1cf3d7f2895535ef10ef4507ae
 	sha256sums = 8b9fec8fdf2897b4722f8cee169e9fb1e46cee90d3fb03ee12587e30c2f5dad7
 	sha256sums = 53db2e5bfeb00aa249667e09466a34bfacb17b61097875a8cdd93ee1a9380b9a
 	sha256sums = 97ad2134ef1a7686789c7becd8bd05dd8693cf0d3127951ca6ba7b29a80b402a
 	sha256sums = 2845a528fb3a064b67404a03d72bfaba9b421cb220b25228b815946c6553ce38
 	sha256sums = d814c62e38246b6e4ba73ee037647a29675925167518137f05a8f9e60c258b6e
-	sha256sums = 55b55ce37bc23782b479ee9dc0fe706032a400d447f890dc34b0a9e6b0d8a590
 
 pkgname = anki-bin
diff --git a/PKGBUILD b/PKGBUILD
index fd485e1fe531..98d4e8a07e73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _aqt=aqt
 _py=cp39
 
 pkgname=anki-bin
-pkgver=24.04
+pkgver=24.04.1
 pkgrel=1
 pkgdesc='Helps you remember facts (like words/phrases in a foreign language) efficiently.
 Installed with wheel.'
@@ -62,24 +62,21 @@ source=(
 	"anki-$pkgver.png::https://raw.githubusercontent.com/ankitects/anki/$pkgver/qt/bundle/lin/anki.png"
 	"anki-$pkgver.xml::https://raw.githubusercontent.com/ankitects/anki/$pkgver/qt/bundle/lin/anki.xml"
 	"anki-$pkgver.xpm::https://raw.githubusercontent.com/ankitects/anki/$pkgver/qt/bundle/lin/anki.xpm"
-    "ignore-pip_system_certs.patch"
 )
 noextract=("${source[@]##*/}")
-sha256sums=('cfc89e1608c9817f1f3fea156e64a7e8824dbf88e7dabc7d49c5f1ff63d8361c'
-            'db1f77a93b134fd516ba5524927b6de86cab2207a9be09fe50efe0bf77eac602'
+sha256sums=('0ac1ffae65ee6e4f2a9e657de3311b04fa4166776b3ce89913539f7524f612a5'
+            '6b4814321e82e94c018d6f002543b148efe6a7c1d17c263f9660a97868f7baad'
             '9648e7e915f51f08e05c48ef5f39b4015922fe1cf3d7f2895535ef10ef4507ae'
             '8b9fec8fdf2897b4722f8cee169e9fb1e46cee90d3fb03ee12587e30c2f5dad7'
             '53db2e5bfeb00aa249667e09466a34bfacb17b61097875a8cdd93ee1a9380b9a'
             '97ad2134ef1a7686789c7becd8bd05dd8693cf0d3127951ca6ba7b29a80b402a'
             '2845a528fb3a064b67404a03d72bfaba9b421cb220b25228b815946c6553ce38'
-            'd814c62e38246b6e4ba73ee037647a29675925167518137f05a8f9e60c258b6e'
-            '55b55ce37bc23782b479ee9dc0fe706032a400d447f890dc34b0a9e6b0d8a590')
+            'd814c62e38246b6e4ba73ee037647a29675925167518137f05a8f9e60c258b6e')
 
 package() {
 	python -m installer --destdir="$pkgdir" $_anki_whl
 	python -m installer --destdir="$pkgdir" $_aqt_whl
 
-    patch --directory="$pkgdir" --forward --strip=1 --input="$srcdir/ignore-pip_system_certs.patch"
 	install -Dm755 runanki-$pkgver.py "$pkgdir/usr/bin/anki"
 	install -Dm644 anki-$pkgver.1 "$pkgdir/usr/share/man/man1/anki.1"
 	install -Dm644 anki-$pkgver.desktop "$pkgdir/usr/share/applications/anki.desktop"
diff --git a/ignore-pip_system_certs.patch b/ignore-pip_system_certs.patch
deleted file mode 100644
index 6a291920aad7..000000000000
--- a/ignore-pip_system_certs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --unified --recursive --text --color anki-bin/usr/lib/python3.11/site-packages/aqt/__init__.py new/usr/lib/python3.11/site-packages/aqt/__init__.py
---- anki-bin/usr/lib/python3.11/site-packages/aqt/__init__.py	2024-04-04 13:01:44.960181070 +0900
-+++ new/usr/lib/python3.11/site-packages/aqt/__init__.py	2024-04-04 13:05:10.340210819 +0900
-@@ -6,7 +6,10 @@
- import logging
- import sys
- 
--import pip_system_certs.wrapt_requests
-+try:
-+    import pip_system_certs.wrapt_requests
-+except ModuleNotFoundError:
-+    pass
- 
- if sys.version_info[0] < 3 or sys.version_info[1] < 9:
-     raise Exception("Anki requires Python 3.9+")