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

Johannes Löthberg demize at archlinux.org
Wed Aug 22 15:06:52 UTC 2018


    Date: Wednesday, August 22, 2018 @ 15:06:51
  Author: demize
Revision: 373261

archrelease: copy trunk to community-x86_64

Added:
  anki/repos/community-x86_64/PKGBUILD
    (from rev 373260, anki/trunk/PKGBUILD)
  anki/repos/community-x86_64/makefile-fix.patch
    (from rev 373260, anki/trunk/makefile-fix.patch)
Deleted:
  anki/repos/community-x86_64/PKGBUILD
  anki/repos/community-x86_64/makefile-fix.patch

--------------------+
 PKGBUILD           |   77 ++++++++++++++++++++---------------------
 makefile-fix.patch |   95 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 95 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-22 15:06:36 UTC (rev 373260)
+++ PKGBUILD	2018-08-22 15:06:51 UTC (rev 373261)
@@ -1,38 +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.0rc1
-pkgrel=1
-
-pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
-url="https://ankisrs.net/"
-arch=('x86_64')
-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-linux-amd64.tar.bz2
-        makefile-fix.patch)
-sha256sums=('f2cf9b854a26654bbbd2a6a75c8d15dafc79cd4f3c0bd72962ea5ed32e4487de'
-            '0e9e75cec931ed5b81fbf3d27ab151409cc5044204f92c1e68149013f8688b10')
-
-prepare() {
-  cd anki-$pkgver-linux-amd64
-
-  patch <"$srcdir"/makefile-fix.patch
-}
-
-package() {
-  cd anki-$pkgver-linux-amd64
-
-  make DESTDIR="$pkgdir" PREFIX=/usr install
-}

Copied: anki/repos/community-x86_64/PKGBUILD (from rev 373260, anki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-22 15:06:51 UTC (rev 373261)
@@ -0,0 +1,39 @@
+# $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.2
+pkgrel=1
+
+pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
+url="https://ankisrs.net/"
+arch=('x86_64')
+license=('AGPL3')
+
+depends=('qt5-webengine' 'python-beautifulsoup4' 'python-pyaudio'
+         'python-pyqt5' 'python-requests' 'python-send2trash'
+         'python-decorator' 'python-markdown'
+         'desktop-file-utils')
+optdepends=('lame: record sound'
+            'mplayer: play sound')
+
+source=(https://apps.ankiweb.net/downloads/current/anki-$pkgver-linux-amd64.tar.bz2
+        makefile-fix.patch)
+sha256sums=('e020d1b01c2075573f118fd6a0fa86d468a93ef43f3b72e9c6a9484bfd140b03'
+            '4dd1c4c93fc50cfd6d0c52c4aae24bea23554840a3fd1b46dcb47305ee618668')
+
+prepare() {
+  cd anki-$pkgver-linux-amd64
+
+  patch -p1 <"$srcdir"/makefile-fix.patch
+}
+
+package() {
+  cd anki-$pkgver-linux-amd64
+
+  make DESTDIR="$pkgdir" PREFIX=/usr install
+}

Deleted: makefile-fix.patch
===================================================================
--- makefile-fix.patch	2018-08-22 15:06:36 UTC (rev 373260)
+++ makefile-fix.patch	2018-08-22 15:06:51 UTC (rev 373261)
@@ -1,39 +0,0 @@
---- 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."
- 

Copied: anki/repos/community-x86_64/makefile-fix.patch (from rev 373260, anki/trunk/makefile-fix.patch)
===================================================================
--- makefile-fix.patch	                        (rev 0)
+++ makefile-fix.patch	2018-08-22 15:06:51 UTC (rev 373261)
@@ -0,0 +1,56 @@
+--- 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."



More information about the arch-commits mailing list