Skip to content

Commit 08d00b2

Browse files
committed
Use Slint 1.14.1 for the demos package
1 parent 7383df9 commit 08d00b2

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

recipes-example/slint-demos/slint-demos/0001-WIP-v-1-13-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch renamed to recipes-example/slint-demos/slint-demos/0001-WIP-v-1-14-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
From e2d8e6571e9ad83ad267cf2335bdb983f3e70ebf Mon Sep 17 00:00:00 2001
1+
From 99551b8fe4096a3f060e6d8884ee3461250494a5 Mon Sep 17 00:00:00 2001
22
From: Simon Hausmann <simon.hausmann@slint-ui.com>
33
Date: Sun, 18 Jun 2023 11:35:07 +0200
44
Subject: [PATCH] WIP: Use a patched gettext to avoid cross-compiling gettext
5-
when building with Ycoto
5+
when building with Yocto
66

77
---
88
Cargo.toml | 3 +++
99
1 file changed, 3 insertions(+)
1010

1111
diff --git a/Cargo.toml b/Cargo.toml
12-
index 59395b13c..fb1cb264e 100644
12+
index f6baf71a5..a0046c152 100644
1313
--- a/Cargo.toml
1414
+++ b/Cargo.toml
15-
@@ -162,6 +162,9 @@ rayon = { version = "1.10.0", default-features = false }
16-
raw-window-handle-06 = { package = "raw-window-handle", version = "0.6", features = ["alloc"] }
17-
unicode-segmentation = { version = "1.12.0" }
18-
15+
@@ -183,6 +183,9 @@ windows = { version = "0.62" }
16+
windows-core = { version = "0.62.0" }
17+
1918
+[patch.crates-io]
2019
+gettext-sys = { git = "https://github.com/slint-ui/gettext-rs", branch = "simon/fix-linux-detection" }
2120
+

recipes-example/slint-demos/slint-demos_git.bb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
inherit cargo_bin
22
inherit pkgconfig
33

4-
SRC_URI = "git://github.com/slint-ui/slint.git;protocol=https;branch=master;rev=0301c9d7d8b9bb6f5a90d0068503bce4f379b065"
5-
SRC_URI += "file://0001-WIP-v-1-13-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch"
6-
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=47db5060638acc88cba176445dbd98b6"
4+
SRC_URI = "git://github.com/slint-ui/slint.git;protocol=https;branch=master;rev=ce50ea806a9a1d512d30acab6f99c8a1d511505f"
5+
SRC_URI += "file://0001-WIP-v-1-14-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch"
6+
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e3e11de4e6652abe8c9b2d74b416f33b"
77

88
SUMMARY = "Various Rust-based demos of Slint packaged up in /usr/bin"
99
DESCRIPTION = "This recipe builds various Slint demos such as the energy monitor \
@@ -13,7 +13,7 @@ LICENSE = "GPL-3.0-only | Slint-Commercial"
1313

1414
inherit slint_common
1515

16-
PV = "1.13.1+git"
16+
PV = "1.14.1+git"
1717

1818
REQUIRED_DISTRO_FEATURES:append:class-target = "opengl"
1919

0 commit comments

Comments
 (0)