Skip to content

Commit

Permalink
Update slint-demos
Browse files Browse the repository at this point in the history
- Update the gettext patch
- Use renderer feature by current name, not deprecated name
  • Loading branch information
tronical committed Sep 4, 2023
1 parent 5a9cb12 commit 5e3927c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 947387db55cb8273415b2938249b3b0883d0fe43 Mon Sep 17 00:00:00 2001
From 06b7ebe03492db3260be5f3e91dfec852d6a17b7 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <[email protected]>
Date: Sun, 18 Jun 2023 11:35:07 +0200
Subject: [PATCH] WIP: Use a patched gettext to avoid cross-compiling gettext
Expand All @@ -9,19 +9,16 @@ Subject: [PATCH] WIP: Use a patched gettext to avoid cross-compiling gettext
1 file changed, 3 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 871edd78f..e88ff275c 100644
index 95d4ce22c..392b2f2f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -98,6 +98,9 @@ fontdb = { version = "0.14.1", default-features = false }
yeslogic-fontconfig-sys = { version = "3.2.0", features = ["dlopen"] }
@@ -101,6 +101,9 @@ fontdb = { version = "0.14.1", default-features = false }
send_wrapper = { version = "0.6.0" }
cbindgen = { version = "0.24", default-features = false }

+[patch.crates-io]
+gettext-sys = { git = "https://github.com/slint-ui/gettext-rs", branch = "simon/fix-linux-detection" }
+
[profile.release]
lto = true
panic = "abort"
--
2.39.2

4 changes: 2 additions & 2 deletions recipes-example/slint-demos/slint-demos_git.bb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
inherit cargo

SRC_URI = "git://github.com/slint-ui/slint.git;protocol=https;branch=master;rev=master"
SRC_URI += "file://0001-WIP-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch"
SRC_URI += "file://0001-WIP-v1-2-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=de1f7e3f6c26ccc1b87ed67735db968f"

SUMMARY = "Various Rust-based demos of Slint packaged up in /usr/bin"
Expand All @@ -22,5 +22,5 @@ S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"

do_compile() {
oe_cargo_build --features slint/renderer-winit-skia -p energy-monitor -p slide_puzzle -p printerdemo -p gallery -p opengl_texture -p opengl_underlay
oe_cargo_build --features slint/renderer-skia -p energy-monitor -p slide_puzzle -p printerdemo -p gallery -p opengl_texture -p opengl_underlay
}

0 comments on commit 5e3927c

Please sign in to comment.