Date: Friday, May 1, 2020 @ 20:03:57
Author: demize
Revision: 624251
archrelease: copy trunk to community-testing-x86_64
Added:
anki/repos/community-testing-x86_64/
anki/repos/community-testing-x86_64/0002-Remove-bad-build-steps-from-makefiles.patch
(from rev 624250,
anki/trunk/0002-Remove-bad-build-steps-from-makefiles.patch)
anki/repos/community-testing-x86_64/PKGBUILD
(from rev 624250, anki/trunk/PKGBUILD)
--------------------------------------------------+
0002-Remove-bad-build-steps-from-makefiles.patch | 66 +++++++++++++
PKGBUILD | 104 +++++++++++++++++++++
2 files changed, 170 insertions(+)
Copied:
anki/repos/community-testing-x86_64/0002-Remove-bad-build-steps-from-makefiles.patch
(from rev 624250, anki/trunk/0002-Remove-bad-build-steps-from-makefiles.patch)
===================================================================
--- community-testing-x86_64/0002-Remove-bad-build-steps-from-makefiles.patch
(rev 0)
+++ community-testing-x86_64/0002-Remove-bad-build-steps-from-makefiles.patch
2020-05-01 20:03:57 UTC (rev 624251)
@@ -0,0 +1,66 @@
+From a050cd2b5a3af880b98e25cf1058d36e1dd6f333 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com>
+Date: Sun, 29 Mar 2020 05:54:00 +0200
+Subject: [PATCH 2/2] Remove bad build steps from makefiles
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Johannes Löthberg <johan...@kyriasis.com>
+---
+ pylib/Makefile | 4 ++--
+ qt/Makefile | 2 +-
+ rspy/Makefile | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pylib/Makefile b/pylib/Makefile
+index b9e6aa63..feae25d8 100644
+--- a/pylib/Makefile
++++ b/pylib/Makefile
+@@ -41,7 +41,7 @@ all: check
+
+ PROTODEPS := $(wildcard ../proto/*.proto)
+
+-.build/py-proto: .build/dev-deps $(PROTODEPS)
++.build/py-proto: $(PROTODEPS)
+ protoc --proto_path=../proto --python_out=anki --mypy_out=anki
$(PROTODEPS)
+ perl -i'' -pe 's/from fluent_pb2/from anki.fluent_pb2/'
anki/backend_pb2.pyi
+ perl -i'' -pe 's/import fluent_pb2/import anki.fluent_pb2/'
anki/backend_pb2.py
+@@ -52,7 +52,7 @@ PROTODEPS := $(wildcard ../proto/*.proto)
+ python -m black anki/hooks.py
+ @touch $@
+
+-BUILD_STEPS := .build/vernum .build/run-deps .build/dev-deps .build/py-proto
anki/buildinfo.py .build/hooks
++BUILD_STEPS := .build/vernum .build/py-proto anki/buildinfo.py
+
+ # Checking
+ ######################
+diff --git a/qt/Makefile b/qt/Makefile
+index 2ebee696..c0ba93e3 100644
+--- a/qt/Makefile
++++ b/qt/Makefile
+@@ -64,7 +64,7 @@ TSDEPS := $(wildcard ts/src/*.ts) $(wildcard ts/scss/*.scss)
+ python -m black aqt/gui_hooks.py
+ @touch $@
+
+-BUILD_STEPS := .build/vernum .build/run-deps .build/dev-deps .build/js
.build/ui aqt/buildinfo.py .build/hooks .build/i18n
++BUILD_STEPS := .build/vernum .build/js .build/ui aqt/buildinfo.py .build/i18n
+
+ # Checking
+ ######################
+diff --git a/rspy/Makefile b/rspy/Makefile
+index 7506608d..01b7aff4 100644
+--- a/rspy/Makefile
++++ b/rspy/Makefile
+@@ -47,7 +47,7 @@ all: develop
+
+ develop: .build/develop
+
+-DEPS := .build/tools .build/vernum ../meta/buildhash \
++DEPS := .build/vernum ../meta/buildhash \
+ $(wildcard $(QT_FTL_TEMPLATES)/*.ftl) \
+ $(wildcard $(QT_FTL_LOCALES)/*/*.ftl) \
+ $(shell "${FIND}" ../rslib/src -name '*.rs') $(wildcard ../proto/*) \
+--
+2.26.2
+
Copied: anki/repos/community-testing-x86_64/PKGBUILD (from rev 624250,
anki/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2020-05-01 20:03:57 UTC (rev 624251)
@@ -0,0 +1,104 @@
+# Maintainer: Johannes Löthberg <johan...@kyriasis.com>
+# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Timm Preetz <t...@preetz.us>
+# Contributor: Michael 'manveru' Fellinger <m.fellin...@gmail.com>
+# Contributor: Dave Pretty <david dot pretty at gmail dot com>
+
+pkgname=anki
+pkgver=2.1.24
+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=(
+ # anki and aqt
+ 'python-beautifulsoup4'
+ 'python-requests'
+ 'python-wheel'
+
+ # anki
+ 'python-decorator'
+ 'python-distro'
+ # Currently not packaged. Falls back to stdlib json module.
+ # 'python-orjson'
+ 'python-protobuf'
+
+ # aqt
+ 'python-jsonschema'
+ 'python-markdown'
+ 'python-pyaudio'
+ 'python-pyqt5'
+ 'python-pyqtwebengine'
+ 'python-send2trash'
+)
+makedepends=(
+ 'git'
+ 'rsync'
+
+ 'maturin'
+ 'rustup'
+
+ 'python-pip'
+ 'python-mypy-protobuf'
+ 'npm'
+ 'typescript'
+)
+optdepends=(
+ 'lame: record sound'
+ 'mpv: play sound. prefered over mplayer'
+ 'mplayer: play sound'
+)
+
+source=(
+
anki-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/$pkgver.tar.gz
+
git+https://github.com/ankitects/anki-desktop-ftl#commit=255a12eadf5c6afc22705ac9ab7c9e2982c7d2b1
+
git+https://github.com/ankitects/anki-core-i18n#commit=23c4dc5bf5c88c782536ec48934ef6a379b10e72
+ 0001-Move-aqt_data-to-sys.prefix-share.patch
+ 0002-Remove-bad-build-steps-from-makefiles.patch
+)
+sha256sums=('1c4812e4a831b1332a5cfa736eedb2ac598c48d0206a21f072e426dc953266ed'
+ 'SKIP'
+ 'SKIP'
+ '78ca8bd22f887ea2d47bd8938302a5a0be68bfee0ad8891a2f8ba60111d3b1a4'
+ '1de438587d92acb1ad19ab744d2c7974456718435512090cda5a1ad7a20f3e57')
+
+prepare() {
+ cd anki-$pkgver
+ patch -p1 <"$srcdir"/0001-Move-aqt_data-to-sys.prefix-share.patch
+ patch -p1 <"$srcdir"/0002-Remove-bad-build-steps-from-makefiles.patch
+}
+
+build() {
+ # Put translations in place.
+ git clone anki-desktop-ftl anki-$pkgver/qt/ftl/repo
+ git clone anki-core-i18n anki-$pkgver/rslib/ftl/repo
+
+ # Built into the shared libraries so that the Python component can check
+ # that it has the same value.
+ cd anki-$pkgver/meta
+ echo anki-$pkgver > buildhash
+
+ # rust ankirspy module
+ cd ../rspy
+ make build
+
+ # python anki module
+ cd ../pylib
+ make build
+
+ # python aqt module
+ cd ../qt
+ make build
+}
+
+package() {
+ cd anki-$pkgver
+
+ PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir"
--ignore-installed --no-deps dist/*.whl
+
+ install -Dm755 qt/runanki "$pkgdir"/usr/bin/anki
+ install -Dm644 qt/anki.desktop
"$pkgdir"/usr/share/applications/anki.desktop
+}
