Date: Friday, May 1, 2020 @ 20:03:47 Author: demize Revision: 624250 upgpkg: anki 2.1.24-1
Added: anki/trunk/0002-Remove-bad-build-steps-from-makefiles.patch Modified: anki/trunk/PKGBUILD Deleted: anki/trunk/0001-Move-aqt_data-to-sys.prefix-share.patch anki/trunk/0001-Unfuck-make-build-targets.patch --------------------------------------------------+ 0001-Move-aqt_data-to-sys.prefix-share.patch | 45 ---------- 0001-Unfuck-make-build-targets.patch | 93 --------------------- 0002-Remove-bad-build-steps-from-makefiles.patch | 66 ++++++++++++++ PKGBUILD | 18 +--- 4 files changed, 74 insertions(+), 148 deletions(-) Deleted: 0001-Move-aqt_data-to-sys.prefix-share.patch =================================================================== --- 0001-Move-aqt_data-to-sys.prefix-share.patch 2020-05-01 19:58:10 UTC (rev 624249) +++ 0001-Move-aqt_data-to-sys.prefix-share.patch 2020-05-01 20:03:47 UTC (rev 624250) @@ -1,45 +0,0 @@ -From d7ecae49a8a46e5ad5f25726044a25006fd1f006 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> -Date: Sun, 29 Mar 2020 06:24:43 +0200 -Subject: [PATCH] Move aqt_data to sys.prefix/share -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These files do _not_ belong right under sys.prefix. - -Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> ---- - qt/aqt/utils.py | 2 +- - qt/setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py -index a0e12362..4d8c8c34 100644 ---- a/qt/aqt/utils.py -+++ b/qt/aqt/utils.py -@@ -21,7 +21,7 @@ from aqt.theme import theme_manager - - def aqt_data_folder() -> str: - # wheel install? -- dir = os.path.join(sys.prefix, "aqt_data") -+ dir = os.path.join(sys.prefix,"share", "aqt_data") - if not os.path.exists(dir) or not os.listdir(dir): - # running in place? - dir = os.path.join(os.path.dirname(__file__), "..", "aqt_data") -diff --git a/qt/setup.py b/qt/setup.py -index 6d498994..d67a8791 100644 ---- a/qt/setup.py -+++ b/qt/setup.py -@@ -9,7 +9,7 @@ with open("../meta/version") as fh: - def package_files(directory): - entries = [] - for (path, directories, filenames) in os.walk(directory): -- entries.append((path, [os.path.join(path, f) for f in filenames])) -+ entries.append((os.path.join("share", path), [os.path.join(path, f) for f in filenames])) - return entries - - --- -2.26.0 - Deleted: 0001-Unfuck-make-build-targets.patch =================================================================== --- 0001-Unfuck-make-build-targets.patch 2020-05-01 19:58:10 UTC (rev 624249) +++ 0001-Unfuck-make-build-targets.patch 2020-05-01 20:03:47 UTC (rev 624250) @@ -1,93 +0,0 @@ -From 3dc54977a9cc86175bf47b3586178c3d86ad53d5 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] Unfuck make build targets -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 | 12 ++---------- - qt/Makefile | 10 +--------- - rspy/Makefile | 4 ---- - 3 files changed, 3 insertions(+), 23 deletions(-) - -diff --git a/pylib/Makefile b/pylib/Makefile -index 9727fc92..1d86144e 100644 ---- a/pylib/Makefile -+++ b/pylib/Makefile -@@ -31,17 +31,9 @@ $(shell mkdir -p .build ../dist) - PHONY: all - all: check - --.build/run-deps: setup.py -- python -m pip install -e . -- @touch $@ -- --.build/dev-deps: requirements.dev -- python -m pip install -r requirements.dev -- @touch $@ -- - 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 +44,7 @@ PROTODEPS := $(wildcard ../proto/*.proto) - python -m black anki/hooks.py - @touch $@ - --BUILD_STEPS := .build/run-deps .build/dev-deps .build/py-proto anki/buildinfo.py .build/hooks -+BUILD_STEPS := .build/py-proto anki/buildinfo.py - - # Checking - ###################### -diff --git a/qt/Makefile b/qt/Makefile -index 4fef3e92..562a18a2 100644 ---- a/qt/Makefile -+++ b/qt/Makefile -@@ -34,14 +34,6 @@ $(shell mkdir -p .build ../dist) - PHONY: all - all: check - --.build/run-deps: setup.py -- python -m pip install -e . -- @touch $@ -- --.build/dev-deps: requirements.dev -- python -m pip install -r requirements.dev -- @touch $@ -- - .build/ui: $(shell ${FIND} designer -type f) - ./tools/build_ui.sh - @touch $@ -@@ -64,7 +56,7 @@ TSDEPS := $(wildcard ts/src/*.ts) $(wildcard ts/scss/*.scss) - python -m black aqt/gui_hooks.py - @touch $@ - --BUILD_STEPS := .build/run-deps .build/dev-deps .build/js .build/ui aqt/buildinfo.py .build/hooks .build/i18n -+BUILD_STEPS := .build/js .build/ui aqt/buildinfo.py .build/i18n - - # Checking - ###################### -diff --git a/rspy/Makefile b/rspy/Makefile -index 20362e17..c31636ea 100644 ---- a/rspy/Makefile -+++ b/rspy/Makefile -@@ -78,10 +78,6 @@ clean: - RUST_TOOLCHAIN := $(shell cat rust-toolchain) - - .build/tools: requirements.txt rust-toolchain -- python -m pip install -r requirements.txt -- rustup toolchain install $(RUST_TOOLCHAIN) -- rustup component add rustfmt-preview --toolchain $(RUST_TOOLCHAIN) -- rustup component add clippy-preview --toolchain $(RUST_TOOLCHAIN) - @touch $@ - - .build/check: build --- -2.26.0 - Added: 0002-Remove-bad-build-steps-from-makefiles.patch =================================================================== --- 0002-Remove-bad-build-steps-from-makefiles.patch (rev 0) +++ 0002-Remove-bad-build-steps-from-makefiles.patch 2020-05-01 20:03:47 UTC (rev 624250) @@ -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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-01 19:58:10 UTC (rev 624249) +++ PKGBUILD 2020-05-01 20:03:47 UTC (rev 624250) @@ -5,7 +5,7 @@ # Contributor: Dave Pretty <david dot pretty at gmail dot com> pkgname=anki -pkgver=2.1.23 +pkgver=2.1.24 pkgrel=1 pkgdesc="Helps you remember facts (like words/phrases in a foreign language) efficiently" @@ -56,21 +56,19 @@ 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-Unfuck-make-build-targets.patch 0001-Move-aqt_data-to-sys.prefix-share.patch + 0002-Remove-bad-build-steps-from-makefiles.patch ) -sha256sums=( - '682efd4cf044a89a0dbd83e30d4545683c6574d847642cc64cc0e0ca4a94f4ae' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' -) +sha256sums=('1c4812e4a831b1332a5cfa736eedb2ac598c48d0206a21f072e426dc953266ed' + 'SKIP' + 'SKIP' + '78ca8bd22f887ea2d47bd8938302a5a0be68bfee0ad8891a2f8ba60111d3b1a4' + '1de438587d92acb1ad19ab744d2c7974456718435512090cda5a1ad7a20f3e57') prepare() { cd anki-$pkgver - patch -p1 <"$srcdir"/0001-Unfuck-make-build-targets.patch patch -p1 <"$srcdir"/0001-Move-aqt_data-to-sys.prefix-share.patch + patch -p1 <"$srcdir"/0002-Remove-bad-build-steps-from-makefiles.patch } build() {