diff --git a/BUILDING.md b/BUILDING.md index ec77bba0a5..186b660b76 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -14,8 +14,8 @@ Make sure you have `flatpak` and `flatkpak-builder` installed on your system. You also need the Gnome Runtime, SDK and some extensions: ```bash -flatpak install org.gnome.Platform//44 org.gnome.Sdk//44 org.freedesktop.Sdk.Extension.rust-stable//22.08\ -org.freedesktop.Sdk.Extension.llvm15//22.08 +flatpak install org.gnome.Platform//45beta org.gnome.Sdk//45beta org.freedesktop.Sdk.Extension.rust-stable//23.08beta\ +org.freedesktop.Sdk.Extension.llvm16//23.08beta ``` 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 9ba1d977fb..e91ee82dc1 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": "44", + "runtime-version": "45beta", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm15" + "org.freedesktop.Sdk.Extension.llvm16" ], "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/llvm15/bin", + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/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/llvm15/lib" + "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib" }, "modules": [ { @@ -78,135 +78,6 @@ } ] }, - { - "name": "cairo", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.freedesktop.org/cairo/cairo.git", - "commit": "542bfac286a945aa584f7dc2376f1f9f33b37ac9" - } - ] - }, - { - "name": "gtk", - "buildsystem": "meson", - "config-opts": [ - "-Dbuild-testsuite=false", - "-Dgtk_doc=false", - "-Dintrospection=disabled", - "-Dbuild-tests=false" - ], - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/gtk/4.12/gtk-4.12.0.tar.xz", - "sha256": "a6d10829f405b1afc0b65e2a9642c04126a1d1b638d11c6d97426da4f84f1f6f", - "x-checker-data": { - "type": "gnome", - "name": "gtk", - "stable-only": false - } - } - ] - }, - { - "name": "libsass", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://github.com/lazka/libsass.git", - "branch": "meson", - "commit": "aac79dccd3c8f7e8f22125f87a119f3b1ee9d487" - } - ] - }, - { - "name": "sassc", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://github.com/lazka/sassc.git", - "branch": "meson", - "commit": "a1950c2d95ea4c051feb90bb1f43559fbb54bf36" - } - ] - }, - { - "name": "libyaml", - "sources": [ - { - "type": "git", - "url": "https://github.com/yaml/libyaml.git", - "commit": "2c891fc7a770e8ba2fec34fc6b545c672beb37e6" - } - ] - }, - { - "name": "libxmlb", - "buildsystem": "meson", - "config-opts": [ - "-Dintrospection=false", - "-Dgtkdoc=false", - "-Dstemmer=false", - "-Dcli=false", - "-Dtests=false" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/hughsie/libxmlb.git", - "commit": "6191220071233972d798b57841d08e4964952a17" - } - ] - }, - { - "name": "appstream", - "buildsystem": "meson", - "config-opts": [ - "-Dstemming=false", - "-Ddocs=false", - "-Dgir=false" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/ximion/appstream.git", - "tag": "v0.16.2", - "commit": "1ee6af91310f9deb47f3863a7a7ffb22c46bcce6", - "x-checker-data": { - "type": "git", - "tag-pattern": "^v([\\d.]+)$" - } - } - ] - }, - { - "name": "libadwaita", - "buildsystem": "meson", - "config-opts": [ - "-Dtests=false", - "-Dvapi=false", - "-Dintrospection=disabled", - "-Dgtk_doc=false", - "-Dexamples=false" - ], - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/libadwaita/1.4/libadwaita-1.4.beta.tar.xz", - "sha256": "5b6a0e51fd7b6273564ce937a9d302ca683e61f05791b09a36a881d3952128a4", - "x-checker-data": { - "type": "gnome", - "name": "libadwaita", - "stable-only": false - } - } - ] - }, { "name": "rnote", "buildsystem": "meson", diff --git a/build-aux/com.github.flxzt.rnote.Devel.yaml b/build-aux/com.github.flxzt.rnote.Devel.yaml index e6bae76957..d3dcaa720d 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: "44" +runtime-version: "45beta" sdk: org.gnome.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable - - org.freedesktop.Sdk.Extension.llvm15 + - org.freedesktop.Sdk.Extension.llvm16 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/llvm15/bin" + append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/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/llvm15/lib + prepend-ld-library-path: /usr/lib/sdk/llvm16/lib modules: - name: poppler buildsystem: cmake-ninja @@ -58,88 +58,6 @@ modules: - type: archive url: "https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz" sha256: c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74 - - name: cairo - buildsystem: meson - sources: - - type: git - url: https://gitlab.freedesktop.org/cairo/cairo.git - commit: 542bfac286a945aa584f7dc2376f1f9f33b37ac9 - - name: gtk - buildsystem: meson - config-opts: - - -Dbuild-testsuite=false - - -Dgtk_doc=false - - -Dintrospection=disabled - - -Dbuild-tests=false - sources: - - type: archive - url: https://download.gnome.org/sources/gtk/4.12/gtk-4.12.0.tar.xz - sha256: a6d10829f405b1afc0b65e2a9642c04126a1d1b638d11c6d97426da4f84f1f6f - x-checker-data: - type: gnome - name: gtk - stable-only: false - - name: libsass - buildsystem: meson - sources: - - type: git - url: https://github.com/lazka/libsass.git - branch: meson - commit: aac79dccd3c8f7e8f22125f87a119f3b1ee9d487 - - name: sassc - buildsystem: meson - sources: - - type: git - url: https://github.com/lazka/sassc.git - branch: meson - commit: a1950c2d95ea4c051feb90bb1f43559fbb54bf36 - - name: libyaml - sources: - - type: git - url: https://github.com/yaml/libyaml.git - commit: 2c891fc7a770e8ba2fec34fc6b545c672beb37e6 - - name: libxmlb - buildsystem: meson - config-opts: - - -Dintrospection=false - - -Dgtkdoc=false - - -Dstemmer=false - - -Dcli=false - - -Dtests=false - sources: - - type: git - url: https://github.com/hughsie/libxmlb.git - commit: 6191220071233972d798b57841d08e4964952a17 - - name: appstream - buildsystem: meson - config-opts: - - -Dstemming=false - - -Ddocs=false - - -Dgir=false - sources: - - type: git - url: https://github.com/ximion/appstream.git - tag: v0.16.2 - commit: 1ee6af91310f9deb47f3863a7a7ffb22c46bcce6 - x-checker-data: - type: git - tag-pattern: ^v([\d.]+)$ - - name: libadwaita - buildsystem: meson - config-opts: - - -Dtests=false - - -Dvapi=false - - -Dintrospection=disabled - - -Dgtk_doc=false - - -Dexamples=false - sources: - - type: archive - url: https://download.gnome.org/sources/libadwaita/1.4/libadwaita-1.4.beta.tar.xz - sha256: 5b6a0e51fd7b6273564ce937a9d302ca683e61f05791b09a36a881d3952128a4 - x-checker-data: - type: gnome - name: libadwaita - stable-only: false - name: rnote buildsystem: meson run-tests: true