Re: [PR PATCH] [Updated] anki: update to 2.1.65 failed

[loreb <loreb@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]

There is an updated pull request by loreb against master on the void-packages repository

https://github.com/loreb/void-packages anki
https://github.com/void-linux/void-packages/pull/44276

anki: update to 2.1.65 failed
=> anki-2.1.64_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> anki-2.1.64_1: running pre-install hook: 00-libdir ...
=> anki-2.1.64_1: running pre-install hook: 02-script-wrapper ...
=> anki-2.1.64_1: running pre-install hook: 98-fixup-gir-path ...
=> anki-2.1.64_1: running do_install ...
error: found a virtual manifest at `/builddir/anki-2.1.64/Cargo.toml` instead of a package manifest
=> ERROR: anki-2.1.64_1: do_install: '${make_cmd} install --target ${RUST_TARGET} --root="${DESTDIR}/usr" --offline --locked ${configure_args} ${make_install_args}' exited with 101
=> ERROR:   in do_install() at common/build-style/cargo.sh:22

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44276.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anki-44276.patch --]
[-- Type: text/x-diff, Size: 10076 bytes --]

From 7782f949b82f79fee98cdcaada5d16e861d43362 Mon Sep 17 00:00:00 2001
From: Lorenzo Beretta <vc.net.loreb@gmail.com>
Date: Mon, 5 Jun 2023 11:11:45 +0200
Subject: [PATCH] anki: update to 2.1.65

It compiles the runner and then runner fails...

Possibly copy&paste
https://cgit.freebsd.org/ports/tree/games/anki
(or nix) to get it working
---
 srcpkgs/anki/patches/disable_popup.patch      | 12 ++---
 srcpkgs/anki/patches/fix_float.patch          | 42 ----------------
 srcpkgs/anki/patches/fix_mpv_args.patch       | 29 -----------
 srcpkgs/anki/patches/fix_profile_save.patch   | 15 ------
 srcpkgs/anki/patches/fix_unescape.patch       | 11 -----
 srcpkgs/anki/patches/wtf-git-submodules.patch | 10 ++++
 srcpkgs/anki/template                         | 49 +++++++++++++++++--
 7 files changed, 60 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/anki/patches/fix_float.patch
 delete mode 100644 srcpkgs/anki/patches/fix_mpv_args.patch
 delete mode 100644 srcpkgs/anki/patches/fix_profile_save.patch
 delete mode 100644 srcpkgs/anki/patches/fix_unescape.patch
 create mode 100644 srcpkgs/anki/patches/wtf-git-submodules.patch

diff --git a/srcpkgs/anki/patches/disable_popup.patch b/srcpkgs/anki/patches/disable_popup.patch
index 8b7a041fc656..096b427ea626 100644
--- a/srcpkgs/anki/patches/disable_popup.patch
+++ b/srcpkgs/anki/patches/disable_popup.patch
@@ -1,10 +1,10 @@
---- a/aqt/update.py
-+++ b/aqt/update.py
-@@ -31,6 +31,7 @@ class LatestVersionFinder(QThread):
-         return d
+--- a/qt/aqt/update.py
++++ b/qt/aqt/update.py
+@@ -33,6 +33,7 @@ class LatestVersionFinder(QThread):
+         }
  
-     def run(self):
+     def run(self) -> None:
 +        return
-         if not self.config['updates']:
+         if not self.config["updates"]:
              return
          d = self._data()
diff --git a/srcpkgs/anki/patches/fix_float.patch b/srcpkgs/anki/patches/fix_float.patch
deleted file mode 100644
index 333d76c8efd7..000000000000
--- a/srcpkgs/anki/patches/fix_float.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/aqt/deckconf.py
-+++ b/aqt/deckconf.py
-@@ -172,7 +172,7 @@ class DeckConf(QDialog):
-         f.lrnGradInt.setValue(c['ints'][0])
-         f.lrnEasyInt.setValue(c['ints'][1])
-         f.lrnEasyInt.setValue(c['ints'][1])
--        f.lrnFactor.setValue(c['initialFactor']/10.0)
-+        f.lrnFactor.setValue(c['initialFactor']//10)
-         f.newOrder.setCurrentIndex(c['order'])
-         f.newPerDay.setValue(c['perDay'])
-         f.bury.setChecked(c.get("bury", True))
-@@ -180,7 +180,7 @@ class DeckConf(QDialog):
-         # rev
-         c = self.conf['rev']
-         f.revPerDay.setValue(c['perDay'])
--        f.easyBonus.setValue(c['ease4']*100)
-+        f.easyBonus.setValue(int(c['ease4'])*100)
-         f.fi1.setValue(c['ivlFct']*100)
-         f.maxIvl.setValue(c['maxIvl'])
-         f.revplim.setText(self.parentLimText('rev'))
-@@ -192,7 +192,7 @@ class DeckConf(QDialog):
-         # lapse
-         c = self.conf['lapse']
-         f.lapSteps.setText(self.listToUser(c['delays']))
--        f.lapMult.setValue(c['mult']*100)
-+        f.lapMult.setValue(int(c['mult'])*100)
-         f.lapMinInt.setValue(c['minInt'])
-         f.leechThreshold.setValue(c['leechFails'])
-         f.leechAction.setCurrentIndex(c['leechAction'])
---- a/aqt/preferences.py
-+++ b/aqt/preferences.py
-@@ -77,8 +77,8 @@ class Preferences(QDialog):
-             f.hwAccel.setVisible(False)
-         else:
-             f.hwAccel.setChecked(self.mw.pm.glMode() != "software")
--        f.lrnCutoff.setValue(qc['collapseTime']/60.0)
--        f.timeLimit.setValue(qc['timeLim']/60.0)
-+        f.lrnCutoff.setValue(qc['collapseTime']//60)
-+        f.timeLimit.setValue(qc['timeLim']//60)
-         f.showEstimates.setChecked(qc['estTimes'])
-         f.showProgress.setChecked(qc['dueCounts'])
-         f.nightMode.setChecked(qc.get("nightMode", False))
diff --git a/srcpkgs/anki/patches/fix_mpv_args.patch b/srcpkgs/anki/patches/fix_mpv_args.patch
deleted file mode 100644
index 0b99dd8fe856..000000000000
--- a/srcpkgs/anki/patches/fix_mpv_args.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/anki/mpv.py
-+++ b/anki/mpv.py
-@@ -104,9 +104,9 @@
-         """
-         self.argv = [self.executable]
-         self.argv += self.default_argv
--        self.argv += ["--input-ipc-server", self._sock_filename]
-+        self.argv += ["--input-ipc-server="+self._sock_filename]
-         if self.window_id is not None:
--            self.argv += ["--wid", str(self.window_id)]
-+            self.argv += ["--wid="+str(self.window_id)]
- 
-     def _start_process(self):
-         """Start the mpv process.
-
---- a/anki/sound.py
-+++ b/anki/sound.py
-@@ -123,10 +123,7 @@
- 
- def setMpvConfigBase(base):
-     mpvConfPath = os.path.join(base, "mpv.conf")
--    MpvManager.default_argv += [
--        "--no-config",
--        "--include="+mpvConfPath,
--    ]
-+    MpvManager.default_argv += ["--include="+mpvConfPath]
- 
- mpvManager = None
- 
diff --git a/srcpkgs/anki/patches/fix_profile_save.patch b/srcpkgs/anki/patches/fix_profile_save.patch
deleted file mode 100644
index 9d72a1a20e82..000000000000
--- a/srcpkgs/anki/patches/fix_profile_save.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes crash related to saving profile data on exit.
---- a/aqt/profiles.py
-+++ b/aqt/profiles.py
-@@ -160,7 +160,10 @@ a flash drive.""" % self.base)
-         return up.load()
- 
-     def _pickle(self, obj):
--        return pickle.dumps(obj, protocol=0)
-+        for key, val in obj.items():
-+            if isinstance(val, QByteArray):
-+                obj[key] = bytes(val)  # type: ignore
-+        return pickle.dumps(obj, protocol=4)
- 
-     def load(self, name):
-         assert name != "_global"
diff --git a/srcpkgs/anki/patches/fix_unescape.patch b/srcpkgs/anki/patches/fix_unescape.patch
deleted file mode 100644
index f7024bc7bf15..000000000000
--- a/srcpkgs/anki/patches/fix_unescape.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/aqt/reviewer.py
-+++ b/aqt/reviewer.py
-@@ -359,7 +359,7 @@
-         cor = stripHTML(cor)
-         # ensure we don't chomp multiple whitespace
-         cor = cor.replace(" ", "&nbsp;")
--        cor = parser.unescape(cor)
-+        cor = html.unescape(cor)
-         cor = cor.replace("\xa0", " ")
-         cor = cor.strip()
-         given = self.typedAnswer
diff --git a/srcpkgs/anki/patches/wtf-git-submodules.patch b/srcpkgs/anki/patches/wtf-git-submodules.patch
new file mode 100644
index 000000000000..cc3b68f04244
--- /dev/null
+++ b/srcpkgs/anki/patches/wtf-git-submodules.patch
@@ -0,0 +1,10 @@
+--- a/rslib/i18n/build/main.rs
++++ b/rslib/i18n/build/main.rs
+@@ -25,6 +25,7 @@ fn main() {
+     // write strings.json file to requested path
+     println!("cargo:rerun-if-env-changed=STRINGS_JSON");
+     if let Some(path) = option_env!("STRINGS_JSON") {
++        println!("STRINGS_JSON({})", path);
+         let meta_json = serde_json::to_string_pretty(&modules).unwrap();
+         fs::write(path, meta_json).unwrap();
+     }
diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index ead0f33a1df7..a0facce5b9e7 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,8 +1,11 @@
 # Template file for 'anki'
 pkgname=anki
-version=2.1.15
-revision=6
-build_style=gnu-makefile
+version=2.1.65
+revision=1
+# XXX "The Rust version pinned in rust-toolchain.toml will be automatically downloaded if not yet installed"
+build_style=cargo
+hostmakedepends="pkg-config protobuf nodejs ninja yarn git tar"
+makedepends="libzstd-devel nodejs-devel openssl-devel"
 depends="python3-PyQt5-webengine python3-requests python3-SQLAlchemy
  python3-PyAudio python3-mpv python3-Markdown python3-send2trash
  python3-BeautifulSoup4 python3-decorator python3-jsonschema"
@@ -11,11 +14,47 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://apps.ankiweb.net"
 changelog="https://apps.ankiweb.net/docs/changes.html"
-distfiles="https://apps.ankiweb.net/downloads/archive/anki-$version-source.tgz"
-checksum=5a53760164c77d619f55107a13099cffe620566a7f610b61b6c4b52487f3bb89
+_i18n_git=331f05bf02563582164755c68db1ba188224b202
+_ftl_git=1fbf87bb8a7d441482e79b3b8c2e06479e9fa978
+distfiles="https://github.com/ankitects/anki/archive/refs/tags/$version.tar.gz
+ https://github.com/ankitects/anki-core-i18n/archive/${_i18n_git}.tar.gz>anki-core-i18n-${_i18n_git}.tar.gz
+ https://github.com/ankitects/anki-desktop-ftl/archive/${_ftl_git}.tar.gz>anki-desktop-ftl-${_ftl_git}.tar.gz"
+checksum="ca1c37e8e32bec02f09421bd29ac67253e4039e705bf9fba919918c4559b48e8
+fec92648b650a99872a38d6487cd1765d1fc46962eb14018343ab81b4de21ffe
+85c6f4570b66cac1a021eb3efb7e69868d8c9b130b5c6171d459dd5bfbde321a
+"
+# "Python, node and protoc are downloaded as part of the build. You can optionally define PYTHON_BINARY, NODE_BINARY and/or PROTOC_BINARY to use locally-installed versions instead."
+export PYTHON_BINARY=/usr/bin/python3
+export PROTOC_BINARY=/usr/bin/protoc
+export NODE_BINARY=/usr/bin/node
+export RUST_BACKTRACE=full # XXX only to debug those "helpful" error messages ("file not found" -- WHAT FILE?!?!?!)
 
 python_version=3
 
+pre_patch() {
+	# aren't git submodules lovely?
+	# anki$version now contains anki$version + i18n + ...
+	( cd anki-"$version" && tar cpf - . ) | tar xpf - && rm -fr anki-"$version"
+	( cd anki-core-i18n-"$_i18n_git" && tar cpf - . ) | ( cd ftl/core-repo && tar xpf - )
+	( cd anki-desktop-ftl-"$_ftl_git" && tar cpf - . ) | ( cd ftl/qt-repo && tar xpf - )
+}
+
+do_build() {
+	#cargo auditable build --release --locked --target ${RUST_TARGET} -p runner
+	#runner hardcodes a rust invocation...
+	cargo auditable build --locked -p runner
+}
+
+post_build() {
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+	git init -q
+	git add Cargo.toml
+	git commit -a -q -m "runner *needs* a git repository with at least one commit"
+	#./target/${RUST_TARGET}/release/runner build wheels
+	./target/debug/runner build wheels
+}
+
 post_install() {
 	vlicense LICENSE
 }