[arch-commits] Commit in anki/trunk (PKGBUILD makefile-fix.patch)

[Johannes Löthberg]

    Date: Tuesday, December 11, 2018 @ 20:22:39
  Author: demize
Revision: 415528

upgpkg: anki 2.1.6-1

Anki now officially supports Qt 5.12, so no longer using bundled libs.

Modified:
  anki/trunk/PKGBUILD
Deleted:
  anki/trunk/makefile-fix.patch

--------------------+
 PKGBUILD           |   19 +++++------------
 makefile-fix.patch |   56 ---------------------------------------------------
 2 files changed, 6 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-11 20:09:16 UTC (rev 415527)
+++ PKGBUILD	2018-12-11 20:22:39 UTC (rev 415528)
@@ -5,12 +5,12 @@
 # Contributor: Dave Pretty <david dot pretty at gmail dot com>
 
 pkgname=anki
-pkgver=2.1.4
+pkgver=2.1.6
 pkgrel=1
 
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
 url="https://ankisrs.net/"
-arch=('x86_64')
+arch=('any')
 license=('AGPL3')
 
 depends=('qt5-webengine' 'python-beautifulsoup4' 'python-pyaudio'
@@ -18,21 +18,14 @@
          'python-decorator' 'python-markdown'
          'desktop-file-utils')
 optdepends=('lame: record sound'
+            'mpv: play sound (prefered over mplayer)'
             'mplayer: play sound')
 
-source=(https://apps.ankiweb.net/downloads/current/anki-$pkgver-linux-amd64.tar.bz2
-        makefile-fix.patch)
-sha256sums=('9845379e3ff551b33801cab88853a3b0fc35674b031f7734d8b3035351b314c7'
-            '4dd1c4c93fc50cfd6d0c52c4aae24bea23554840a3fd1b46dcb47305ee618668')
+source=(https://apps.ankiweb.net/downloads/current/anki-$pkgver-source.tgz)
+sha256sums=('104fc85f1a7efa4406ed53666279a3aa3303a811bdc3cb62ca1376b5132c4e50')
 
-prepare() {
-  cd anki-$pkgver-linux-amd64
-
-  patch -p1 <"$srcdir"/makefile-fix.patch
-}
-
 package() {
-  cd anki-$pkgver-linux-amd64
+  cd anki-$pkgver
 
   make DESTDIR="$pkgdir" PREFIX=/usr install
 }

Deleted: makefile-fix.patch
===================================================================
--- makefile-fix.patch	2018-12-11 20:09:16 UTC (rev 415527)
+++ makefile-fix.patch	2018-12-11 20:22:39 UTC (rev 415528)
@@ -1,56 +0,0 @@
---- a/Makefile	2018-08-20 09:16:58.000000000 +0200
-+++ b/Makefile	2018-08-22 16:51:04.612964722 +0200
-@@ -6,33 +6,30 @@
- 	@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-colpkg
--	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."
- 
- uninstall:
--	-xdg-mime uninstall ${PREFIX}/share/anki/anki.xml
--	rm -rf ${PREFIX}/share/anki
--	rm -rf ${PREFIX}/bin/anki
--	rm -rf ${PREFIX}/share/pixmaps/anki.xpm
--	rm -rf ${PREFIX}/share/pixmaps/anki.png
--	rm -rf ${PREFIX}/share/applications/anki.desktop
--	rm -rf ${PREFIX}/share/man/man1/anki.1
-+	-xdg-mime uninstall $(DESTDIR)${PREFIX}/share/anki/anki.xml
-+	rm -rf $(DESTDIR)${PREFIX}/share/anki
-+	rm -rf $(DESTDIR)${PREFIX}/bin/anki
-+	rm -rf $(DESTDIR)${PREFIX}/share/pixmaps/anki.xpm
-+	rm -rf $(DESTDIR)${PREFIX}/share/pixmaps/anki.png
-+	rm -rf $(DESTDIR)${PREFIX}/share/applications/anki.desktop
-+	rm -rf $(DESTDIR)${PREFIX}/share/man/man1/anki.1
- 	@echo
- 	@echo "Uninstall complete."