[arch-commits] Commit in anki/repos (5 files)

Johannes Löthberg demize at archlinux.org
Sat Jun 2 21:35:03 UTC 2018


    Date: Saturday, June 2, 2018 @ 21:35:03
  Author: demize
Revision: 338482

archrelease: copy trunk to community-testing-x86_64

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

---------------------------------------------+
 /PKGBUILD                                   |   38 +++++++++++++++++++++++++
 /makefile-fix.patch                         |   39 ++++++++++++++++++++++++++
 community-any/PKGBUILD                      |   16 +++++++---
 community-testing-x86_64/PKGBUILD           |   38 -------------------------
 community-testing-x86_64/makefile-fix.patch |   39 --------------------------
 5 files changed, 88 insertions(+), 82 deletions(-)

Modified: community-any/PKGBUILD
===================================================================
--- community-any/PKGBUILD	2018-06-02 21:34:59 UTC (rev 338481)
+++ community-any/PKGBUILD	2018-06-02 21:35:03 UTC (rev 338482)
@@ -6,7 +6,7 @@
 # Contributor: Dave Pretty <david dot pretty at gmail dot com>
 
 pkgname=anki
-pkgver=2.1.0beta39
+pkgver=2.1.0beta40
 pkgrel=1
 
 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently"
@@ -21,14 +21,20 @@
             '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')
+        0001-aqt-webview-Make-acceptNavigationRequest-accept-data.patch
+        0002-Stop-checking-Qt-version.patch
+        0003-Create-a-widget-for-AnkiWebView.patch)
+sha256sums=('a9d03adfb40f66e9e3f8c71ea19c5406ae65d80e31f60bad7f12f65eefa1b52f'
+            '7744c877601badd705c7f6f7406ccc089c3548ccd413b8d97def90c16a34923e'
+            '45082bf74e9fa55b48558dab112fcd132f46a33af0f3435781beb16e5cc328c2'
+            '75afd8e0f23b5e84083c92585598d26d4c3be461ba4981b0aaf995747ed47e59')
 
 prepare() {
   cd anki-$pkgver
 
-  patch -p1 <"$srcdir"/0001-Revert-refuse-to-run-on-qt-5.10.patch
+  patch -p1 <"$srcdir"/0001-aqt-webview-Make-acceptNavigationRequest-accept-data.patch
+  patch -p1 <"$srcdir"/0002-Stop-checking-Qt-version.patch
+  patch -p1 <"$srcdir"/0003-Create-a-widget-for-AnkiWebView.patch
 }
 
 package() {

Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD	2018-06-02 21:34:59 UTC (rev 338481)
+++ community-testing-x86_64/PKGBUILD	2018-06-02 21:35:03 UTC (rev 338482)
@@ -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.0beta39
-pkgrel=2
-
-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-amd64.tar.bz2
-        makefile-fix.patch)
-sha256sums=('19797979016d898849475b1e635c4e34a34d439f89421febe452199df76bf2a9'
-            '0e9e75cec931ed5b81fbf3d27ab151409cc5044204f92c1e68149013f8688b10')
-
-prepare() {
-  cd anki-$pkgver-amd64
-
-  patch <"$srcdir"/makefile-fix.patch
-}
-
-package() {
-  cd anki-$pkgver-amd64
-
-  make DESTDIR="$pkgdir" PREFIX=/usr install
-}

Copied: anki/repos/community-testing-x86_64/PKGBUILD (from rev 338481, anki/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2018-06-02 21:35:03 UTC (rev 338482)
@@ -0,0 +1,38 @@
+# $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.0beta40
+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-amd64.tar.bz2
+        makefile-fix.patch)
+sha256sums=('d833562df63d4e82acb728c3ccfdf81a2246897f4b9e0bbeb6437bfd6cc4b780'
+            '0e9e75cec931ed5b81fbf3d27ab151409cc5044204f92c1e68149013f8688b10')
+
+prepare() {
+  cd anki-$pkgver-amd64
+
+  patch <"$srcdir"/makefile-fix.patch
+}
+
+package() {
+  cd anki-$pkgver-amd64
+
+  make DESTDIR="$pkgdir" PREFIX=/usr install
+}

Deleted: community-testing-x86_64/makefile-fix.patch
===================================================================
--- community-testing-x86_64/makefile-fix.patch	2018-06-02 21:34:59 UTC (rev 338481)
+++ community-testing-x86_64/makefile-fix.patch	2018-06-02 21:35:03 UTC (rev 338482)
@@ -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-testing-x86_64/makefile-fix.patch (from rev 338481, anki/trunk/makefile-fix.patch)
===================================================================
--- community-testing-x86_64/makefile-fix.patch	                        (rev 0)
+++ community-testing-x86_64/makefile-fix.patch	2018-06-02 21:35:03 UTC (rev 338482)
@@ -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."
+ 



More information about the arch-commits mailing list