Skip to content

Commit

Permalink
chore: bump MSRV to 1.82 & llvm19 (flxzt#1257)
Browse files Browse the repository at this point in the history
  • Loading branch information
RayJW authored Oct 19, 2024
1 parent 4e4df93 commit 18d519f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion BUILDING.md
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
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
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
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

0 comments on commit 18d519f

Please sign in to comment.