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.

Sign up for GitHub

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

Jump to bottom

Bump MSRV and LLVM to latest stable #1257

Merged
merged 1 commit into from
Oct 19, 2024
Merged

Bump MSRV and LLVM to latest stable #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ The flatpak Gnome Runtime, SDK and some extensions are needed:

```bash
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
org.freedesktop.Sdk.Extension.llvm19//24.08
```

Use Gnome Builder or VSCode with the
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
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.81"
rust-version = "1.82"
version = "0.11.0"

[workspace.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions build-aux/com.github.flxzt.rnote.Devel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm18"
"org.freedesktop.Sdk.Extension.llvm19"
],
"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/llvm18/bin",
"append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/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/llvm18/lib"
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib"
},
"modules": [
{
Expand Down
6 changes: 3 additions & 3 deletions build-aux/com.github.flxzt.rnote.Devel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runtime-version: "47"
sdk: org.gnome.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.rust-stable
- org.freedesktop.Sdk.Extension.llvm18
- org.freedesktop.Sdk.Extension.llvm19
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/llvm18/bin"
append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/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/llvm18/lib
prepend-ld-library-path: /usr/lib/sdk/llvm19/lib
modules:
- name: poppler
buildsystem: cmake-ninja
Expand Down