[arch-commits] Commit in anki/repos (5 files)
Date: Friday, May 1, 2020 @ 19:09:47
Author: demize
Revision: 624195
db-move: moved anki from [community-testing] to [community] (x86_64)
Added:
anki/repos/community-x86_64/
anki/repos/community-x86_64/0001-Move-aqt_data-to-sys.prefix-share.patch
(from rev 624194,
anki/repos/community-testing-x86_64/0001-Move-aqt_data-to-sys.prefix-share.patch)
anki/repos/community-x86_64/0001-Unfuck-make-build-targets.patch
(from rev 624194,
anki/repos/community-testing-x86_64/0001-Unfuck-make-build-targets.patch)
anki/repos/community-x86_64/PKGBUILD
(from rev 624194, anki/repos/community-testing-x86_64/PKGBUILD)
Deleted:
anki/repos/community-testing-x86_64/
--+
0001-Move-aqt_data-to-sys.prefix-share.patch | 45 ++
0001-Unfuck-make-build-targets.patch | 93 +
PKGBUILD | 106 +
3 files changed, 244 insertions(+)
Copied:
anki/repos/community-x86_64/0001-Move-aqt_data-to-sys.prefix-share.patch (from
rev 624194,
anki/repos/community-testing-x86_64/0001-Move-aqt_data-to-sys.prefix-share.patch)
===
--- community-x86_64/0001-Move-aqt_data-to-sys.prefix-share.patch
(rev 0)
+++ community-x86_64/0001-Move-aqt_data-to-sys.prefix-share.patch
2020-05-01 19:09:47 UTC (rev 624195)
@@ -0,0 +1,45 @@
+From d7ecae49a8a46e5ad5f25726044a25006fd1f006 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?=
+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
+---
+ 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
+
Copied: anki/repos/community-x86_64/0001-Unfuck-make-build-targets.patch (from
rev 624194,
anki/repos/community-testing-x86_64/0001-Unfuck-make-build-targets.patch)
===
--- community-x86_64/0001-Unfuck-make-build-targets.patch
(rev 0)
+++ community-x86_64/0001-Unfuck-make-build-targets.patch 2020-05-01
19:09:47 UTC (rev 624195)
@@ -0,0 +1,93 @@
+From 3dc54977a9cc86175bf47b3586178c3d86ad53d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?=
+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
+---
+ 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
+
[arch-commits] Commit in anki/repos (5 files)
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
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
-# Contributor: Sergej Pupykin
-# Contributor: Timm Preetz
-# Contributor: Michael 'manveru' Fellinger
-# Contributor: Dave Pretty
-
-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
+# Contributor: Sergej Pupykin
+# Contributor: Timm Preetz
+# Contributor: Michael 'manveru' Fellinger
+# Contributor: Dave Pretty
+
+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
+
