Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump GNOME runtime and LLVM version #1242

Merged
merged 6 commits into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.81"
version = "0.11.0"

[workspace.dependencies]
Expand Down
8 changes: 4 additions & 4 deletions build-aux/com.github.flxzt.rnote.Devel.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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",
Expand All @@ -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": [
{
Expand Down
8 changes: 4 additions & 4 deletions build-aux/com.github.flxzt.rnote.Devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions crates/rnote-engine/src/store/stroke_comp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down