From d2e86c48d280fae64df6b8bf2c85de18558c9735 Mon Sep 17 00:00:00 2001 From: bbhtt <62639087+bbhtt@users.noreply.github.com> Date: Fri, 30 Sep 2022 14:01:57 +0530 Subject: [PATCH 1/4] Bump runtime to 43 --- org.x.Warpinator.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.x.Warpinator.json b/org.x.Warpinator.json index 0ce9e5b..7373106 100644 --- a/org.x.Warpinator.json +++ b/org.x.Warpinator.json @@ -1,7 +1,7 @@ { "app-id": "org.x.Warpinator", "runtime": "org.gnome.Platform", - "runtime-version": "42", + "runtime-version": "43", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable" @@ -47,8 +47,8 @@ "sources":[ { "type":"archive", - "url":"https://github.com/protocolbuffers/protobuf/releases/download/v21.5/protobuf-cpp-3.21.5.tar.gz", - "sha256":"58c8a18b4ec22655535c493155c5465a8903e8249094ceead87e00763bdbc44f" + "url":"https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-cpp-3.21.7.tar.gz", + "sha256":"70de993af0b4f2ddacce59e62ba6d7b7e48faf48beb1b0d5f1ac0e1fb0a68423" } ] }, @@ -74,7 +74,7 @@ "buildsystem": "meson", "config-opts": [ "-Dapp-lib-only=true", - "-Dpy-overrides-dir=/app/lib/python3.9/site-packages/gi/overrides" + "-Dpy-overrides-dir=/app/lib/python3.10/site-packages/gi/overrides" ], "sources": [ { From eae7199335677ec4845d5533653f0e594dfc0eb4 Mon Sep 17 00:00:00 2001 From: bbhtt <62639087+bbhtt@users.noreply.github.com> Date: Fri, 30 Sep 2022 14:04:47 +0530 Subject: [PATCH 2/4] Refresh python dependencies --- python3-modules.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python3-modules.json b/python3-modules.json index 59c256e..e01f43a 100644 --- a/python3-modules.json +++ b/python3-modules.json @@ -26,8 +26,8 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/51/90/d2bf065b8753951e5fdba822af358edae6dac055b81f018e1ec74d8ba71e/protobuf-4.21.5.tar.gz", - "sha256": "eb1106e87e095628e96884a877a51cdb90087106ee693925ec0a300468a9be3a" + "url": "https://files.pythonhosted.org/packages/56/23/f716074d2ed0af82c0d1da1eaa5e4bb086236568405f13ab0bbaaa6307fb/protobuf-4.21.7.tar.gz", + "sha256": "71d9dba03ed3432c878a801e2ea51e034b0ea01cf3a4344fb60166cb5f6c8757" } ] }, @@ -135,7 +135,7 @@ "name": "python3-setuptools_rust", "buildsystem": "simple", "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"setuptools_rust==1.3.0\" --no-build-isolation" + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"setuptools_rust\" --no-build-isolation" ], "sources": [ { @@ -150,8 +150,8 @@ }, { "type": "file", - "url": "https://files.pythonhosted.org/packages/be/19/a9356aac40b2432cd159264be98843af062877ff27422cdd7cf023828835/setuptools_rust-1.3.0-py3-none-any.whl", - "sha256": "7ead7398d6b6fe70a7743408dc2f7257dbcb8ca9b2d7a9f8b281c09bd86f36a5" + "url": "https://files.pythonhosted.org/packages/ef/da/dca8f90986325abe3027a5e3af5e12ce1d78eeb664a11971b2e7e703b9e3/setuptools_rust-1.5.2-py3-none-any.whl", + "sha256": "8eb45851e34288f2296cd5ab9e924535ac1757318b730a13fe6836867843f206" } ] }, From 5b19baf704927b32a0642f4967f2f0761416c950 Mon Sep 17 00:00:00 2001 From: bbhtt <62639087+bbhtt@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:29:26 +0530 Subject: [PATCH 3/4] Use stdblib --- org.x.Warpinator.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.x.Warpinator.json b/org.x.Warpinator.json index 7373106..08b0c0b 100644 --- a/org.x.Warpinator.json +++ b/org.x.Warpinator.json @@ -57,8 +57,8 @@ "name": "python-xapp", "buildsystem": "simple", "build-commands": [ - "python3 setup.py build", - "python3 setup.py install --prefix=/app" + "SETUPTOOLS_USE_DISTUTILS=stdlib python3 setup.py build", + "SETUPTOOLS_USE_DISTUTILS=stdlib python3 setup.py install --prefix=/app" ], "sources": [ { From c27ef312f8c0670b870caf63dcda8f74ff70573d Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 1 Nov 2022 12:51:46 -0400 Subject: [PATCH 4/4] Switch python3-xapp build type to meson, change commit to latest. --- org.x.Warpinator.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/org.x.Warpinator.json b/org.x.Warpinator.json index 08b0c0b..0a769f1 100644 --- a/org.x.Warpinator.json +++ b/org.x.Warpinator.json @@ -55,17 +55,12 @@ "python3-modules.json", { "name": "python-xapp", - "buildsystem": "simple", - "build-commands": [ - "SETUPTOOLS_USE_DISTUTILS=stdlib python3 setup.py build", - "SETUPTOOLS_USE_DISTUTILS=stdlib python3 setup.py install --prefix=/app" - ], + "buildsystem": "meson", "sources": [ { "type": "git", - "url": "https://github.com/linuxmint/python3-xapp.git", - "tag": "2.2.2", - "commit": "ae2fb1208c69f822aa9ece0a9afde51c56ab2e6f" + "url": "https://github.com/linuxmint/python-xapp.git", + "commit": "052da5e56e3ca2e4c5f2bf905b66e316289ffd1d" } ] },