From fafc5a25ceeb2c7a0007d32754ff1d4b56712d6d Mon Sep 17 00:00:00 2001
From: tblFlip <root@tblflip.de>
Date: Thu, 8 May 2025 16:28:06 +0200
Subject: [PATCH] Update to v2.3.1

---
 .SRCINFO               | 10 ++++++----
 .gitignore             |  1 +
 PKGBUILD               | 18 ++++++++++++++----
 fix_rust_being_rust.sh | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 fix_rust_being_rust.sh

diff --git a/.SRCINFO b/.SRCINFO
index a24223b121ed..ec401389f8bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = surrealdb
 	pkgdesc = A scalable, distributed, collaborative, document-graph database, for the realtime web
-	pkgver = 2.2.2
+	pkgver = 2.3.1
 	pkgrel = 1
 	url = https://github.com/surrealdb/surrealdb
 	arch = x86_64
@@ -19,9 +19,11 @@ pkgbase = surrealdb
 	depends = glibc
 	provides = surrealdb
 	conflicts = surrealdb-bin
-	source = https://github.com/surrealdb/surrealdb/releases/download/v2.2.2/LICENSE
-	source = surrealdb-2.2.2.tar.gz::https://github.com/surrealdb/surrealdb/archive/refs/tags/v2.2.2.tar.gz
+	source = https://github.com/surrealdb/surrealdb/releases/download/v2.3.1/LICENSE
+	source = surrealdb-2.3.1.tar.gz::https://github.com/surrealdb/surrealdb/archive/refs/tags/v2.3.1.tar.gz
+	source = fix_rust_being_rust.sh
 	sha256sums = dd98c688e54be8b85ad79e603f5112449b9789dfc031db94eb5c7dc843702aef
-	sha256sums = e0fc23b6d3f5c99518e686833c4e0a52d020b9e44a071fb363d903f491de5ec4
+	sha256sums = 06c7348f1d5ea95694c28491c48997092b443dcd59703fcfcd42c50aca95d60c
+	sha256sums = c35407a2d41e0f6bc3b635c898a99d0fd56490218bd3d9e126d20ce341a79846
 
 pkgname = surrealdb
diff --git a/.gitignore b/.gitignore
index bf4414fb8932..c54b700d9573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 !/.gitignore
 !/.SRCINFO
 !/PKGBUILD
+!/fix_rust_being_rust.sh
diff --git a/PKGBUILD b/PKGBUILD
index 56471c5f3821..5b3cf8b58c5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Dominik Schwaiger <mail@dominik-schwaiger.ch>
 
 pkgname=surrealdb
-pkgver=2.2.2
+pkgver=2.3.1
 pkgrel=1
 pkgdesc="A scalable, distributed, collaborative, document-graph database, for the realtime web"
 arch=('x86_64')
@@ -17,18 +17,28 @@ conflicts=("surrealdb-bin")
 source=(
 	"https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver//_/-}/LICENSE"
 	"${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/refs/tags/v${pkgver//_/-}.tar.gz"
+	"fix_rust_being_rust.sh"
 )
 
 sha256sums=(
 	"dd98c688e54be8b85ad79e603f5112449b9789dfc031db94eb5c7dc843702aef"
-	"e0fc23b6d3f5c99518e686833c4e0a52d020b9e44a071fb363d903f491de5ec4"
+	"06c7348f1d5ea95694c28491c48997092b443dcd59703fcfcd42c50aca95d60c"
+	"c35407a2d41e0f6bc3b635c898a99d0fd56490218bd3d9e126d20ce341a79846"
 )
 
 prepare() {
 	cd "$pkgname-${pkgver//_/-}" || exit
-	rustup toolchain install 1.81.0
-	rustup override set 1.81.0
+	rustup toolchain install 1.86.0
+	rustup override set 1.86.0
 	rustup target add "$CARCH-unknown-linux-gnu"
+
+	# https://github.com/rust-rocksdb/rust-rocksdb/issues/995
+	# https://github.com/rust-rocksdb/rust-rocksdb/issues/991
+	# The current definition of "a steaming heap of rubbish". :)
+	# I better go wash my paws now. :)
+	cargo fetch
+	cd ..
+	bash ./fix_rust_being_rust.sh
 }
 
 build() {
diff --git a/fix_rust_being_rust.sh b/fix_rust_being_rust.sh
new file mode 100644
index 000000000000..c40e65945d63
--- /dev/null
+++ b/fix_rust_being_rust.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+INCLUDE="#include <cstdint>"
+
+for dir in $(find ~/.cargo/registry/src/ -name 'librocksdb-sys-0.17.1*'); do
+  blob_file_meta="$dir/rocksdb/db/blob/blob_file_meta.h"
+  trace_record="$dir/rocksdb/include/rocksdb/trace_record.h"
+  write_batch_base="$dir/rocksdb/include/rocksdb/write_batch_base.h"
+
+  if ! grep -q "$INCLUDE" "$blob_file_meta"; then
+    echo "fixing $blob_file_meta"
+    echo
+    sed -i '/#include <cassert>/a #include <cstdint>' "$blob_file_meta"
+  else
+    echo "blob_file_meta.h already fixed"
+  fi
+
+  if ! grep -q "$INCLUDE" "$trace_record"; then
+    echo "fixing $trace_record"
+    echo
+    sed -i '/#pragma once/a #include <cstdint>' "$trace_record"
+  else
+    echo "trace_record.h already fixed"
+  fi
+
+  if ! grep -q "$INCLUDE" "$write_batch_base"; then
+    echo "fixing $write_batch_base"
+    echo
+    sed -i '/#include <cstddef>/a #include <cstdint>' "$write_batch_base"
+  else
+    echo "write_batch_base.h already fixed"
+  fi
+done