From b45c3276056915f885081e155a3ca78cea16dae0 Mon Sep 17 00:00:00 2001 From: GloriousEggroll Date: Sun, 7 Jul 2024 12:25:35 -0600 Subject: [PATCH] bump flatpak yml --- ...rg.openwinecomponents.umu.umu-launcher.yml | 166 ++++++++++++++---- 1 file changed, 133 insertions(+), 33 deletions(-) diff --git a/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml b/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml index e38359836..e400645d4 100644 --- a/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml +++ b/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml @@ -145,19 +145,6 @@ add-extensions: autodelete: true modules: - # --- umu --- - - name: umu-run - buildsystem: simple - build-commands: - - | - git submodule update --init --recursive - ./configure.sh --prefix=/app - make FLATPAK=xtrue install - sources: - - type: git - url: https://github.com/Open-Wine-Components/umu-launcher.git - branch: flatpak_work - - name: platform-bootstrap buildsystem: simple build-commands: @@ -188,7 +175,16 @@ modules: /app/lib/i386-linux-gnu /lib64 - # These are needed for building python-xlib and python-psutil + - name: python-distro # also needed by Lutris, do not add a cleanup property here! + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a/distro-1.7.0.tar.gz + sha256: 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 + + # These are needed for window management inside gamescope - name: python-flit-core # needed by idna buildsystem: simple build-commands: @@ -196,8 +192,8 @@ modules: cleanup: ['*'] sources: - type: archive - url: https://files.pythonhosted.org/packages/15/d1/d8798b83e953fd6f86ca9b50f93eec464a9305b0661469c8234e61095481/flit_core-3.7.1.tar.gz - sha256: 14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f + url: https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80/flit_core-3.9.0.tar.gz + sha256: 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba - name: python-ninja # needed by dbus-python buildsystem: simple @@ -216,19 +212,26 @@ modules: - name: python-skbuild buildsystem: simple build-commands: - - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" - . + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . cleanup: ['*'] sources: - type: archive url: https://files.pythonhosted.org/packages/9e/e2/2e440c30e93fc5b505ee56169a4396b05e797a1daadb721aba429adbfd51/scikit-build-0.15.0.tar.gz sha256: e723cd0f3489a042370b9ea988bbb9cfd7725e8b25b20ca1c7981821fcf65fb9 modules: + - name: python-distro # also needed by Lutris, do not add a cleanup property here! + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a/distro-1.7.0.tar.gz + sha256: 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 - name: python-setuptools-scm buildsystem: simple build-commands: - - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" - . + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . cleanup: ['*'] sources: - type: archive @@ -238,13 +241,12 @@ modules: - name: python-packaging buildsystem: simple build-commands: - - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" - . + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . cleanup: ['*'] sources: - type: archive - url: https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c/packaging-21.3.tar.gz - sha256: dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb + url: https://files.pythonhosted.org/packages/51/65/50db4dda066951078f0a96cf12f4b9ada6e4b811516bf0262c0f4f7064d4/packaging-24.1.tar.gz + sha256: 026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 modules: - name: python-pyparsing buildsystem: simple @@ -273,15 +275,6 @@ modules: - type: archive url: https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3/tomli-2.0.1.tar.gz sha256: de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f - - name: python-distro # also needed by Lutris, do not add a cleanup property here! - buildsystem: simple - build-commands: - - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . - sources: - - type: archive - url: https://files.pythonhosted.org/packages/b5/7e/ddfbd640ac9a82e60718558a3de7d5988a7d4648385cf00318f60a8b073a/distro-1.7.0.tar.gz - sha256: 151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39 - # These are needed for window management inside gamescope # --- python-xlib --- - name: python-xlib buildsystem: simple @@ -291,3 +284,110 @@ modules: - type: archive url: https://files.pythonhosted.org/packages/source/p/python-xlib/python-xlib-0.33.tar.gz sha256: 55af7906a2c75ce6cb280a584776080602444f75815a7aff4d287bb2d7018b32 + # --- umu --- + # We use make first to install things like version and /usr/share/ files + # We then use pip to overwrite the python-specific installed files to verify + # the symlinks are corrected. + - name: umu-run + buildsystem: simple + build-commands: + - | + git submodule update --init --recursive + ./configure.sh --prefix=/app + make FLATPAK=xtrue install DESTDIR=/app + cp -R /app/app/share/* /app/share/ + cp -R /app/usr/* /app/ + rm -Rf /app/app/ + pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + sources: + - type: git + url: https://github.com/Open-Wine-Components/umu-launcher.git + branch: main + modules: + # --- packaging --- + - name: packaging + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/51/65/50db4dda066951078f0a96cf12f4b9ada6e4b811516bf0262c0f4f7064d4/packaging-24.1.tar.gz + sha256: 026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 + + # --- trove_classifiers --- + - name: trove_classifiers + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/78/c9/83f915c3f6f94f4c862c7470284fd714f312cce8e3cf98361312bc02493d/trove_classifiers-2024.7.2.tar.gz + sha256: 8328f2ac2ce3fd773cbb37c765a0ed7a83f89dc564c7d452f039b69249d0ac35 + + # --- pathspec --- + - name: pathspec + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/ca/bc/f35b8446f4531a7cb215605d100cd88b7ac6f44ab3fc94870c120ab3adbf/pathspec-0.12.1.tar.gz + sha256: a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712 + + # --- pluggy --- + - name: pluggy + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6/pluggy-1.5.0.tar.gz + sha256: 2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 + + # --- pyproject_hooks --- + - name: pyproject_hooks + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/c7/07/6f63dda440d4abb191b91dc383b472dae3dd9f37e4c1e4a5c3db150531c6/pyproject_hooks-1.1.0.tar.gz + sha256: 4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965 + + # --- python-build --- + - name: python-build + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/ce/9e/2d725d2f7729c6e79ca62aeb926492abbc06e25910dd30139d60a68bcb19/build-1.2.1.tar.gz + sha256: 526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d + + # --- python-installer --- + - name: python-installer + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/05/18/ceeb4e3ab3aa54495775775b38ae42b10a92f42ce42dfa44da684289b8c8/installer-0.7.0.tar.gz + sha256: a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631 + + # --- python-hatchling --- + - name: python-hatchling + buildsystem: simple + build-commands: + - pip3 install --no-index --no-build-isolation --prefix="${FLATPAK_DEST}" . + cleanup: ['*'] + sources: + - type: archive + url: https://files.pythonhosted.org/packages/a3/51/8a4a67a8174ce59cf49e816e38e9502900aea9b4af672d0127df8e10d3b0/hatchling-1.25.0.tar.gz + sha256: 7064631a512610b52250a4d3ff1bd81551d6d1431c4eb7b72e734df6c74f4262