[arch-commits] Commit in anki/repos/community-any (4 files)

Johannes Löthberg demize at archlinux.org
Sun May 13 10:19:59 UTC 2018


    Date: Sunday, May 13, 2018 @ 10:19:58
  Author: demize
Revision: 321592

archrelease: copy trunk to community-any

Added:
  anki/repos/community-any/0001-Revert-refuse-to-run-on-qt-5.10.patch
    (from rev 321591, anki/trunk/0001-Revert-refuse-to-run-on-qt-5.10.patch)
  anki/repos/community-any/PKGBUILD
    (from rev 321591, anki/trunk/PKGBUILD)
Deleted:
  anki/repos/community-any/0001-Revert-refuse-to-run-on-qt-5.10.patch
  anki/repos/community-any/PKGBUILD

--------------------------------------------+
 0001-Revert-refuse-to-run-on-qt-5.10.patch |   48 +++++++-------
 PKGBUILD                                   |   88 ++++++++++++---------------
 2 files changed, 64 insertions(+), 72 deletions(-)

Deleted: 0001-Revert-refuse-to-run-on-qt-5.10.patch
===================================================================
--- 0001-Revert-refuse-to-run-on-qt-5.10.patch	2018-05-13 10:19:54 UTC (rev 321591)
+++ 0001-Revert-refuse-to-run-on-qt-5.10.patch	2018-05-13 10:19:58 UTC (rev 321592)
@@ -1,24 +0,0 @@
-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
-

Copied: anki/repos/community-any/0001-Revert-refuse-to-run-on-qt-5.10.patch (from rev 321591, anki/trunk/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	2018-05-13 10:19:58 UTC (rev 321592)
@@ -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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-13 10:19:54 UTC (rev 321591)
+++ PKGBUILD	2018-05-13 10:19:58 UTC (rev 321592)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Timm Preetz <timm at preetz.us>
-# Contributor: Michael 'manveru' Fellinger <m.fellinger at gmail.com>
-# Contributor: Dave Pretty <david dot pretty at gmail dot com>
-
-pkgname=anki
-pkgver=2.1.0beta37
-pkgrel=2
-
-pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
-url="https://ankisrs.net/"
-arch=('any')
-license=('AGPL3')
-
-depends=('qt5-webengine' 'python-beautifulsoup4' 'python-pyaudio'
-         'python-pyqt5' 'python-requests' 'python-send2trash'
-         'python-decorator' 'python-markdown')
-optdepends=('lame: record sound'
-            'mplayer: play sound')
-
-source=(https://apps.ankiweb.net/downloads/beta/anki-$pkgver-source.tgz
-        0001-Revert-refuse-to-run-on-qt-5.10.patch)
-sha256sums=('459e01d3bc132b0cb26d846e6d48b20eb416d55d7d19b569690b4f4961021860'
-            '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}}
-  cp -av * "$pkgdir"/usr/share/anki/
-  cd "$pkgdir"/usr/share/anki
-
-  mv tools/runanki.system "$pkgdir"/usr/bin/anki
-  # Work around https://bugs.archlinux.org/task/57540
-  sed -i '$ iimport os\nos.environ["QTWEBENGINE_DISABLE_SANDBOX"] = "1"' "$pkgdir"/usr/bin/anki
-
-  mv anki.xpm anki.png "$pkgdir"/usr/share/pixmaps
-  mv anki.desktop "$pkgdir"/usr/share/applications
-  mv anki.1 "$pkgdir"/usr/share/man/man1
-  rm -rf "$pkgdir"/usr/share/anki/{tests,tools,anki.bat}
-}

Copied: anki/repos/community-any/PKGBUILD (from rev 321591, anki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-13 10:19:58 UTC (rev 321592)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Timm Preetz <timm at preetz.us>
+# Contributor: Michael 'manveru' Fellinger <m.fellinger at gmail.com>
+# Contributor: Dave Pretty <david dot pretty at gmail dot com>
+
+pkgname=anki
+pkgver=2.1.0beta39
+pkgrel=1
+
+pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
+url="https://ankisrs.net/"
+arch=('any')
+license=('AGPL3')
+
+depends=('qt5-webengine' 'python-beautifulsoup4' 'python-pyaudio'
+         'python-pyqt5' 'python-requests' 'python-send2trash'
+         'python-decorator' 'python-markdown')
+optdepends=('lame: record sound'
+            'mplayer: play sound')
+
+source=(https://apps.ankiweb.net/downloads/beta/anki-$pkgver-source.tgz
+        0001-Revert-refuse-to-run-on-qt-5.10.patch)
+sha256sums=('a6b511ac81bc7024b63ba997f1fd00880c4b574d6b52cedee2ef3d24fa36da49'
+            '9f10126ffc9e9a3552bee20b750d6a43ec631280ad0838c9f7d2b188998c5ac1')
+
+prepare() {
+  cd anki-$pkgver
+
+  patch -p1 <"$srcdir"/0001-Revert-refuse-to-run-on-qt-5.10.patch
+}
+
+package() {
+  cd anki-$pkgver
+
+  make install DESTDIR="$pkgdir"
+
+  sed -i '$ iimport os\nos.environ["QTWEBENGINE_DISABLE_SANDBOX"] = "1"' "$pkgdir"/usr/bin/anki
+}



More information about the arch-commits mailing list