From e15b50b3b4073e1d2fe348682b70fe4b90c36839 Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Mon, 22 Dec 2025 00:02:05 +0100 Subject: [PATCH] Add flatpak script --- Cargo.lock | 489 +----------------- inköpslista-gui/Cargo.toml | 3 +- inköpslista-gui/flatpak/.gitignore | 3 + inköpslista-gui/flatpak/build-flatpak.sh | 14 + .../flatpak/sh.nubo.Inkopslista.desktop | 9 + .../flatpak/sh.nubo.Inkopslista.yml | 42 ++ 6 files changed, 86 insertions(+), 474 deletions(-) create mode 100644 inköpslista-gui/flatpak/.gitignore create mode 100644 inköpslista-gui/flatpak/build-flatpak.sh create mode 100644 inköpslista-gui/flatpak/sh.nubo.Inkopslista.desktop create mode 100644 inköpslista-gui/flatpak/sh.nubo.Inkopslista.yml diff --git a/Cargo.lock b/Cargo.lock index 61bf01b..a245d88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,96 +18,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" -[[package]] -name = "accesskit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99" - -[[package]] -name = "accesskit_atspi_common" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890d241cf51fc784f0ac5ac34dfc847421f8d39da6c7c91a0fcc987db62a8267" -dependencies = [ - "accesskit", - "accesskit_consumer", - "atspi-common", - "serde", - "thiserror 1.0.69", - "zvariant", -] - -[[package]] -name = "accesskit_consumer" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db81010a6895d8707f9072e6ce98070579b43b717193d2614014abd5cb17dd43" -dependencies = [ - "accesskit", - "hashbrown 0.15.5", -] - -[[package]] -name = "accesskit_macos" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0089e5c0ac0ca281e13ea374773898d9354cc28d15af9f0f7394d44a495b575" -dependencies = [ - "accesskit", - "accesskit_consumer", - "hashbrown 0.15.5", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "accesskit_unix" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301e55b39cfc15d9c48943ce5f572204a551646700d0e8efa424585f94fec528" -dependencies = [ - "accesskit", - "accesskit_atspi_common", - "async-channel", - "async-executor", - "async-task", - "atspi", - "futures-lite", - "futures-util", - "serde", - "zbus", -] - -[[package]] -name = "accesskit_windows" -version = "0.29.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d63dd5041e49c363d83f5419a896ecb074d309c414036f616dc0b04faca971" -dependencies = [ - "accesskit", - "accesskit_consumer", - "hashbrown 0.15.5", - "static_assertions", - "windows 0.61.3", - "windows-core 0.61.2", -] - -[[package]] -name = "accesskit_winit" -version = "0.29.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8cfabe59d0eaca7412bfb1f70198dd31e3b0496fee7e15b066f9c36a1a140a0" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "raw-window-handle", - "winit", -] - [[package]] name = "adler2" version = "2.0.1" @@ -231,12 +141,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - [[package]] name = "as-slice" version = "0.2.1" @@ -420,56 +324,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atspi" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83247582e7508838caf5f316c00791eee0e15c0bf743e6880585b867e16815c" -dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33dfc05e7cdf90988a197803bf24f5788f94f7c94a69efa95683e8ffe76cfdfb" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus", - "zbus-lockstep", - "zbus-lockstep-macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "atspi-connection" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4193d51303d8332304056ae0004714256b46b6635a5c556109b319c0d3784938" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite", - "zbus", -] - -[[package]] -name = "atspi-proxies" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eebcb9e7e76f26d0bcfd6f0295e1cd1e6f33bedbc5698a971db8dc43d7751c" -dependencies = [ - "atspi-common", - "serde", - "zbus", -] - [[package]] name = "auto_enums" version = "0.8.7" @@ -681,12 +535,6 @@ dependencies = [ "syn", ] -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "byteorder-lite" version = "0.1.0" @@ -808,7 +656,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -930,7 +778,6 @@ dependencies = [ "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", "smithay-clipboard", - "x11-clipboard", ] [[package]] @@ -997,56 +844,6 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" -[[package]] -name = "cpp" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bcac3d8234c1fb813358e83d1bb6b0290a3d2b3b5efc6b88bfeaf9d8eec17" -dependencies = [ - "cpp_macros", -] - -[[package]] -name = "cpp_build" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f8638c97fbd79cc6fc80b616e0e74b49bac21014faed590bbc89b7e2676c90" -dependencies = [ - "cc", - "cpp_common", - "lazy_static", - "proc-macro2", - "regex", - "syn", - "unicode-xid", -] - -[[package]] -name = "cpp_common" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fcfea2ee05889597d35e986c2ad0169694320ae5cc8f6d2640a4bb8a884560" -dependencies = [ - "lazy_static", - "proc-macro2", - "syn", -] - -[[package]] -name = "cpp_macros" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d156158fe86e274820f5a53bc9edb0885a6e7113909497aa8d883b69dd171871" -dependencies = [ - "aho-corasick", - "byteorder", - "cpp_common", - "lazy_static", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "crc32fast" version = "1.5.0" @@ -1102,12 +899,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "ctor-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" - [[package]] name = "cursor-icon" version = "1.2.0" @@ -1773,16 +1564,6 @@ dependencies = [ "windows 0.48.0", ] -[[package]] -name = "gethostname" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" -dependencies = [ - "rustix 1.1.2", - "windows-link 0.2.1", -] - [[package]] name = "getrandom" version = "0.2.16" @@ -1870,7 +1651,6 @@ dependencies = [ "cgl", "dispatch2", "glutin_egl_sys", - "glutin_glx_sys", "glutin_wgl_sys", "libloading", "objc2 0.6.3", @@ -1881,7 +1661,6 @@ dependencies = [ "raw-window-handle", "wayland-sys", "windows-sys 0.52.0", - "x11-dl", ] [[package]] @@ -1906,16 +1685,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "glutin_glx_sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7bb2938045a88b612499fbcba375a77198e01306f52272e692f8c1f3751185" -dependencies = [ - "gl_generator", - "x11-dl", -] - [[package]] name = "glutin_wgl_sys" version = "0.6.1" @@ -2175,7 +1944,6 @@ version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8fd06c00fbdac3dd490cf5c10da7daad3820d775060a19ea277d8ab944a160b" dependencies = [ - "bytemuck", "calloop 0.14.3", "drm", "gbm", @@ -2184,7 +1952,6 @@ dependencies = [ "i-slint-core", "i-slint-renderer-femtovg", "input", - "memmap2", "nix", "raw-window-handle", "xkbcommon", @@ -2197,15 +1964,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c946891ff0bfa95a5944c7cfc18828b8e123edea1168301f1e1b5505aa82933e" dependencies = [ "const-field-offset", - "cpp", - "cpp_build", "i-slint-common", "i-slint-core", "i-slint-core-macros", - "lyon_path", - "pin-project", - "pin-weak", - "qttypes", "vtable", ] @@ -2230,9 +1991,6 @@ version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69bf9167fb1165942ef1f034e039645b60b07b23c0c76069cb83595f979243a4" dependencies = [ - "accesskit", - "accesskit_winit", - "bytemuck", "cfg-if", "cfg_aliases", "copypasta", @@ -2245,13 +2003,11 @@ dependencies = [ "i-slint-core-macros", "i-slint-renderer-femtovg", "i-slint-renderer-skia", - "imgref", "lyon_path", "muda", "objc2-app-kit 0.3.2", "pin-weak", "raw-window-handle", - "rgb", "scoped-tls-hkt", "scopeguard", "softbuffer", @@ -2312,14 +2068,12 @@ checksum = "dc140f1218cfc4451b9e8753306c42afbcaf0386cc888e53664c1a5f5330ae19" dependencies = [ "auto_enums", "bitflags 2.10.0", - "bytemuck", "cfg-if", "chrono", "clru", "const-field-offset", "derive_more", "euclid", - "fontdue", "i-slint-common", "i-slint-core-macros", "image", @@ -2339,7 +2093,6 @@ dependencies = [ "rgb", "scoped-tls-hkt", "scopeguard", - "skrifa", "slab", "strum", "sys-locale", @@ -2898,7 +2651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3812,7 +3565,7 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -4091,33 +3844,12 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "qttypes" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7edf5b38c97ad8900ad2a8418ee44b4adceaa866a4a3405e2f1c909871d7ebd" -dependencies = [ - "cpp", - "cpp_build", - "semver", -] - [[package]] name = "quick-error" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" -[[package]] -name = "quick-xml" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "quick-xml" version = "0.37.5" @@ -4956,7 +4688,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c35c4bdca2c42c69b21ceb416aa4ba76c3f54df30e9ce85dcad0742229422a6" dependencies = [ "const-field-offset", - "i-slint-backend-qt", "i-slint-backend-selector", "i-slint-core", "i-slint-core-macros", @@ -5141,7 +4872,6 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" dependencies = [ - "as-raw-xcb-connection", "bytemuck", "fastrand", "js-sys", @@ -5155,7 +4885,6 @@ dependencies = [ "raw-window-handle", "redox_syscall 0.5.18", "rustix 1.1.2", - "tiny-xlib", "tracing", "wasm-bindgen", "wayland-backend", @@ -5163,7 +4892,6 @@ dependencies = [ "wayland-sys", "web-sys", "windows-sys 0.61.2", - "x11rb", ] [[package]] @@ -5467,19 +5195,6 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tiny-xlib" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e" -dependencies = [ - "as-raw-xcb-connection", - "ctor-lite", - "libloading", - "pkg-config", - "tracing", -] - [[package]] name = "tinystr" version = "0.8.2" @@ -6226,7 +5941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" dependencies = [ "proc-macro2", - "quick-xml 0.37.5", + "quick-xml", "quote", ] @@ -6327,38 +6042,16 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.61.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" -dependencies = [ - "windows-collections 0.2.0", - "windows-core 0.61.2", - "windows-future 0.2.1", - "windows-link 0.1.3", - "windows-numerics 0.2.0", -] - [[package]] name = "windows" version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-collections 0.3.2", + "windows-collections", "windows-core 0.62.2", - "windows-future 0.3.2", - "windows-numerics 0.3.1", -] - -[[package]] -name = "windows-collections" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" -dependencies = [ - "windows-core 0.61.2", + "windows-future", + "windows-numerics", ] [[package]] @@ -6383,19 +6076,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" -dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - [[package]] name = "windows-core" version = "0.62.2" @@ -6404,22 +6084,11 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement 0.60.2", "windows-interface 0.59.3", - "windows-link 0.2.1", + "windows-link", "windows-result 0.4.1", "windows-strings 0.5.1", ] -[[package]] -name = "windows-future" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" -dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", - "windows-threading 0.1.0", -] - [[package]] name = "windows-future" version = "0.3.2" @@ -6427,8 +6096,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ "windows-core 0.62.2", - "windows-link 0.2.1", - "windows-threading 0.2.1", + "windows-link", + "windows-threading", ] [[package]] @@ -6475,28 +6144,12 @@ dependencies = [ "syn", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-numerics" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" -dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", -] - [[package]] name = "windows-numerics" version = "0.3.1" @@ -6504,7 +6157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ "windows-core 0.62.2", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6516,22 +6169,13 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-result" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6544,22 +6188,13 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-strings" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6613,7 +6248,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6668,7 +6303,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -6679,22 +6314,13 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] -[[package]] -name = "windows-threading" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-threading" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6888,7 +6514,6 @@ dependencies = [ "atomic-waker", "bitflags 2.10.0", "block2 0.5.1", - "bytemuck", "calloop 0.13.0", "cfg_aliases", "concurrent-queue", @@ -6905,7 +6530,6 @@ dependencies = [ "objc2-foundation 0.2.2", "objc2-ui-kit", "orbclient", - "percent-encoding", "pin-project", "raw-window-handle", "redox_syscall 0.4.1", @@ -6924,8 +6548,6 @@ dependencies = [ "web-sys", "web-time", "windows-sys 0.52.0", - "x11-dl", - "x11rb", "xkbcommon-dl", ] @@ -6963,48 +6585,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" -[[package]] -name = "x11-clipboard" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3" -dependencies = [ - "libc", - "x11rb", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading", - "once_cell", - "rustix 1.1.2", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" - [[package]] name = "xattr" version = "1.6.1" @@ -7152,30 +6732,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zbus-lockstep" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998de05217a084b7578728a9443d04ea4cd80f2a0839b8d78770b76ccd45863" -dependencies = [ - "zbus_xml", - "zvariant", -] - -[[package]] -name = "zbus-lockstep-macros" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "zbus-lockstep", - "zbus_xml", - "zvariant", -] - [[package]] name = "zbus_macros" version = "5.12.0" @@ -7203,19 +6759,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zbus_xml" -version = "5.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589e9a02bfafb9754bb2340a9e3b38f389772684c63d9637e76b1870377bec29" -dependencies = [ - "quick-xml 0.36.2", - "serde", - "static_assertions", - "zbus_names", - "zvariant", -] - [[package]] name = "zeno" version = "0.3.3" diff --git a/inköpslista-gui/Cargo.toml b/inköpslista-gui/Cargo.toml index 3d0bb55..583cf49 100644 --- a/inköpslista-gui/Cargo.toml +++ b/inköpslista-gui/Cargo.toml @@ -10,7 +10,8 @@ tokio = { version = "1.48.0", features = ["full"] } [dependencies.slint] version = "1.14.1" -features = ["live-preview"] +default-features = false +features = ["live-preview", "backend-winit-wayland", "renderer-femtovg", "compat-1-2"] [build-dependencies] slint-build = "1.14.1" diff --git a/inköpslista-gui/flatpak/.gitignore b/inköpslista-gui/flatpak/.gitignore new file mode 100644 index 0000000..ddda96f --- /dev/null +++ b/inköpslista-gui/flatpak/.gitignore @@ -0,0 +1,3 @@ +buliddir +repo +inköpslista diff --git a/inköpslista-gui/flatpak/build-flatpak.sh b/inköpslista-gui/flatpak/build-flatpak.sh new file mode 100644 index 0000000..2fe2a3a --- /dev/null +++ b/inköpslista-gui/flatpak/build-flatpak.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -ex + +cd "$(dirname 0)" +CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-../../target}" + +# TODO: cross compilation with cross --target=aarch64-unknown-linux-gnu +cargo b -r + +cp "$CARGO_TARGET_DIR/release/inköpslista" . + +# TODO: cross compilation with --arch=aarch64 +flatpak-builder -v --force-clean --user --install-deps-from=flathub --repo=repo --install builddir sh.nubo.Inkopslista.yml diff --git a/inköpslista-gui/flatpak/sh.nubo.Inkopslista.desktop b/inköpslista-gui/flatpak/sh.nubo.Inkopslista.desktop new file mode 100644 index 0000000..ddff803 --- /dev/null +++ b/inköpslista-gui/flatpak/sh.nubo.Inkopslista.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Inköpslista +Exec=inköpslista %U +Terminal=false +Type=Application +# Icon=sh.nubo.Inköpslista +StartupWMClass=Inköpslista +# Comment= +# Categories=Network; diff --git a/inköpslista-gui/flatpak/sh.nubo.Inkopslista.yml b/inköpslista-gui/flatpak/sh.nubo.Inkopslista.yml new file mode 100644 index 0000000..39ce87d --- /dev/null +++ b/inköpslista-gui/flatpak/sh.nubo.Inkopslista.yml @@ -0,0 +1,42 @@ +id: sh.nubo.Inkopslista +runtime: org.freedesktop.Platform +runtime-version: '25.08' +sdk: org.freedesktop.Sdk + +command: 'inköpslista' + +modules: + - name: inköpslista + buildsystem: simple + sources: + # - type: script + # dest-filename: gui + # commands: + # - echo "hello there" + - type: file + path: ./sh.nubo.Inkopslista.desktop + - type: file + path: ./inköpslista + build-commands: + - install -Dm755 inköpslista $FLATPAK_DEST/bin/inköpslista + - install -Dm644 sh.nubo.Inkopslista.desktop $FLATPAK_DEST/share/applications/sh.nubo.Inkopslista.desktop + + # Icons (max size is 512x512) + # - install -Dm644 usr/share/icons/hicolor/16x16/apps/mullvad-vpn.png /app/share/icons/hicolor/16x16/apps/net.mullvad.MullvadVPN.png + # - install -Dm644 usr/share/icons/hicolor/32x32/apps/mullvad-vpn.png /app/share/icons/hicolor/32x32/apps/net.mullvad.MullvadVPN.png + # - install -Dm644 usr/share/icons/hicolor/48x48/apps/mullvad-vpn.png /app/share/icons/hicolor/48x48/apps/net.mullvad.MullvadVPN.png + # - install -Dm644 usr/share/icons/hicolor/64x64/apps/mullvad-vpn.png /app/share/icons/hicolor/64x64/apps/net.mullvad.MullvadVPN.png + # - install -Dm644 usr/share/icons/hicolor/128x128/apps/mullvad-vpn.png /app/share/icons/hicolor/128x128/apps/net.mullvad.MullvadVPN.png + # - install -Dm644 usr/share/icons/hicolor/256x256/apps/mullvad-vpn.png /app/share/icons/hicolor/256x256/apps/net.mullvad.MullvadVPN.png + # - install -Dm644 usr/share/icons/hicolor/512x512/apps/mullvad-vpn.png /app/share/icons/hicolor/512x512/apps/net.mullvad.MullvadVPN.png + +finish-args: + # Wayland access + - --socket=wayland + # GPU acceleration if needed + - --device=dri + # Needs to talk to the network: + - --share=network + # Needs to save files locally + - --filesystem=xdg-documents +