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

2018-12-11 Thread Johannes Löthberg via arch-commits 
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
===
--- PKGBUILD2018-12-11 20:09:16 UTC (rev 415527)
+++ PKGBUILD2018-12-11 20:22:39 UTC (rev 415528)
@@ -5,12 +5,12 @@
 # Contributor: Dave Pretty 
 
 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.0 +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."

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

2018-08-22 Thread Johannes Löthberg via arch-commits 
Date: Wednesday, August 22, 2018 @ 15:06:36
  Author: demize
Revision: 373260

upgpkg: anki 2.1.2-1

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

+
 PKGBUILD   |   13 +++--
 makefile-fix.patch |   25 +
 2 files changed, 28 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-22 14:50:24 UTC (rev 373259)
+++ PKGBUILD2018-08-22 15:06:36 UTC (rev 373260)
@@ -6,7 +6,7 @@
 # Contributor: Dave Pretty 
 
 pkgname=anki
-pkgver=2.1.0rc1
+pkgver=2.1.2
 pkgrel=1
 
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) 
efficiently"
@@ -16,19 +16,20 @@
 
 depends=('qt5-webengine' 'python-beautifulsoup4' 'python-pyaudio'
  'python-pyqt5' 'python-requests' 'python-send2trash'
- 'python-decorator' 'python-markdown')
+ 'python-decorator' 'python-markdown'
+ 'desktop-file-utils')
 optdepends=('lame: record sound'
 'mplayer: play sound')
 
-source=(https://apps.ankiweb.net/downloads/beta/anki-$pkgver-linux-amd64.tar.bz2
+source=(https://apps.ankiweb.net/downloads/current/anki-$pkgver-linux-amd64.tar.bz2
 makefile-fix.patch)
-sha256sums=('f2cf9b854a26654bbbd2a6a75c8d15dafc79cd4f3c0bd72962ea5ed32e4487de'
-'0e9e75cec931ed5b81fbf3d27ab151409cc5044204f92c1e68149013f8688b10')
+sha256sums=('e020d1b01c2075573f118fd6a0fa86d468a93ef43f3b72e9c6a9484bfd140b03'
+'4dd1c4c93fc50cfd6d0c52c4aae24bea23554840a3fd1b46dcb47305ee618668')
 
 prepare() {
   cd anki-$pkgver-linux-amd64
 
-  patch <"$srcdir"/makefile-fix.patch
+  patch -p1 <"$srcdir"/makefile-fix.patch
 }
 
 package() {

Modified: makefile-fix.patch
===
--- makefile-fix.patch  2018-08-22 14:50:24 UTC (rev 373259)
+++ makefile-fix.patch  2018-08-22 15:06:36 UTC (rev 373260)
@@ -1,6 +1,6 @@
 Makefile.old   2018-05-28 21:48:31.247309797 +0200
-+++ Makefile   2018-05-28 21:49:39.073973458 +0200
-@@ -6,23 +6,20 @@
+--- a/Makefile 2018-08-20 09:16:58.0 +0200
 b/Makefile 2018-08-22 16:51:04.612964722 +0200
+@@ -6,33 +6,30 @@
@echo "Uninstall with 'sudo make uninstall'"
  
  install:
@@ -24,7 +24,7 @@
 -  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-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
@@ -37,3 +37,20 @@
@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."