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

[Johannes Löthberg]

    Date: Monday, December 25, 2017 @ 16:21:52
  Author: demize
Revision: 276018

upgpkg: anki 2.1.0beta29-2

Revert patch that makes it not run on 5.10.  I can't reproduce the issue, and even if I could, we can't do much more than wait for any bugs to be worked out.

Added:
  anki/trunk/0001-Revert-refuse-to-run-on-qt-5.10.patch
Modified:
  anki/trunk/PKGBUILD

--------------------------------------------+
 0001-Revert-refuse-to-run-on-qt-5.10.patch |   24 ++++++++++++++++++++++++
 PKGBUILD                                   |   14 +++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

Added: 0001-Revert-refuse-to-run-on-qt-5.10.patch
===================================================================
--- 0001-Revert-refuse-to-run-on-qt-5.10.patch	                        (rev 0)
+++ 0001-Revert-refuse-to-run-on-qt-5.10.patch	2017-12-25 16:21:52 UTC (rev 276018)
@@ -0,0 +1,24 @@
+From 6cb98293898c20e34c6ed3ebdb54f757c1a5a768 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
+Date: Mon, 25 Dec 2017 17:17:13 +0100
+Subject: [PATCH] Revert "refuse to run on qt 5.10"
+
+This reverts commit 65b826d787aff5344ee35707ba3ed21b0678cb7a.
+---
+ aqt/qt.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/aqt/qt.py b/aqt/qt.py
+index d2a87d1..0afb43a 100644
+--- a/aqt/qt.py
++++ b/aqt/qt.py
+@@ -40,5 +40,3 @@ qtpoint = QT_VERSION & 0xff
+ 
+ if qtmajor < 5 or (qtmajor == 5 and qtminor < 9):
+     raise Exception("Anki requires Qt 5.9.0+")
+-if qtmajor == 5 and qtminor == 10:
+-    raise Exception("Qt 5.10 is known to be buggy.")
+\ No newline at end of file
+-- 
+2.15.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-25 13:56:49 UTC (rev 276017)
+++ PKGBUILD	2017-12-25 16:21:52 UTC (rev 276018)
@@ -7,7 +7,7 @@
 
 pkgname=anki
 pkgver=2.1.0beta29
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="https://ankisrs.net/"
@@ -20,9 +20,17 @@
 optdepends=('lame: record sound'
             'mplayer: play sound')
 
-source=(https://apps.ankiweb.net/downloads/beta/anki-$pkgver-source.tgz)
-sha256sums=('7b412ff40a7fc347a85a5ca6c234c5aa4d3919d1ca9dc1729095abdc4e8ca6dd')
+source=(https://apps.ankiweb.net/downloads/beta/anki-$pkgver-source.tgz
+        0001-Revert-refuse-to-run-on-qt-5.10.patch)
+sha256sums=('7b412ff40a7fc347a85a5ca6c234c5aa4d3919d1ca9dc1729095abdc4e8ca6dd'
+            '9f10126ffc9e9a3552bee20b750d6a43ec631280ad0838c9f7d2b188998c5ac1')
 
+prepare() {
+  cd anki-$pkgver
+
+  patch -p1 <"$srcdir"/0001-Revert-refuse-to-run-on-qt-5.10.patch
+}
+
 package() {
   cd anki-$pkgver
   mkdir -p "$pkgdir"/usr/{bin,share/{anki,pixmaps,applications,man/man1}}