Re: [PR PATCH] [Updated] akonadi-search: switch to rust based html parsing backend instead of QDocument

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

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

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

https://github.com/Johnnynator/void-packages akonadi-search
https://github.com/void-linux/void-packages/pull/46987

akonadi-search: switch to rust based html parsing backend instead of QDocument
- New package: corrosion-0.4.4
- akonadi-search: switch to rust based html parsing backend instead of QDocument


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

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

From 5c347c30b53421ac558a81b3e6987ae40d7e57b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 17:34:44 +0100
Subject: [PATCH 1/2] New package: corrosion-0.4.4

---
 common/build-style/cmake.sh |  1 +
 srcpkgs/corrosion/template  | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/corrosion/template

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 5760f73dbc842..124ed354eff67 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -40,6 +40,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 
 SET(CMAKE_C_COMPILER   ${CC})
 SET(CMAKE_CXX_COMPILER ${CXX})
+SET(Rust_CARGO_TARGET ${XBPS_CROSS_RUST_TARGET})
 SET(CMAKE_CROSSCOMPILING TRUE)
 
 SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
diff --git a/srcpkgs/corrosion/template b/srcpkgs/corrosion/template
new file mode 100644
index 0000000000000..0d5663beec5b4
--- /dev/null
+++ b/srcpkgs/corrosion/template
@@ -0,0 +1,22 @@
+# Template file for 'corrosion'
+pkgname=corrosion
+version=0.4.4
+revision=1
+build_style=cmake
+hostmakedepends="cargo"
+short_desc="Tool for integrating Rust into an existing CMake project"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/corrosion-rs/corrosion"
+distfiles="https://github.com/corrosion-rs/corrosion/archive/refs/tags/v${version}.tar.gz"
+checksum=bf3981d0e066f2c877949ec59d9ed6cb193ae4ff615b73f20c64a5de68fc06ab
+
+do_check() {
+	cd build
+	# Require and uses rustup
+	ctest -E '(rustup_proxy_build|parse_target_triple_build)'
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 0df61d3b87e12307ebf2100ca08abedcefa66c98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 17:35:27 +0100
Subject: [PATCH 2/2] akonadi-search: switch to rust based html parsing backend
 instead of QDocument

---
 srcpkgs/akonadi-search/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index e9dd9fb7a12b4..21f7707256f0d 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,12 +1,13 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
 version=23.08.2
-revision=1
+revision=2
 build_style=cmake
+build_helper="rust qemu"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
- gettext kcoreaddons kpackage"
+ gettext kcoreaddons kpackage corrosion cargo"
 makedepends="akonadi5-devel akonadi-mime-devel xapian-core-devel krunner-devel
- kcmutils-devel kcontacts-devel kcalendarcore-devel"
+ kcmutils-devel kcontacts-devel kcalendarcore-devel rust-std"
 short_desc="Libraries and daemons to implement searching in Akonadi"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -14,6 +15,12 @@ homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
 checksum=3a7fabea987cf4492b21546574c6c1771718e1da7dace682a168d848b12482fb
 
+do_check() {
+	cd build
+	# Require Akonadi running
+	ctest -E '(akonadi-sqlite-schedulertest|akonadi-sqlite-collectionindexingjobtest)'
+}
+
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"