From b0637add6e5adc300dfdebbe720280cbee002ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Mon, 18 May 2026 00:35:04 +0300 Subject: [PATCH 1/3] Update the runtime version from 24.08 to 25.08, and more MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update the runtime version to 25.0 - Update some nuget sources to fix build errors - Use the libsecret module from the runtime - Drop the shared-modules - Other trivial changes Signed-off-by: Sabri Ünal --- .gitmodules | 3 --- com.one_ware.OneWare.yml | 17 +++++++---------- oneware-nuget-sources.json | 20 ++++++++++---------- shared-modules | 1 - 4 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 .gitmodules delete mode 160000 shared-modules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1e7a990..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "shared-modules"] - path = shared-modules - url = https://github.com/flathub/shared-modules.git diff --git a/com.one_ware.OneWare.yml b/com.one_ware.OneWare.yml index d954662..4b01795 100644 --- a/com.one_ware.OneWare.yml +++ b/com.one_ware.OneWare.yml @@ -1,21 +1,21 @@ app-id: com.one_ware.OneWare runtime: org.freedesktop.Platform -runtime-version: '24.08' +runtime-version: '25.08' sdk: org.freedesktop.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.dotnet10 build-options: - prepend-path: "/usr/lib/sdk/dotnet10/bin" - append-ld-library-path: "/usr/lib/sdk/dotnet10/lib" - prepend-pkg-config-path: "/usr/lib/sdk/dotnet10/lib/pkgconfig" + prepend-path: /usr/lib/sdk/dotnet10/bin + append-ld-library-path: /usr/lib/sdk/dotnet10/lib + prepend-pkg-config-path: /usr/lib/sdk/dotnet10/lib/pkgconfig arch: aarch64: env: - RUNTIME: "linux-arm64" + RUNTIME: linux-arm64 x86_64: env: - RUNTIME: "linux-x64" + RUNTIME: linux-x64 command: oneware separate-locales: false @@ -29,9 +29,6 @@ finish-args: - --talk-name=org.freedesktop.secrets modules: - # Libsecret - - shared-modules/libsecret/libsecret.json - # Git - name: git buildsystem: simple @@ -61,7 +58,7 @@ modules: - type: archive url: https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.22.0.tar.bz2 sha256: 1069e5d7909bcc563baeaadc3a5c496f0e658524c413cf7818816e37bfcea344 - + # OneWare build module - name: oneware buildsystem: simple diff --git a/oneware-nuget-sources.json b/oneware-nuget-sources.json index 51e996c..4466b36 100644 --- a/oneware-nuget-sources.json +++ b/oneware-nuget-sources.json @@ -407,10 +407,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/10.0.7/microsoft.aspnetcore.app.runtime.linux-x64.10.0.7.nupkg", - "sha512": "0188eda19b8bca9662d38b9f39ea371277f86ae0ae4e1fcefad7f795801c7fd77968af397881d7b5e39bb207f7f9bcd181557d43c66b359a86ce6a38113e91ac", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-x64/10.0.8/microsoft.aspnetcore.app.runtime.linux-x64.10.0.8.nupkg", + "sha512": "a781e31a112160fdc0ec19b861661459baccb19209c2be4cce9acd911898b36de7308dc054da164a4bcf03a1db54572360b1d135c7d54f590fc1fad0c9ef01bc", "dest": "nuget-sources", - "dest-filename": "microsoft.aspnetcore.app.runtime.linux-x64.10.0.7.nupkg" + "dest-filename": "microsoft.aspnetcore.app.runtime.linux-x64.10.0.8.nupkg" }, { "type": "file", @@ -687,10 +687,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.crossgen2.linux-x64/10.0.7/microsoft.netcore.app.crossgen2.linux-x64.10.0.7.nupkg", - "sha512": "7fde2d36df5bb953fd4755927628a9de49d44cf8510e717f3dc32cbc23bedf5bcaa74cd1cdadf567acf3d0786012ca99594ab9fbbac5e058901e8d61e28b0d6c", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.crossgen2.linux-x64/10.0.8/microsoft.netcore.app.crossgen2.linux-x64.10.0.8.nupkg", + "sha512": "4e7f439f306c864ea01e9fcf3dee441fe80608e3352e3254617412217cebd8823d9399bc243494f2735d53425a3f16dcdff7bdd7fcda902755e2801feaa7f03c", "dest": "nuget-sources", - "dest-filename": "microsoft.netcore.app.crossgen2.linux-x64.10.0.7.nupkg" + "dest-filename": "microsoft.netcore.app.crossgen2.linux-x64.10.0.8.nupkg" }, { "type": "file", @@ -701,10 +701,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/10.0.7/microsoft.netcore.app.runtime.linux-x64.10.0.7.nupkg", - "sha512": "e8ce562c71206e4c11808ad54cd0a2c8a4591171ba35d4a930713a6b7132b5af5d7e7c0e46d4ee83fa8573f8b4947ccaa3b91c0ffa926b49fc6c8c2f562f1a94", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-x64/10.0.8/microsoft.netcore.app.runtime.linux-x64.10.0.8.nupkg", + "sha512": "0c06ed751c8c0a4bb91fcb0ed2b57b171f8ae3d2d7ce592675c9a2e56703fed6b39e5f4e11c1ca2f2d795972404246f1e7b89b6c9df903c0fcd34b0e021beac1", "dest": "nuget-sources", - "dest-filename": "microsoft.netcore.app.runtime.linux-x64.10.0.7.nupkg" + "dest-filename": "microsoft.netcore.app.runtime.linux-x64.10.0.8.nupkg" }, { "type": "file", @@ -1812,4 +1812,4 @@ "dest": "nuget-sources", "dest-filename": "xaml.behaviors.interactivity.11.3.9.3.nupkg" } -] \ No newline at end of file +] diff --git a/shared-modules b/shared-modules deleted file mode 160000 index 72028a8..0000000 --- a/shared-modules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72028a85f6aa176472891de9811b156eda18d280 From 5babcc08668a8d9588d4b1360e80d16f218ea517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Mon, 18 May 2026 01:39:12 +0300 Subject: [PATCH 2/3] Fix aarch64/arm build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sabri Ünal --- oneware-nuget-sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/oneware-nuget-sources.json b/oneware-nuget-sources.json index 4466b36..4a663bb 100644 --- a/oneware-nuget-sources.json +++ b/oneware-nuget-sources.json @@ -400,10 +400,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/10.0.7/microsoft.aspnetcore.app.runtime.linux-arm64.10.0.7.nupkg", - "sha512": "cafc92236965c07dc2e5226eee730f5dd88cb7d23c984eb261eda8eee19198b8a861d6af2fc2162537b4cfe787a941c124d19339e72ee225f27b01720675d151", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.linux-arm64/10.0.8/microsoft.aspnetcore.app.runtime.linux-arm64.10.0.8.nupkg", + "sha512": "8738142697bca8cad38cb023abe633bb36fec73624647763d5d13843f94c2f5f8b50d9d9106fec2ac678fcace777da12af0225337e6f8d0617e19048d5d45a83", "dest": "nuget-sources", - "dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm64.10.0.7.nupkg" + "dest-filename": "microsoft.aspnetcore.app.runtime.linux-arm64.10.0.8.nupkg" }, { "type": "file", @@ -680,10 +680,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.crossgen2.linux-arm64/10.0.7/microsoft.netcore.app.crossgen2.linux-arm64.10.0.7.nupkg", - "sha512": "57eec31a7820728f0a09719db0db0193a157a4aaee9a4e8ff6083753806afcd08c5d1427c3594ad4ffc24551b19e14a953864f4403e2c09d7dc18654a5fa12a9", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.crossgen2.linux-arm64/10.0.8/microsoft.netcore.app.crossgen2.linux-arm64.10.0.8.nupkg", + "sha512": "c336e77b1d1aef5638b866b442882068a29ee666613b1c3c6b5701322a468be02af5c821dee3dae38e9a146b68c5f07fbe43e8484059223baf5e8211ddfb5838", "dest": "nuget-sources", - "dest-filename": "microsoft.netcore.app.crossgen2.linux-arm64.10.0.7.nupkg" + "dest-filename": "microsoft.netcore.app.crossgen2.linux-arm64.10.0.8.nupkg" }, { "type": "file", @@ -694,10 +694,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/10.0.7/microsoft.netcore.app.runtime.linux-arm64.10.0.7.nupkg", - "sha512": "97f334245cbe06a565d159a1ffb5d6fee4ad0b991c271b36d11417ac1f60b72d7fd7e8de30fb4d8cf3314215f897c2299efc492b11eb4304b87e61b17952dc93", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.linux-arm64/10.0.8/microsoft.netcore.app.runtime.linux-arm64.10.0.8.nupkg", + "sha512": "c8789ed7bd9394a7a284ad7d6405995edbb4d75cf111376b907687cf33383bb979b20b8cce778b573e15cddc3a694f17692f732da2652f4399f6825dcf83019e", "dest": "nuget-sources", - "dest-filename": "microsoft.netcore.app.runtime.linux-arm64.10.0.7.nupkg" + "dest-filename": "microsoft.netcore.app.runtime.linux-arm64.10.0.8.nupkg" }, { "type": "file", From 48a10972c38ed4e746d6406ec2ef7567fe4dbb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Mon, 18 May 2026 01:55:14 +0300 Subject: [PATCH 3/3] Fix appdata paper cuts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sabri Ünal --- com.one_ware.OneWare.yml | 8 +++--- fix-appdata.patch | 57 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 fix-appdata.patch diff --git a/com.one_ware.OneWare.yml b/com.one_ware.OneWare.yml index 4b01795..5825e1a 100644 --- a/com.one_ware.OneWare.yml +++ b/com.one_ware.OneWare.yml @@ -66,9 +66,9 @@ modules: - dotnet publish --source nuget-sources -c Release -r $RUNTIME -o ./studio ./source/studio/OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj - install -D -m755 oneware ${FLATPAK_DEST}/bin/oneware - install -D -m644 studio/${FLATPAK_ID}.mime.xml ${FLATPAK_DEST}/share/mime/packages/${FLATPAK_ID}-mime.xml - - install -D -m644 studio/${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop - - install -D -m644 studio/Assets/${FLATPAK_ID}.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg - - install -D -m644 studio/${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml + - install -D -m644 studio/${FLATPAK_ID}.desktop -t ${FLATPAK_DEST}/share/applications/ + - install -D -m644 studio/Assets/${FLATPAK_ID}.svg -t ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ + - install -D -m644 studio/${FLATPAK_ID}.metainfo.xml -t ${FLATPAK_DEST}/share/metainfo/ - cp -r studio ${FLATPAK_DEST}/bin/studio sources: - type: git @@ -77,6 +77,8 @@ modules: dest: source tag: 1.0.15 commit: 2d51e0e25b5c6e1a9c32d272bc74a8afa81dbf9f + - type: patch + path: fix-appdata.patch - type: script dest-filename: oneware commands: diff --git a/fix-appdata.patch b/fix-appdata.patch new file mode 100644 index 0000000..99ddcf7 --- /dev/null +++ b/fix-appdata.patch @@ -0,0 +1,57 @@ +From 0dafaf4757579ed7e84f8d3e0483a3ec036c9a17 Mon Sep 17 00:00:00 2001 +From: Sabri Ünal +Date: Mon, 18 May 2026 01:52:05 +0300 +Subject: [PATCH] Fix appdata paper cuts + +Signed-off-by: Sabri Ünal +--- + source/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/source/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml b/source/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml +index 6eb45a1..46c2343 100644 +--- a/source/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml ++++ b/source/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml +@@ -32,26 +32,26 @@ + + https://one-ware.com/studio + https://github.com/one-ware/OneWare/issues +- https://one-ware.com/docs/studio/tutorials/create-project +- https://one-ware.com/docs/contact ++ https://one-ware.com/docs/ ++ https://one-ware.com/docs/legal/contact/ + https://github.com/one-ware/OneWare + + +- https://one-ware.com/img/studio/slides2/completion.png ++ https://imgproxy.flathub.org/insecure/dpr:2/f:avif/rs:fill-down/aHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9tZWRpYS9jb20vb25lX3dhcmUvT25lV2FyZS83Y2JmYTExOTMzNGU0NTY5MmI0NWVjODgzZTAyZDViOC9zY3JlZW5zaG90cy9pbWFnZS0xX29yaWcucG5n + Code Editor for HDL languages + + +- https://one-ware.com/img/studio/slides2/hardware.png ++ https://imgproxy.flathub.org/insecure/dpr:2/f:avif/rs:fill-down/aHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9tZWRpYS9jb20vb25lX3dhcmUvT25lV2FyZS83Y2JmYTExOTMzNGU0NTY5MmI0NWVjODgzZTAyZDViOC9zY3JlZW5zaG90cy9pbWFnZS0yX29yaWcucG5n + Support for a wide range of hardware + + +- https://one-ware.com/img/studio/slides2/simulator.png ++ https://imgproxy.flathub.org/insecure/dpr:2/f:avif/rs:fill-down/aHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9tZWRpYS9jb20vb25lX3dhcmUvT25lV2FyZS83Y2JmYTExOTMzNGU0NTY5MmI0NWVjODgzZTAyZDViOC9zY3JlZW5zaG90cy9pbWFnZS0zX29yaWcucG5n + Integrated support for simulation using the VCD format and all the popular + simulation tools + + + +- https://one-ware.com/img/studio/slides2/extensions.png ++ https://imgproxy.flathub.org/insecure/dpr:2/f:avif/rs:fill-down/aHR0cHM6Ly9kbC5mbGF0aHViLm9yZy9tZWRpYS9jb20vb25lX3dhcmUvT25lV2FyZS83Y2JmYTExOTMzNGU0NTY5MmI0NWVjODgzZTAyZDViOC9zY3JlZW5zaG90cy9pbWFnZS00X29yaWcucG5n + A growing collection of useful extensions + + +@@ -132,4 +132,4 @@ + vhdl editor + verilog simulator + +- +\ No newline at end of file ++ +-- +libgit2 1.7.2 +