From b153e11c254828ef329fa969a9b8bb4983dfca17 Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Wed, 19 Oct 2022 02:38:37 +0200 Subject: [PATCH] convert manifest to ymal, update ink-stroke-modeler --- build-aux/com.github.flxzt.rnote.Devel.json | 95 --------------------- build-aux/com.github.flxzt.rnote.Devel.yaml | 67 +++++++++++++++ ink-stroke-modeler-rs | 2 +- 3 files changed, 68 insertions(+), 96 deletions(-) delete mode 100644 build-aux/com.github.flxzt.rnote.Devel.json create mode 100644 build-aux/com.github.flxzt.rnote.Devel.yaml diff --git a/build-aux/com.github.flxzt.rnote.Devel.json b/build-aux/com.github.flxzt.rnote.Devel.json deleted file mode 100644 index 079ec0cc0a..0000000000 --- a/build-aux/com.github.flxzt.rnote.Devel.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "id": "com.github.flxzt.rnote.Devel", - "tags": [ - "development" - ], - "runtime": "org.gnome.Platform", - "runtime-version": "43", - "sdk": "org.gnome.Sdk", - "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm14" - ], - "command": "rnote", - "finish-args": [ - "--socket=wayland", - "--socket=fallback-x11", - "--device=dri", - "--share=ipc", - "--socket=pulseaudio", - "--filesystem=xdg-config", - "--filesystem=xdg-documents", - "--filesystem=xdg-pictures", - "--filesystem=xdg-desktop", - "--filesystem=xdg-run/gvfs", - "--filesystem=xdg-run/gvfsd", - "--env=RUST_BACKTRACE=full", - "--env=RUST_LOG=rnote=debug", - "--env=G_MESSAGES_DEBUG=all", - "--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/llvm14/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", - "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang", - "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" - }, - "build-args": [ - "--share=network" - ], - "test-args": [ - "--socket=x11", - "--share=network" - ] - }, - "modules": [ - { - "name": "poppler", - "buildsystem": "cmake-ninja", - "config-opts": [ - "-DCMAKE_INSTALL_LIBDIR=/app/lib", - "-DCMAKE_INSTALL_INCLUDEDIR=/app/include", - "-DENABLE_BOOST=OFF", - "-DENABLE_LIBOPENJPEG=none" - ], - "sources": [ - { - "type": "archive", - "url": "https://poppler.freedesktop.org/poppler-22.09.0.tar.xz", - "sha256": "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e" - } - ] - }, - { - "name": "poppler-data", - "buildsystem": "cmake-ninja", - "config-opts": [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - ], - "sources": [ - { - "type": "archive", - "url": "https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz", - "sha256": "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c" - } - ] - }, - { - "name": "rnote", - "buildsystem": "meson", - "run-tests": true, - "config-opts": [ - "-Dprofile=devel" - ], - "sources": [ - { - "type": "dir", - "path": "../" - } - ] - } - ] -} \ No newline at end of file diff --git a/build-aux/com.github.flxzt.rnote.Devel.yaml b/build-aux/com.github.flxzt.rnote.Devel.yaml new file mode 100644 index 0000000000..bf64f62a32 --- /dev/null +++ b/build-aux/com.github.flxzt.rnote.Devel.yaml @@ -0,0 +1,67 @@ +id: com.github.flxzt.rnote.Devel +tags: + - development +runtime: org.gnome.Platform +runtime-version: "43" +sdk: org.gnome.Sdk +sdk-extensions: + - org.freedesktop.Sdk.Extension.rust-stable + - org.freedesktop.Sdk.Extension.llvm14 +command: rnote +finish-args: + - "--socket=wayland" + - "--socket=fallback-x11" + - "--device=dri" + - "--share=ipc" + - "--socket=pulseaudio" + - "--filesystem=xdg-documents" + - "--filesystem=xdg-pictures" + - "--filesystem=xdg-desktop" + - "--filesystem=xdg-run/gvfs" + - "--filesystem=xdg-run/gvfsd" + - "--env=RUST_BACKTRACE=full" + - "--env=RUST_LOG=rnote=debug" + - "--env=G_MESSAGES_DEBUG=all" + - "--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/llvm14/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' + # CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: clang + # CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: '-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold' + build-args: + - "--share=network" + test-args: + - "--socket=x11" + - "--share=network" + prepend-ld-library-path: /usr/lib/sdk/llvm14/lib +modules: + - name: poppler + buildsystem: cmake-ninja + config-opts: + - "-DCMAKE_INSTALL_LIBDIR=/app/lib" + - "-DCMAKE_INSTALL_INCLUDEDIR=/app/include" + - "-DENABLE_BOOST=OFF" + - "-DENABLE_LIBOPENJPEG=none" + sources: + - type: archive + url: "https://poppler.freedesktop.org/poppler-22.09.0.tar.xz" + sha256: d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e + - name: poppler-data + buildsystem: cmake-ninja + config-opts: + - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + sources: + - type: archive + url: "https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz" + sha256: 2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c + - name: rnote + buildsystem: meson + run-tests: true + config-opts: + - "-Dprofile=devel" + sources: + - type: dir + path: ../ diff --git a/ink-stroke-modeler-rs b/ink-stroke-modeler-rs index 4728e35c71..321ca3acf5 160000 --- a/ink-stroke-modeler-rs +++ b/ink-stroke-modeler-rs @@ -1 +1 @@ -Subproject commit 4728e35c718307f16be43d1ffcc0d3c480c4803e +Subproject commit 321ca3acf560c09a876a393aeed72cdb1ce077cc