From 01b47d4c5779aeebd1989f7d82ced8023573ad35 Mon Sep 17 00:00:00 2001
From: mtvrs <mtvrs@tuta.io>
Date: Mon, 4 Dec 2023 18:46:53 +0100
Subject: [PATCH] lapce: update to 0.3.1.

---
 srcpkgs/lapce-proxy                         |  1 +
 srcpkgs/lapce/patches/cargo.lock.patch      | 34 +++++++++++++++++++++
 srcpkgs/lapce/patches/desktop-icon.patch    | 12 --------
 srcpkgs/lapce/patches/disable-updater.patch | 11 +++++++
 srcpkgs/lapce/patches/use-system-libs.patch |  8 +++++
 srcpkgs/lapce/template                      | 28 +++++++++++++----
 6 files changed, 76 insertions(+), 18 deletions(-)
 create mode 120000 srcpkgs/lapce-proxy
 create mode 100644 srcpkgs/lapce/patches/cargo.lock.patch
 delete mode 100644 srcpkgs/lapce/patches/desktop-icon.patch
 create mode 100644 srcpkgs/lapce/patches/disable-updater.patch
 create mode 100644 srcpkgs/lapce/patches/use-system-libs.patch

diff --git a/srcpkgs/lapce-proxy b/srcpkgs/lapce-proxy
new file mode 120000
index 0000000000000..1dc423f61d897
--- /dev/null
+++ b/srcpkgs/lapce-proxy
@@ -0,0 +1 @@
+lapce
\ No newline at end of file
diff --git a/srcpkgs/lapce/patches/cargo.lock.patch b/srcpkgs/lapce/patches/cargo.lock.patch
new file mode 100644
index 0000000000000..608847ad8ae04
--- /dev/null
+++ b/srcpkgs/lapce/patches/cargo.lock.patch
@@ -0,0 +1,34 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3672,15 +3672,6 @@
+ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+ 
+ [[package]]
+-name = "openssl-src"
+-version = "111.22.0+1.1.1q"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+-dependencies = [
+- "cc",
+-]
+-
+-[[package]]
+ name = "openssl-sys"
+ version = "0.9.76"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -3689,7 +3680,6 @@
+  "autocfg",
+  "cc",
+  "libc",
+- "openssl-src",
+  "pkg-config",
+  "vcpkg",
+ ]
+@@ -7460,6 +7450,7 @@
+ dependencies = [
+  "cc",
+  "libc",
++ "pkg-config",
+ ]
+ 
+ [[package]]
diff --git a/srcpkgs/lapce/patches/desktop-icon.patch b/srcpkgs/lapce/patches/desktop-icon.patch
deleted file mode 100644
index 484471b5441ab..0000000000000
--- a/srcpkgs/lapce/patches/desktop-icon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/extra/linux/dev.lapce.lapce.desktop b/extra/linux/dev.lapce.lapce.desktop
-index 83f9c5cc..8d81cd87 100644
---- a/extra/linux/dev.lapce.lapce.desktop
-+++ b/extra/linux/dev.lapce.lapce.desktop
-@@ -6,6 +6,6 @@ Name=Lapce
- Comment=Lightning-fast and powerful code editor written in Rust
- Categories=Development;IDE;
- 
--Icon=dev.lapce.lapce
-+Icon=/usr/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg
- Exec=lapce
- Terminal=false
diff --git a/srcpkgs/lapce/patches/disable-updater.patch b/srcpkgs/lapce/patches/disable-updater.patch
new file mode 100644
index 0000000000000..fb143b2b02304
--- /dev/null
+++ b/srcpkgs/lapce/patches/disable-updater.patch
@@ -0,0 +1,11 @@
+--- a/lapce-app/Cargo.toml
++++ a/lapce-app/Cargo.toml
+@@ -64,7 +64,7 @@
+ dmg = "0.1.1"
+ 
+ [features]
+-default = ["all-languages", "updater"]
++default = ["all-languages"]
+ portable = ["lapce-core/portable"]
+ updater = []
+ 
diff --git a/srcpkgs/lapce/patches/use-system-libs.patch b/srcpkgs/lapce/patches/use-system-libs.patch
new file mode 100644
index 0000000000000..2e86463fce6f0
--- /dev/null
+++ b/srcpkgs/lapce/patches/use-system-libs.patch
@@ -0,0 +1,8 @@
+--- a/lapce-proxy/Cargo.toml
++++ b/lapce-proxy/Cargo.toml
+@@ -41 +41 @@
+-zstd = "0.11.2" # follow same version wasmtime-cache in lockfile
++zstd = { version = "0.11.2", features = ["pkg-config"] }  # follow same version wasmtime-cache in lockfile
+@@ -51 +51 @@
+-git2 = { version = "0.18.1", features = ["vendored-openssl"] }
++git2 = { version = "0.18.1" }
diff --git a/srcpkgs/lapce/template b/srcpkgs/lapce/template
index d67d14c1617d5..32338296e2caa 100644
--- a/srcpkgs/lapce/template
+++ b/srcpkgs/lapce/template
@@ -1,21 +1,37 @@
 # Template file for 'lapce'
 pkgname=lapce
-version=0.2.8
-revision=2
+version=0.3.1
+revision=1
 archs="aarch64* x86_64*" # wasmer-vm crate fails to build (unsupported platform)
 build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="fontconfig-devel gtk+3-devel openssl-devel"
+hostmakedepends="pkg-config python3"
+makedepends="fontconfig-devel gtk+3-devel openssl-devel libxkbcommon-devel \
+ vulkan-loader wayland-devel"
 short_desc="Lightning-fast and powerful code editor"
 maintainer="Alex Lohr <alexthkloss@web.de>"
 license="Apache-2.0"
 homepage="https://lapce.dev/"
 changelog="https://github.com/lapce/lapce/releases"
 distfiles="https://github.com/lapce/lapce/archive/refs/tags/v${version}.tar.gz"
-checksum=650b81c3dfbd727101111de60c208c191258fb27a96b1cec392afa7c0579a6ff
+checksum=82407a0b0ae8a5660ff2192ca336c9b0e361424f0fd509e0a0a73ad55071f13d
+make_check=no # no tests
+
+export RELEASE_TAG_NAME="v$version"
+
+# do not compile twice
+do_install() {
+	vbin target/${RUST_TARGET}/release/lapce
+}
 
 post_install() {
 	vinstall extra/linux/dev.lapce.lapce.desktop 644 usr/share/applications/
-	vinstall extra/linux/dev.lapce.lapce.metainfo.xml 644 usr/share/appdata/
+	vinstall extra/linux/dev.lapce.lapce.metainfo.xml 644 usr/share/metainfo/
 	vinstall extra/images/logo_color.svg 644 usr/share/icons/hicolor/scalable/apps/ dev.lapce.lapce.svg
 }
+
+lapce-proxy_package() {
+	short_desc+=" - proxy"
+	pkg_install() {
+		vbin target/${RUST_TARGET}/release/lapce-proxy
+	}
+}