[arch-commits] Commit in anki/trunk (5 files)

Johannes Löthberg demize at archlinux.org
Mon May 4 17:36:42 UTC 2020


    Date: Monday, May 4, 2020 @ 17:36:41
  Author: demize
Revision: 624754

upgpkg: anki 2.1.25-1

Modified:
  anki/trunk/0001-Move-aqt_data-to-sys.prefix-share.patch
  anki/trunk/0002-Remove-bad-build-steps-from-makefiles.patch
  anki/trunk/0003-Compile-.py-s-before-building-wheel.patch
  anki/trunk/0004-Disable-auto-updates.patch
  anki/trunk/PKGBUILD

--------------------------------------------------+
 0001-Move-aqt_data-to-sys.prefix-share.patch     |    4 +-
 0002-Remove-bad-build-steps-from-makefiles.patch |    4 +-
 0003-Compile-.py-s-before-building-wheel.patch   |    2 -
 0004-Disable-auto-updates.patch                  |   30 ++++++++++-----------
 PKGBUILD                                         |   26 +++++++++++-------
 5 files changed, 37 insertions(+), 29 deletions(-)

Modified: 0001-Move-aqt_data-to-sys.prefix-share.patch
===================================================================
--- 0001-Move-aqt_data-to-sys.prefix-share.patch	2020-05-04 17:27:06 UTC (rev 624753)
+++ 0001-Move-aqt_data-to-sys.prefix-share.patch	2020-05-04 17:36:41 UTC (rev 624754)
@@ -1,7 +1,7 @@
-From 0c0cceb3ac9ceb18effa5e82d655cd5a01a25ce9 Mon Sep 17 00:00:00 2001
+From a0a9ac1aeb8b8678f1102aed81010a901ad8d9e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
 Date: Sun, 29 Mar 2020 06:24:43 +0200
-Subject: [PATCH 1/2] Move aqt_data to sys.prefix/share
+Subject: [PATCH 1/4] Move aqt_data to sys.prefix/share
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

Modified: 0002-Remove-bad-build-steps-from-makefiles.patch
===================================================================
--- 0002-Remove-bad-build-steps-from-makefiles.patch	2020-05-04 17:27:06 UTC (rev 624753)
+++ 0002-Remove-bad-build-steps-from-makefiles.patch	2020-05-04 17:36:41 UTC (rev 624754)
@@ -1,7 +1,7 @@
-From a050cd2b5a3af880b98e25cf1058d36e1dd6f333 Mon Sep 17 00:00:00 2001
+From 5f8a3a14906d4ad20cd0d1be6b90e0922a5ba098 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
 Date: Sun, 29 Mar 2020 05:54:00 +0200
-Subject: [PATCH 2/2] Remove bad build steps from makefiles
+Subject: [PATCH 2/4] Remove bad build steps from makefiles
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

Modified: 0003-Compile-.py-s-before-building-wheel.patch
===================================================================
--- 0003-Compile-.py-s-before-building-wheel.patch	2020-05-04 17:27:06 UTC (rev 624753)
+++ 0003-Compile-.py-s-before-building-wheel.patch	2020-05-04 17:36:41 UTC (rev 624754)
@@ -1,4 +1,4 @@
-From 58137d3b74da646ad3af6bfeed9012fa9ed46aa1 Mon Sep 17 00:00:00 2001
+From d1e3ca1144b664421facf30acd5524cd28961a3c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
 Date: Mon, 4 May 2020 18:46:38 +0200
 Subject: [PATCH 3/4] Compile .py's before building wheel

Modified: 0004-Disable-auto-updates.patch
===================================================================
--- 0004-Disable-auto-updates.patch	2020-05-04 17:27:06 UTC (rev 624753)
+++ 0004-Disable-auto-updates.patch	2020-05-04 17:36:41 UTC (rev 624754)
@@ -1,4 +1,4 @@
-From 01cb07d2d97f621a510c63157e94092d98856b4d Mon Sep 17 00:00:00 2001
+From 2c15f97b0e682f8b7616f14ea3f3caab653a78f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
 Date: Mon, 4 May 2020 17:57:29 +0200
 Subject: [PATCH 4/4] Disable auto updates
@@ -8,22 +8,22 @@
 
 Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
 ---
- qt/aqt/profiles.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ qt/aqt/update.py | 2 ++
+ 1 file changed, 2 insertions(+)
 
-diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py
-index b8dff8ab..8946e80c 100644
---- a/qt/aqt/profiles.py
-+++ b/qt/aqt/profiles.py
-@@ -28,7 +28,7 @@ from aqt.utils import TR, locale_dir, showWarning, tr
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
+index 2513d84c..37656733 100644
+--- a/qt/aqt/update.py
++++ b/qt/aqt/update.py
+@@ -34,6 +34,8 @@ class LatestVersionFinder(QThread):
+         return d
  
- metaConf = dict(
-     ver=0,
--    updates=True,
-+    updates=False,
-     created=intTime(),
-     id=random.randrange(0, 2 ** 63),
-     lastMsg=-1,
+     def run(self):
++        return
++
+         if not self.config["updates"]:
+             return
+         d = self._data()
 -- 
 2.26.2
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-04 17:27:06 UTC (rev 624753)
+++ PKGBUILD	2020-05-04 17:36:41 UTC (rev 624754)
@@ -4,8 +4,12 @@
 # Contributor: Michael 'manveru' Fellinger <m.fellinger at gmail.com>
 # Contributor: Dave Pretty <david dot pretty at gmail dot com>
 
+_core_i18n=88621bc
+_desktop_ftl=2c96d2d
+_desktop_i18n=edcf8c8
+
 pkgname=anki
-pkgver=2.1.24
+pkgver=2.1.25
 pkgrel=1
 
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
@@ -54,20 +58,24 @@
 
 source=(
 	anki-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/$pkgver.tar.gz
-	ankitects-anki-core-i18n-23c4dc5.tar.gz::https://github.com/ankitects/anki-core-i18n/tarball/23c4dc5bf5c88c782536ec48934ef6a379b10e72
-	ankitects-anki-desktop-ftl-255a12e.tar.gz::https://github.com/ankitects/anki-desktop-ftl/tarball/255a12eadf5c6afc22705ac9ab7c9e2982c7d2b1
-	ankitects-anki-desktop-i18n-edcf8c85.tar.gz::https://github.com/ankitects/anki-desktop-i18n/tarball/edcf8c85e9c0fb0038a8beed4d48765a6e1eb1a8
+
+	ankitects-anki-core-i18n-$_core_i18n.tar.gz::https://github.com/ankitects/anki-core-i18n/tarball/$_core_i18n
+	ankitects-anki-desktop-ftl-$_desktop_ftl.tar.gz::https://github.com/ankitects/anki-desktop-ftl/tarball/$_desktop_ftl
+	ankitects-anki-desktop-i18n-$_desktop_i18n.tar.gz::https://github.com/ankitects/anki-desktop-i18n/tarball/$_desktop_i18n
+
 	0001-Move-aqt_data-to-sys.prefix-share.patch
 	0002-Remove-bad-build-steps-from-makefiles.patch
 	0003-Compile-.py-s-before-building-wheel.patch
 	0004-Disable-auto-updates.patch
 )
-sha256sums=('1c4812e4a831b1332a5cfa736eedb2ac598c48d0206a21f072e426dc953266ed'
-            'ac9663da88d2e429e363c1878e1c9dabc59d1a82d12b1f6a9df86f7f345cbcf6'
-            '6cf6792023b619d1d5541b74b30d015c12b202a10579023390b1742928ad2eff'
+sha256sums=('b19c91c957055d25a91abebd6c61f53d6e23ac972d39639c54465918440fa853'
+            '221929f097436f5b4c5a47d58ba5bbde8b421477af61872e4374a509b559cc02'
+            '358d06085424a2bd71865cea79d4ca7d2c82d9abcdb7382f11ab07cb41592320'
             '7cbec154a2506c39550ba7c5ef7780ee42b3480296b1e480912c78cca20f8434'
-            '78ca8bd22f887ea2d47bd8938302a5a0be68bfee0ad8891a2f8ba60111d3b1a4'
-            '1de438587d92acb1ad19ab744d2c7974456718435512090cda5a1ad7a20f3e57')
+            '26162e6370e7763a8ec37e1690dc39c8b0f71e9d2524c452c330276b357cb18f'
+            '1bf87c408fd9e2a09cb39d8353af1e0dc64930ac819b4ffae555b14ed4644981'
+            '401d31ac5992c342778ba748eac6179da9d594e1ef93d0db8170fad643bab069'
+            '97048aa118281311f17b1e2154f55a2a2f1d84cbebbdc93459bca49e8f8f06fd')
 
 prepare() {
 	cd anki-$pkgver


More information about the arch-commits mailing list