Re: [PR PATCH] [Updated] Deeping terminal fix build with latest vala and cross compile + Expect cross compile

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

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

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

https://github.com/sgn/void-packages deeping-terminal-fix-latest-vala-and-cross
https://github.com/void-linux/void-packages/pull/20610

Deeping terminal fix build with latest vala and cross compile + Expect cross compile


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deeping-terminal-fix-latest-vala-and-cross-20610.patch --]
[-- Type: text/x-diff, Size: 2446 bytes --]

From 2366b3af3b42157a428dad1ea5cb77df20f71d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Fri, 3 Apr 2020 23:59:35 +0700
Subject: [PATCH 1/2] deepin-terminal: fix build with vte3 0.60

https://github.com/linuxdeepin/deepin-terminal/pull/221
---
 srcpkgs/deepin-terminal/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template
index e1dc0494ddc..57feb0bd3f8 100644
--- a/srcpkgs/deepin-terminal/template
+++ b/srcpkgs/deepin-terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'deepin-terminal'
 pkgname=deepin-terminal
 version=5.0.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DTEST_BUILD=OFF -DUSE_VENDOR_LIB=OFF"
 hostmakedepends="glib-devel gobject-introspection gperf intltool pkg-config
@@ -21,3 +21,12 @@ nocross=yes
 case $XBPS_TARGET_MACHINE in
 	*-musl) CFLAGS="-DREG_NOERROR=REG_OK"
 esac
+
+post_patch() {
+	# latest vala string#to_utf8() return char[]
+	# but term.feed_child expects "unowned uint8[]"
+	vsed -i 's/[.]to_utf8()/.data/g' \
+		widget/command_panel.vala \
+		widget/terminal.vala \
+		widget/workspace.vala
+}

From d156cb4dcb0942853fdd063f259a48df80fd2383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Sat, 4 Apr 2020 00:07:41 +0700
Subject: [PATCH 2/2] deeping-terminal: fix cross-compile

---
 srcpkgs/deepin-terminal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template
index 57feb0bd3f8..ac614fcfc2b 100644
--- a/srcpkgs/deepin-terminal/template
+++ b/srcpkgs/deepin-terminal/template
@@ -3,6 +3,7 @@ pkgname=deepin-terminal
 version=5.0.0
 revision=2
 build_style=cmake
+build_helper="gir"
 configure_args="-DTEST_BUILD=OFF -DUSE_VENDOR_LIB=OFF"
 hostmakedepends="glib-devel gobject-introspection gperf intltool pkg-config
  vala"
@@ -16,7 +17,6 @@ homepage="https://github.com/linuxdeepin/deepin-terminal"
 changelog="https://github.com/linuxdeepin/deepin-terminal/blob/master/CHANGELOG.md"
 distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz"
 checksum=fc0586a48f85a8151602c205004118429f22c504cd25881eecfd553849fe35f2
-nocross=yes
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) CFLAGS="-DREG_NOERROR=REG_OK"