From 663d1a2af9709ecd1165572b30c3126d238404f9 Mon Sep 17 00:00:00 2001 From: RayJW <29835902+RayJW@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:15:03 +0200 Subject: [PATCH 1/4] chore: bump GNOME runtime & llvm --- .github/workflows/nightly.yml | 2 +- BUILDING.md | 4 ++-- build-aux/com.github.flxzt.rnote.Devel.json | 8 ++++---- build-aux/com.github.flxzt.rnote.Devel.yaml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 31064e8a19..f0937e9173 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -10,7 +10,7 @@ jobs: flatpak: runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-46 + image: bilelmoussaoui/flatpak-github-actions:gnome-47 options: --privileged steps: - uses: actions/checkout@v4 diff --git a/BUILDING.md b/BUILDING.md index db719012fb..0567a25722 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -59,8 +59,8 @@ flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.f The flatpak Gnome Runtime, SDK and some extensions are needed: ```bash -flatpak install org.gnome.Platform//46 org.gnome.Sdk//46 org.freedesktop.Sdk.Extension.rust-stable//23.08 \ -org.freedesktop.Sdk.Extension.llvm17//23.08 +flatpak install org.gnome.Platform//47 org.gnome.Sdk//47 org.freedesktop.Sdk.Extension.rust-stable//24.08 \ +org.freedesktop.Sdk.Extension.llvm18//24.08 ``` Use Gnome Builder or VSCode with the diff --git a/build-aux/com.github.flxzt.rnote.Devel.json b/build-aux/com.github.flxzt.rnote.Devel.json index 198eab6aa0..5b5b603d77 100644 --- a/build-aux/com.github.flxzt.rnote.Devel.json +++ b/build-aux/com.github.flxzt.rnote.Devel.json @@ -4,11 +4,11 @@ "development" ], "runtime": "org.gnome.Platform", - "runtime-version": "46", + "runtime-version": "47", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm17" + "org.freedesktop.Sdk.Extension.llvm18" ], "command": "rnote", "finish-args": [ @@ -29,7 +29,7 @@ "--env=GST_DEBUG=3" ], "build-options": { - "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm17/bin", + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", "env": { "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang", "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold", @@ -43,7 +43,7 @@ "--socket=x11", "--share=network" ], - "prepend-ld-library-path": "/usr/lib/sdk/llvm17/lib" + "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib" }, "modules": [ { diff --git a/build-aux/com.github.flxzt.rnote.Devel.yaml b/build-aux/com.github.flxzt.rnote.Devel.yaml index 51a0e29370..161fa808bb 100644 --- a/build-aux/com.github.flxzt.rnote.Devel.yaml +++ b/build-aux/com.github.flxzt.rnote.Devel.yaml @@ -2,11 +2,11 @@ id: com.github.flxzt.rnote.Devel tags: - development runtime: org.gnome.Platform -runtime-version: "46" +runtime-version: "47" sdk: org.gnome.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable - - org.freedesktop.Sdk.Extension.llvm17 + - org.freedesktop.Sdk.Extension.llvm18 command: rnote finish-args: - "--socket=wayland" @@ -25,7 +25,7 @@ finish-args: - "--env=GTK_PATH=/app/lib/gtk-4.0" - "--env=GST_DEBUG=3" build-options: - append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm17/bin" + append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin" env: CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER: clang CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" @@ -36,7 +36,7 @@ build-options: test-args: - "--socket=x11" - "--share=network" - prepend-ld-library-path: /usr/lib/sdk/llvm17/lib + prepend-ld-library-path: /usr/lib/sdk/llvm18/lib modules: - name: poppler buildsystem: cmake-ninja From 65cd82da85f8919fa66e14da2cfa1fce2c44507d Mon Sep 17 00:00:00 2001 From: RayJW <29835902+RayJW@users.noreply.github.com> Date: Fri, 4 Oct 2024 23:18:47 +0200 Subject: [PATCH 2/4] chore: bump MSRV to 1.79 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index dc589434f3..1db2995634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" homepage = "https://rnote.flxzt.net" license = "GPL-3.0-or-later" repository = "https://github.com/flxzt/rnote" -rust-version = "1.74" +rust-version = "1.79" version = "0.11.0" [workspace.dependencies] From 4aae1452d2614a4cf6614ac561693a9b2bbd6b75 Mon Sep 17 00:00:00 2001 From: RayJW <29835902+RayJW@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:51:00 +0200 Subject: [PATCH 3/4] chore: bump MSRV to 1.81 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1db2995634..3634991d9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" homepage = "https://rnote.flxzt.net" license = "GPL-3.0-or-later" repository = "https://github.com/flxzt/rnote" -rust-version = "1.79" +rust-version = "1.81" version = "0.11.0" [workspace.dependencies] From 35cdc62f2b84d29601af47703c6d6584451b24fd Mon Sep 17 00:00:00 2001 From: RayJW <29835902+RayJW@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:51:26 +0200 Subject: [PATCH 4/4] fix: clippy warning about unused import --- crates/rnote-engine/src/store/stroke_comp.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/rnote-engine/src/store/stroke_comp.rs b/crates/rnote-engine/src/store/stroke_comp.rs index 4466a9a038..682b7442ee 100644 --- a/crates/rnote-engine/src/store/stroke_comp.rs +++ b/crates/rnote-engine/src/store/stroke_comp.rs @@ -12,6 +12,7 @@ use rnote_compose::shapes::Shapeable; use rnote_compose::transform::Transformable; use rnote_compose::Color; use std::sync::Arc; +#[cfg(feature = "ui")] use tracing::error; /// Systems that are related to the stroke components.