Merge pull request #414 from Universite-Gustave-Eiffel/fixlinux

fix flatpak build

Author: nicolas-f

currentRelease/SystemScript/check_version/__init__.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
 import uictrl as ui
 import uilocale
-import urllib.request
 import os
 import re
+import requests
 
 _ = uilocale.InstallUiModule(ui.application.getapplicationpath()["systemscript"]+"check_version"+os.sep,ui.application.getlocale())
 
@@ -15,19 +15,11 @@ def versionToCode(major, minor, revision):
 def check_version():
     visimpa = list(map(int, ui.application.getversion().split(".")))[:3]
     visimpa = versionToCode(visimpa[0], visimpa[1], visimpa[2])
-
-    with urllib.request.urlopen("https://raw.githubusercontent.com/Ifsttar/I-Simpa/master/CMakeLists.txt") as response:
-        html = response.read().decode("utf-8")
-        p = re.compile("^project \(isimpa VERSION (\d+\.)?(\d+\.)?(\*|\d+)")
-
-        for line in html.split("\n"):
-            r = p.match(line)
-            if r is not None:
-                major = int(r.group(1)[:1])
-                minor = int(r.group(2)[:1])
-                revision = int(r.group(3))
-                if visimpa < versionToCode(major, minor, revision):
-                        ui.application.loginfo(_("A new version of I-Simpa is available, please look at https://github.com/Ifsttar/I-Simpa/releases/latest"))
-                return major, minor, revision
-    return 0, 0, 0
+    response = requests.get("https://api.github.com/repos/Universite-Gustave-Eiffel/I-Simpa/releases/latest")
+    data = response.json()
+    latest_tag = data['tag_name']
+    major, minor, revision = map(int, latest_tag[1:].split("."))
+    if visimpa < versionToCode(major, minor, revision):
+            ui.application.loginfo(_("A new version of I-Simpa is available, please look at https://github.com/Universite-Gustave-Eiffel/I-Simpa/releases/latest"))
+    return major, minor, revision
 

org.noise_planet.i-simpa.yml

@@ -10,6 +10,7 @@ finish-args:
   - --socket=wayland
   - --device=dri
   - --filesystem=home
+  - --share=network # check if there is a new version of I-SIMPA
   - --env=LD_LIBRARY_PATH=/app/lib:/app/lib64
 cleanup:
   - '/include'
@@ -66,6 +67,28 @@ modules:
       - type: archive
         url: https://github.com/wxWidgets/wxWidgets/releases/download/v3.3.1/wxWidgets-3.3.1.tar.bz2
         sha256: f936c8d694f9c49a367a376f99c751467150a4ed7cbf8f4723ef19b2d2d9998d
+  # Generated with flatpak-pip-generator requests --yaml
+  - name: python3-requests
+    buildsystem: simple
+    build-commands:
+      - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}"
+        --prefix=${FLATPAK_DEST} "requests" --no-build-isolation
+    sources:
+      - type: file
+        url: https://files.pythonhosted.org/packages/e4/37/af0d2ef3967ac0d6113837b44a4f0bfe1328c2b9763bd5b1744520e5cfed/certifi-2025.10.5-py3-none-any.whl
+        sha256: 0f212c2744a9bb6de0c56639a6f68afe01ecd92d91f14ae897c4fe7bbeeef0de
+      - type: file
+        url: https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz
+        sha256: 94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a
+      - type: file
+        url: https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl
+        sha256: 771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea
+      - type: file
+        url: https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl
+        sha256: 2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6
+      - type: file
+        url: https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl
+        sha256: e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
   - name: isimpa
     buildsystem: cmake-ninja
     sources:

src/isimpa/CMakeLists.txt

@@ -586,7 +586,7 @@ else()
     target_link_libraries(isimpa ${wxWidgets_LIBRARIES})
 endif()
 
-target_link_libraries(isimpa OpenGL::GL)
+target_link_libraries(isimpa OpenGL::GL OpenGL::GLU)
 
 add_definitions(-DUSE_PYTHON=${PYTHONLIBS_FOUND})