vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

chore: Update Flatpak SDK extensions for 23.08beta

Browse source
This commit is contained in:
Kévin Commaille 2023-06-22 10:20:56 +02:00
parent 50232f62f7
commit 93412a754f
No known key found for this signature in database
GPG key ID: 29A48C1F03620416
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -86,7 +86,7 @@ pages:
tags:
- flatpak
script:
- flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//22.08
- flatpak install --user --noninteractive org.freedesktop.Sdk.Extension.rust-nightly//23.08beta
- sed -i 's|rust-stable|rust-nightly|g' ${MANIFEST_PATH}
- flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
- echo "ninja src/doc" | flatpak-builder --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}

4
CONTRIBUTING.md
View file

@ -37,10 +37,10 @@ flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.or
flatpak install --user gnome-nightly org.gnome.Sdk//master org.gnome.Platform//master
# Install the required rust-stable extension from Flathub
flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//22.08
flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//23.08beta
# Install the required llvm extension from Flathub
flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm15//22.08
flatpak install --user flathub org.freedesktop.Sdk.Extension.llvm16//23.08beta
```
If you are building the flatpak manually you will also need flatpak-builder on your system, or the

6
build-aux/org.gnome.Fractal.Devel.json
View file

@ -5,7 +5,7 @@
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm15"
"org.freedesktop.Sdk.Extension.llvm16"
],
"command": "fractal",
"finish-args": [
@ -20,8 +20,8 @@
"--env=RUST_BACKTRACE=1"
],
"build-options": {
"append-ld-library-path": "/usr/lib/sdk/llvm15/lib",
"append-path": "/usr/lib/sdk/llvm15/bin:/usr/lib/sdk/rust-stable/bin",
"append-ld-library-path": "/usr/lib/sdk/llvm16/lib",
"append-path": "/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin",
"build-args": [
"--share=network"
],

6
build-aux/org.gnome.Fractal.Hack.json
View file

@ -5,7 +5,7 @@
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable",
"org.freedesktop.Sdk.Extension.llvm15"
"org.freedesktop.Sdk.Extension.llvm16"
],
"command": "fractal",
"finish-args": [
@ -20,8 +20,8 @@
"--env=RUST_BACKTRACE=1"
],
"build-options": {
"append-ld-library-path": "/usr/lib/sdk/llvm15/lib",
"append-path": "/usr/lib/sdk/llvm15/bin:/usr/lib/sdk/rust-stable/bin",
"append-ld-library-path": "/usr/lib/sdk/llvm16/lib",
"append-path": "/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/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 --cfg=ruma_identifiers_storage=\"Arc\"",