From 5e3927c15f95608412be106dc5ad59f701685ea9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 4 Sep 2023 16:34:11 +0200 Subject: [PATCH] Update slint-demos - Update the gettext patch - Use renderer feature by current name, not deprecated name --- ...-patched-gettext-to-avoid-cross-compiling-g.patch} | 11 ++++------- recipes-example/slint-demos/slint-demos_git.bb | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) rename recipes-example/slint-demos/slint-demos/{0001-WIP-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch => 0001-WIP-v1-2-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch} (67%) diff --git a/recipes-example/slint-demos/slint-demos/0001-WIP-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch b/recipes-example/slint-demos/slint-demos/0001-WIP-v1-2-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch similarity index 67% rename from recipes-example/slint-demos/slint-demos/0001-WIP-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch rename to recipes-example/slint-demos/slint-demos/0001-WIP-v1-2-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch index 34d1773..7afe64e 100644 --- a/recipes-example/slint-demos/slint-demos/0001-WIP-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch +++ b/recipes-example/slint-demos/slint-demos/0001-WIP-v1-2-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch @@ -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 Date: Sun, 18 Jun 2023 11:35:07 +0200 Subject: [PATCH] WIP: Use a patched gettext to avoid cross-compiling gettext @@ -9,12 +9,12 @@ 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" } @@ -22,6 +22,3 @@ index 871edd78f..e88ff275c 100644 [profile.release] lto = true panic = "abort" --- -2.39.2 - diff --git a/recipes-example/slint-demos/slint-demos_git.bb b/recipes-example/slint-demos/slint-demos_git.bb index 3287e0c..e558df3 100644 --- a/recipes-example/slint-demos/slint-demos_git.bb +++ b/recipes-example/slint-demos/slint-demos_git.bb @@ -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" @@ -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 }