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

[Johannes Löthberg]

    Date: Monday, May 28, 2018 @ 20:07:33
  Author: demize
Revision: 333083

Use upstream release due to Qt 5.11 incompatibilities FS#58734

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

--------------------------------------------+
 0001-Revert-refuse-to-run-on-qt-5.10.patch |   24 ----------------
 PKGBUILD                                   |   22 ++++++---------
 makefile-fix.patch                         |   39 +++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 36 deletions(-)

Deleted: 0001-Revert-refuse-to-run-on-qt-5.10.patch
===================================================================
--- 0001-Revert-refuse-to-run-on-qt-5.10.patch	2018-05-28 18:41:27 UTC (rev 333082)
+++ 0001-Revert-refuse-to-run-on-qt-5.10.patch	2018-05-28 20:07:33 UTC (rev 333083)
@@ -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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-28 18:41:27 UTC (rev 333082)
+++ PKGBUILD	2018-05-28 20:07:33 UTC (rev 333083)
@@ -7,11 +7,11 @@
 
 pkgname=anki
 pkgver=2.1.0beta39
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="https://ankisrs.net/"
-arch=('any')
+arch=('x86_64')
 license=('AGPL3')
 
 depends=('qt5-webengine' 'python-beautifulsoup4' 'python-pyaudio'
@@ -20,21 +20,19 @@
 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')
+source=(https://apps.ankiweb.net/downloads/beta/anki-$pkgver-amd64.tar.bz2
+        makefile-fix.patch)
+sha256sums=('19797979016d898849475b1e635c4e34a34d439f89421febe452199df76bf2a9'
+            '0e9e75cec931ed5b81fbf3d27ab151409cc5044204f92c1e68149013f8688b10')
 
 prepare() {
-  cd anki-$pkgver
+  cd anki-$pkgver-amd64
 
-  patch -p1 <"$srcdir"/0001-Revert-refuse-to-run-on-qt-5.10.patch
+  patch <"$srcdir"/makefile-fix.patch
 }
 
 package() {
-  cd anki-$pkgver
+  cd anki-$pkgver-amd64
 
-  make install DESTDIR="$pkgdir"
-
-  sed -i '$ iimport os\nos.environ["QTWEBENGINE_DISABLE_SANDBOX"] = "1"' "$pkgdir"/usr/bin/anki
+  make DESTDIR="$pkgdir" PREFIX=/usr install
 }

Added: makefile-fix.patch
===================================================================
--- makefile-fix.patch	                        (rev 0)
+++ makefile-fix.patch	2018-05-28 20:07:33 UTC (rev 333083)
@@ -0,0 +1,39 @@
+--- Makefile.old	2018-05-28 21:48:31.247309797 +0200
++++ Makefile	2018-05-28 21:49:39.073973458 +0200
+@@ -6,23 +6,20 @@
+ 	@echo "Uninstall with 'sudo make uninstall'"
+ 
+ install:
+-	rm -rf ${PREFIX}/share/anki
+-	mkdir -p ${PREFIX}/share/anki
+-	cp -av * ${PREFIX}/share/anki/
+-	mkdir -p ${PREFIX}/bin
+-	ln -sf ${PREFIX}/share/anki/bin/anki ${PREFIX}/bin/
++	rm -rf $(DESTDIR)${PREFIX}/share/anki
++	mkdir -p $(DESTDIR)${PREFIX}/share/anki
++	cp -av * $(DESTDIR)${PREFIX}/share/anki/
++	mkdir -p $(DESTDIR)${PREFIX}/bin
++	ln -sf ${PREFIX}/share/anki/bin/anki $(DESTDIR)${PREFIX}/bin/
+ 	# fix a previous packaging issue where we created this as a file
+-	(test -f ${PREFIX}/share/applications && rm ${PREFIX}/share/applications)||true
+-	mkdir -p ${PREFIX}/share/pixmaps
+-	mkdir -p ${PREFIX}/share/applications
+-	mkdir -p ${PREFIX}/share/man/man1
+-	cd ${PREFIX}/share/anki && (\
+-	mv anki.xpm anki.png ${PREFIX}/share/pixmaps/;\
+-	mv anki.desktop ${PREFIX}/share/applications/;\
+-	mv anki.1 ${PREFIX}/share/man/man1/)
+-	xdg-mime install anki.xml --novendor
+-	xdg-mime default anki.desktop application/x-anki
+-	xdg-mime default anki.desktop application/x-apkg
++	(test -f $(DESTDIR)${PREFIX}/share/applications && rm $(DESTDIR)${PREFIX}/share/applications)||true
++	mkdir -p $(DESTDIR)${PREFIX}/share/pixmaps
++	mkdir -p $(DESTDIR)${PREFIX}/share/applications
++	mkdir -p $(DESTDIR)${PREFIX}/share/man/man1
++	cd $(DESTDIR)${PREFIX}/share/anki && (\
++	mv anki.xpm anki.png $(DESTDIR)${PREFIX}/share/pixmaps/;\
++	mv anki.desktop $(DESTDIR)${PREFIX}/share/applications/;\
++	mv anki.1 $(DESTDIR)${PREFIX}/share/man/man1/)
+ 	@echo
+ 	@echo "Install complete. Type 'anki' to run."
+