diff --git a/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py2.Sdk.yml b/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py2.Sdk.yml index 64e0d18..f8005fd 100644 --- a/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py2.Sdk.yml +++ b/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py2.Sdk.yml @@ -11,17 +11,6 @@ modules: - "modules/renpy-shared.yml" - "modules/python-2.7.json" - "modules/python2-requirements.json" - - name: "python2-cython0" - buildsystem: "simple" - build-commands: - - pip2 install --prefix=${FLATPAK_DEST} --no-deps . --verbose - - ln -s ${FLATPAK_DEST}/lib/python2.7/site-packages/cython0.py ${FLATPAK_DEST}/lib/python2.7/site-packages/cython.py - sources: - - type: "git" - url: "https://github.com/dcbaker/cython.git" - branch: "cython0" - cleanup-platform: - - ${FLATPAK_DEST}/bin - name: PyGame_SDL2 buildsystem: simple build-commands: @@ -32,14 +21,12 @@ modules: sha256: 8103b73e32604456db3950d4729982cd3243413a651014d06fc8196365ede37a - type: patch path: patches/pygame-sdl2-7-remove-pathlib.patch - - type: patch - path: patches/pygame-sdl2-7-use-correct-cython.patch - type: patch path: patches/pygame-sdl2-7-install-headers.patch - name: RenPy buildsystem: simple build-commands: - - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" python2 module/setup.py install --prefix=${FLATPAK_DEST} || exit 1 + - RENPY_DEPS_INSTALL="${FLATPAK_DEST}" python2 module/setup.py install --prefix=${FLATPAK_DEST} || exit 1 # If this is initialized it tries to write files into a readonly location # and causes a crash. It's also not useful since there is no steam in the diff --git a/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py3.Sdk.yml b/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py3.Sdk.yml index ab156f7..9ffcf35 100644 --- a/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py3.Sdk.yml +++ b/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.7.py3.Sdk.yml @@ -14,7 +14,7 @@ modules: - name: PyGame_SDL2 buildsystem: simple build-commands: - - pip3 install --prefix=${FLATPAK_DEST} --no-deps . + - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --exists-action=i --no-index --no-build-isolation sources: - type: archive url: https://www.renpy.org/dl/7.8.7/pygame_sdl2-2.1.0+renpy7.8.7.tar.gz @@ -28,7 +28,7 @@ modules: - name: RenPy buildsystem: simple build-commands: - - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" pip3 install --prefix=${FLATPAK_DEST} --no-deps ./module || exit 1 + - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" pip3 install --prefix=${FLATPAK_DEST} --no-deps ./module --exists-action=i --no-index --no-build-isolation || exit 1 # If this is initialized it tries to write files into a readonly location # and causes a crash It's also not useful since there is no steam in the diff --git a/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.8.Sdk.yml b/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.8.Sdk.yml index e7137e8..bde4a33 100644 --- a/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.8.Sdk.yml +++ b/flatpaker/data/com.github.dcbaker.flatpaker.RenPy.8.Sdk.yml @@ -10,21 +10,67 @@ inherit-extensions: modules: - "modules/renpy-shared.yml" - "modules/python3-requirements.json" - - "modules/python3-cython0.yml" + - name: assimp + buildsystem: cmake-ninja + config-opts: + - "-DASSIMP_BUILD_SAMPLES=OFF" + - "-DASSIMP_WARNINGS_AS_ERRORS=OFF" + - "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF" + - "-DASSIMP_BUILD_ZLIB=OFF" + cleanup: + - "/include" + - "/lib/*/cmake" + - "/lib/*/pkgconfig" + sources: + - type: "archive" + url: "https://github.com/assimp/assimp/archive/refs/tags/v6.0.5.tar.gz" + sha256: "edf3749559c2b7d1f758ffb66fc5bec62186221e623b7f2e8969f17ee46ecb6f" + - name: glu + buildsystem: meson + sources: + - type: archive + url: https://archive.mesa3d.org/glu/glu-9.0.3.tar.xz + sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f + cleanup: + - "/include" + - "/lib/*/*.a" + - "/lib/*/*.la" + - "/lib/*/pkgconfig" + - name: "ftgl" + buildsystem: "autotools" + config-opts: + - "--with-pic" + - "--disable-static" + cleanup: + - "/share" + - "/lib/*.la" + cleanup-platform: + - "/include" + - "/lib/cmake" + - "/lib/pkgconfig" + - "/lib/*.a" + sources: + - type: "git" + url: "https://github.com/frankheckenbach/ftgl" + commit: "483639219095ad080538e07ceb5996de901d4e74" + - type: "patch" + path: "patches/ftgl-disable-docs-demos.patch" + - type: "patch" + path: "patches/ftgl-fix-illegal-cast.patch" - name: PyGame_SDL2 buildsystem: simple build-commands: - - pip3 install --prefix=${FLATPAK_DEST} --no-deps . + - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --exists-action=i --no-index --no-build-isolation sources: - type: archive - url: https://www.renpy.org/dl/8.3.7/pygame_sdl2-2.1.0+renpy8.3.7.tar.gz - sha256: 4630b82d7e9ff3e5a864cd3693b4ef093a8ae9e87c3c7cb9ff5ca7e69299febf + url: "https://www.renpy.org/dl/8.4.1/pygame_sdl2-2.1.0+renpy8.4.1.tar.gz" + sha256: "ac05762de19f2799784f23f474170b2dab0b63018b8b151291d6dc8afb8b93f8" - type: patch path: patches/pygame-sdl2-fix-header-install-path.patch - name: RenPy buildsystem: simple build-commands: - - RENPY_CYTHON=cython0 RENPY_DEPS_INSTALL="${FLATPAK_DEST}" pip3 install --prefix=${FLATPAK_DEST} --no-deps ./module || exit 1 + - RENPY_DEPS_INSTALL="${FLATPAK_DEST}" CFLAGS="$CFLAGS $(pkg-config --cflags sdl2 ftgl)" pip3 install --prefix=${FLATPAK_DEST} --no-deps . --exists-action=i --no-index --no-build-isolation || exit 1 # If this is initialized it tries to write files into a readonly location # and causes a crash It's also not useful since there is no steam in the @@ -51,12 +97,12 @@ modules: rm -r /app/lib/game || exit 1 sources: - type: archive - url: https://www.renpy.org/dl/8.3.7/renpy-8.3.7-source.tar.bz2 - sha256: fd33248d5eea506ff9017c535b5b77e17edf7a77ddaf1bcf542b9cd261ff3fe5 - - type: patch - path: patches/renpy-setuplib-fix-paths.patch - - type: patch - path: patches/renpy-ffmpeg-7.patch + url: "https://www.renpy.org/dl/8.4.1/renpy-8.4.1-source.tar.bz2" + sha256: "29e185b090a59a2415beeaf29e4067471dfc5d4ff296eb53b63d3954e171f2a1" + # - type: patch + # path: patches/renpy-setuplib-fix-paths.patch + # - type: patch + # path: patches/renpy-ffmpeg-7.patch - type: file path: files/renpy.py dest-filename: renpy-bin diff --git a/flatpaker/data/modules/python-2.7.json b/flatpaker/data/modules/python-2.7.json index a319eeb..4bad3fa 100644 --- a/flatpaker/data/modules/python-2.7.json +++ b/flatpaker/data/modules/python-2.7.json @@ -7,6 +7,9 @@ "sha256": "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43" } ], + "build-options": { + "cflags": "-std=c11" + }, "config-opts": [ "--enable-shared", "--with-ensurepip=yes", diff --git a/flatpaker/data/modules/python2-requirements.json b/flatpaker/data/modules/python2-requirements.json index 5c75bfe..f47bd8c 100644 --- a/flatpaker/data/modules/python2-requirements.json +++ b/flatpaker/data/modules/python2-requirements.json @@ -4,22 +4,39 @@ "build-commands": [], "modules": [ { - "name": "python2-ecdsa", + "name": "python2-six", "buildsystem": "simple", "build-commands": [ - "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"ecdsa\" --no-build-isolation" + "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"six\" --no-build-isolation" ], "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/00/e7/ed3243b30d1bec41675b6394a1daae46349dc2b855cb83be846a5a918238/ecdsa-0.19.0-py2.py3-none-any.whl", - "sha256": "2cea9b88407fdac7bbeca0833b189e4c9c53f2ef1e1eaa29f6224dbc809b707a" - }, { "type": "file", "url": "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", "sha256": "4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" + ] + }, + { + "name": "python2-ecdsa", + "buildsystem": "simple", + "build-commands": [ + "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"ecdsa\" --no-build-isolation" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/51/79/119091c98e2bf49e24ed9f3ae69f816d715d2904aefa6a2baa039a2ba0b0/ecdsa-0.19.2-py2.py3-none-any.whl", + "sha256": "840f5dc5e375c68f36c1a7a5b9caad28f95daa65185c9253c0c08dd952bb7399" + } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -34,6 +51,10 @@ "url": "https://files.pythonhosted.org/packages/a7/b2/4140c69c6a66432916b26158687e821ba631a4c9273c474343badf84d3ba/future-1.0.0.tar.gz", "sha256": "bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -53,6 +74,10 @@ "url": "https://files.pythonhosted.org/packages/36/58/acf7f35859d541985f0a6ea3c34baaefbfaee23642cf11e85fe36453ae77/pefile-2019.4.18.tar.gz", "sha256": "a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -87,13 +112,17 @@ "url": "https://files.pythonhosted.org/packages/33/cf/8435d5a7159e2a9c83a95896ed596f68cf798005fe107cc655b5c5c14704/urllib3-1.26.20-py2.py3-none-any.whl", "sha256": "0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { "name": "python2-rsa", "buildsystem": "simple", "build-commands": [ - "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"rsa<4.1\" --no-build-isolation" + "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"rsa==4.0\" --no-build-isolation" ], "sources": [ { @@ -106,35 +135,46 @@ "url": "https://files.pythonhosted.org/packages/02/e5/38518af393f7c214357079ce67a317307936896e961e35450b70fad2a9cf/rsa-4.0-py2.py3-none-any.whl", "sha256": "14ba45700ff1ec9eeb206a2ce76b32814958a98e372006c8fb76ba820211be66" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { - "name": "python2-six", + "name": "python2-typing", "buildsystem": "simple", "build-commands": [ - "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"six\" --no-build-isolation" + "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"typing\" --no-build-isolation" ], "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", - "sha256": "4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274" + "url": "https://files.pythonhosted.org/packages/0b/cb/da856e81731833b94da70a08712f658416266a5fb2a9d9e426c8061becef/typing-3.10.0.0-py2-none-any.whl", + "sha256": "c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { - "name": "python2-typing", + "name": "python2-cython", "buildsystem": "simple", "build-commands": [ - "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"typing\" --no-build-isolation" + "pip2 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cython==0.29.37\" --no-build-isolation" ], "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/0b/cb/da856e81731833b94da70a08712f658416266a5fb2a9d9e426c8061becef/typing-3.10.0.0-py2-none-any.whl", - "sha256": "c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308" + "url": "https://files.pythonhosted.org/packages/7e/26/9d8de10005fedb1eceabe713348d43bae1dbab1786042ca0751a2e2b0f8c/Cython-0.29.37-py2.py3-none-any.whl", + "sha256": "95f1d6a83ef2729e67b3fa7318c829ce5b07ac64c084cd6af11c228e0364662c" } + ], + "cleanup": [ + "*" ] } ] -} \ No newline at end of file +} diff --git a/flatpaker/data/modules/python3-cython0.yml b/flatpaker/data/modules/python3-cython0.yml index 9fbab0a..e12c131 100644 --- a/flatpaker/data/modules/python3-cython0.yml +++ b/flatpaker/data/modules/python3-cython0.yml @@ -1,7 +1,7 @@ name: "python3-cython0" buildsystem: "simple" build-commands: - - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --verbose + - pip3 install --prefix=${FLATPAK_DEST} --no-deps . --verbose --exists-action=i --no-index --no-build-isolation sources: - type: "git" url: "https://github.com/dcbaker/cython.git" diff --git a/flatpaker/data/modules/python3-requirements.json b/flatpaker/data/modules/python3-requirements.json index c670c8c..f460ce5 100644 --- a/flatpaker/data/modules/python3-requirements.json +++ b/flatpaker/data/modules/python3-requirements.json @@ -3,6 +3,24 @@ "buildsystem": "simple", "build-commands": [], "modules": [ + { + "name": "python3-six", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"six\" --no-build-isolation" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", + "sha256": "4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274" + } + ], + "cleanup": [ + "/bin", + "/share/man/man1" + ] + }, { "name": "python3-ecdsa", "buildsystem": "simple", @@ -12,9 +30,13 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/00/e7/ed3243b30d1bec41675b6394a1daae46349dc2b855cb83be846a5a918238/ecdsa-0.19.0-py2.py3-none-any.whl", - "sha256": "2cea9b88407fdac7bbeca0833b189e4c9c53f2ef1e1eaa29f6224dbc809b707a" + "url": "https://files.pythonhosted.org/packages/51/79/119091c98e2bf49e24ed9f3ae69f816d715d2904aefa6a2baa039a2ba0b0/ecdsa-0.19.2-py2.py3-none-any.whl", + "sha256": "840f5dc5e375c68f36c1a7a5b9caad28f95daa65185c9253c0c08dd952bb7399" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -29,6 +51,10 @@ "url": "https://files.pythonhosted.org/packages/da/71/ae30dadffc90b9006d77af76b393cb9dfbfc9629f339fc1574a1c52e6806/future-1.0.0-py3-none-any.whl", "sha256": "929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -43,6 +69,10 @@ "url": "https://files.pythonhosted.org/packages/54/16/12b82f791c7f50ddec566873d5bdd245baa1491bac11d15ffb98aecc8f8b/pefile-2024.8.26-py3-none-any.whl", "sha256": "76f8b485dcd3b1bb8166f1128d395fa3d87af26360c2358fb75b80019b957c6f" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -54,29 +84,33 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/38/fc/bce832fd4fd99766c04d1ee0eead6b0ec6486fb100ae5e74c1d91292b982/certifi-2025.1.31-py3-none-any.whl", - "sha256": "ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe" + "url": "https://files.pythonhosted.org/packages/0b/a7/71ac2cff56fec219ed242bb11b8efb69fcc4bec75db06fb7bfe35de520e6/certifi-2026.7.22-py3-none-any.whl", + "sha256": "62f22742b58a1a33014a2b6b706588a8d7e2a88ae7bd1a6ebe8c992928483775" }, { "type": "file", - "url": "https://files.pythonhosted.org/packages/16/b0/572805e227f01586461c80e0fd25d65a2115599cc9dad142fee4b747c357/charset_normalizer-3.4.1.tar.gz", - "sha256": "44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3" + "url": "https://files.pythonhosted.org/packages/22/c7/754d09943a616937df61e4ba367c409ded2a987e872972098d51a6fcf73b/charset_normalizer-3.5.0-py3-none-any.whl", + "sha256": "993dfcbe75a85a3784abb5084f2c41b915767c90546fcc92803cffa28611baea" }, { "type": "file", - "url": "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", - "sha256": "946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3" + "url": "https://files.pythonhosted.org/packages/1e/5e/d4e9f1a599fb8e573b7b87160658329fbf28d19eac2718f51fc3def3aa5a/idna-3.18-py3-none-any.whl", + "sha256": "7f952cbe720b688055e3f87de14f5c3e5fdaa8bc3928985c4077ca689de849a2" }, { "type": "file", - "url": "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl", - "sha256": "70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" + "url": "https://files.pythonhosted.org/packages/a0/f4/c67b0b3f1b9245e8d266f0f112c500d50e5b4e83cb6f3b71b6528104182a/requests-2.34.2-py3-none-any.whl", + "sha256": "2a0d60c172f83ac6ab31e4554906c0f3b3588d37b5cb939b1c061f4907e278e0" }, { "type": "file", - "url": "https://files.pythonhosted.org/packages/c8/19/4ec628951a74043532ca2cf5d97b7b14863931476d117c471e8e2b1eb39f/urllib3-2.3.0-py3-none-any.whl", - "sha256": "1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df" + "url": "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", + "sha256": "9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] }, { @@ -88,14 +122,18 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/c8/f1/d6a797abb14f6283c0ddff96bbdd46937f64122b8c925cab503dd37f8214/pyasn1-0.6.1-py3-none-any.whl", - "sha256": "0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629" + "url": "https://files.pythonhosted.org/packages/9a/3b/6163796d69c3977d1e4287bea4a6979161cbbdd170ebb430511e8e1999ce/pyasn1-0.6.4-py3-none-any.whl", + "sha256": "deda9277cfd454080ec40b207fb6df82206a3a2688735233cdcd8d3d565f088b" }, { "type": "file", - "url": "https://files.pythonhosted.org/packages/49/97/fa78e3d2f65c02c8e1268b9aba606569fe97f6c8f7c2d74394553347c145/rsa-4.9-py3-none-any.whl", - "sha256": "90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7" + "url": "https://files.pythonhosted.org/packages/64/8d/0133e4eb4beed9e425d9a98ed6e081a55d195481b7632472be1af08d2f6b/rsa-4.9.1-py3-none-any.whl", + "sha256": "68635866661c6836b8d39430f97a996acbd61bfa49406748ea243539fe239762" } + ], + "cleanup": [ + "/bin", + "/share/man/man1" ] } ] diff --git a/flatpaker/data/modules/renpy-shared.yml b/flatpaker/data/modules/renpy-shared.yml index e696ab3..61ad0fc 100644 --- a/flatpaker/data/modules/renpy-shared.yml +++ b/flatpaker/data/modules/renpy-shared.yml @@ -7,27 +7,48 @@ modules: config-opts: - --mandir=/share/man cleanup: - - /share + - "/share" + - "/lib/*/*.a" + - "/lib/*/*.la" cleanup-platform: - '*' sources: - type: "archive" - url: "https://savannah.nongnu.org/download/icoutils/icoutils-0.32.3.tar.bz2" + url: "https://download.savannah.gnu.org/releases/icoutils/icoutils-0.32.3.tar.bz2" sha256: "17abe02d043a253b68b47e3af69c9fc755b895db68fdc8811786125df564c6e0" + - type: "patch" + path: ../patches/icoutils-fix-iterators.patch - name: icns config-opts: - --mandir=/share/man cleanup: - - /share + - "/share" + - "/lib/*/*.a" + - "/lib/*/*.la" cleanup-platform: - '*' sources: - # The last release is super old, and doesn't link against libopenjpeg2 correctly - # Patching it proved to be entirely too much effort, so just use git - - type: "git" - url: "https://git.code.sf.net/p/icns/code" - commit: 921f972c461c505e5ac981aaddbdfdde97e8bb2b + - type: "archive" + url: "https://downloads.sf.net/icns/libicns-0.8.1.tar.gz" + sha256: "335f10782fc79855cf02beac4926c4bf9f800a742445afbbf7729dab384555c2" + - type: "patch" + path: "../patches/icns-add-missing-headers.patch" + + - name: unrar + buildsystem: "simple" + build-commands: + # Use system cflags + - sed -e '/CXXFLAGS=/d' -e '/LDFLAGS=/d' -i makefile + + - make -j$FLATPAK_BUILDER_N_JOBS + - DESTDIR="${FLATPAK_DEST}" make install + cleanup-platform: + - '*' + sources: + - type: "archive" + url: "https://www.rarlab.com/rar/unrarsrc-7.2.7.tar.gz" + sha256: "01d903a7dcf413cb2925696d7796e48e38d471f79bfe7ef3ad2aebf6c12dbefd" - name: rpatool buildsystem: "simple" @@ -52,21 +73,6 @@ modules: url: https://files.pythonhosted.org/packages/59/c7/eac5f1c131f8e4e41268944bbfe60cb42dfcea2ec8fc5a0ee8476fd8b6bd/unrpa-2.3.0-py3-none-any.whl sha256: 17b024050e19edf470eb9abd91fa5fb2be63aa73c01f44d2ef9cf6978289eea9 - - name: unrar - buildsystem: "simple" - build-commands: - # Use system cflags - - sed -e '/CXXFLAGS=/d' -e '/LDFLAGS=/d' -i makefile - - - make -j$FLATPAK_BUILDER_N_JOBS - - DESTDIR="${FLATPAK_DEST}" make install - cleanup-platform: - - '*' - sources: - - type: "archive" - url: https://www.rarlab.com/rar/unrarsrc-7.1.6.tar.gz - sha256: ca5e1da37dd6fa1b78bb5ed675486413f79e4a917709744aa04b6f93dfd914f0 - - name: un.rpyc buildsystem: "simple" build-commands: diff --git a/flatpaker/data/patches/ftgl-disable-docs-demos.patch b/flatpaker/data/patches/ftgl-disable-docs-demos.patch new file mode 100644 index 0000000..555b845 --- /dev/null +++ b/flatpaker/data/patches/ftgl-disable-docs-demos.patch @@ -0,0 +1,11 @@ +--- ftgl/Makefile.am 2026-08-10 09:05:24.973016890 -0000 ++++ ftgl/Makefile.am 2026-08-10 09:06:13.861319158 -0000 +@@ -1,7 +1,7 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = src demo docs # test (does not build) ++SUBDIRS = src + DIST_SUBDIRS = $(SUBDIRS) msvc + + pkgconfigdir = $(libdir)/pkgconfig diff --git a/flatpaker/data/patches/ftgl-fix-illegal-cast.patch b/flatpaker/data/patches/ftgl-fix-illegal-cast.patch new file mode 100644 index 0000000..9785b1f --- /dev/null +++ b/flatpaker/data/patches/ftgl-fix-illegal-cast.patch @@ -0,0 +1,11 @@ +--- ftgl/src/FTVectoriser.cpp 2026-08-10 08:59:56.547220008 -0000 ++++ ftgl/src/FTVectoriser.cpp 2026-08-10 09:02:11.581010988 -0000 +@@ -168,7 +168,7 @@ + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ char* tagList = (char *)&outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1; diff --git a/flatpaker/data/patches/icns-add-missing-headers.patch b/flatpaker/data/patches/icns-add-missing-headers.patch new file mode 100644 index 0000000..7626061 --- /dev/null +++ b/flatpaker/data/patches/icns-add-missing-headers.patch @@ -0,0 +1,244 @@ +From 035516ef839327f5738234d58e5eb6916be64fa6 Mon Sep 17 00:00:00 2001 +From: Paul Wise +Date: Sat, 20 Jul 2024 14:07:12 -0700 +Subject: [PATCH] Add missing headers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Compilation failed with: + +png2icns.c:328:25: error: implicit declaration of function ‘unlink’ +[-Wimplicit-function-declaration] + +This is a rebase of de0ae9ab. +--- + icnsutils/icns2png.c | 1 + + icnsutils/icontainer2icns.c | 1 - + icnsutils/png2icns.c | 3 +++ + src/icns.h | 8 +++----- + src/icns_colormaps.h | 2 ++ + src/icns_debug.c | 8 ++------ + src/icns_element.c | 1 - + src/icns_family.c | 3 --- + src/icns_internals.h | 6 +----- + src/icns_jp2.c | 4 ++++ + src/icns_png.c | 3 ++- + src/icns_rle24.c | 1 - + src/icns_utils.c | 1 - + 14 files changed, 18 insertions(+), 25 deletions(-) + +diff --git a/icnsutils/icns2png.c b/icnsutils/icns2png.c +index cd53545..40b9faa 100644 +--- a/icnsutils/icns2png.c ++++ b/icnsutils/icns2png.c +@@ -20,6 +20,7 @@ Boston, MA 02110-1301, USA. + + #include + #include ++#include + #include + + #include +diff --git a/icnsutils/icontainer2icns.c b/icnsutils/icontainer2icns.c +index 70c12dc..4b0e0db 100644 +--- a/icnsutils/icontainer2icns.c ++++ b/icnsutils/icontainer2icns.c +@@ -18,7 +18,6 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + #include +-#include + + // --> find icns data[i] + // --> data[i-9] - data[i-1] = "[######]" (id) +diff --git a/icnsutils/png2icns.c b/icnsutils/png2icns.c +index 93bb863..432b918 100644 +--- a/icnsutils/png2icns.c ++++ b/icnsutils/png2icns.c +@@ -22,10 +22,13 @@ + #include + #include + #include ++#include ++#include + + #include + + #include ++#include + #include + + #define FALSE 0 +diff --git a/src/icns.h b/src/icns.h +index f834497..917abb7 100644 +--- a/src/icns.h ++++ b/src/icns.h +@@ -20,14 +20,12 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +-#include +-#include +-#include +-#include +- + #ifndef _ICNS_H_ + #define _ICNS_H_ + ++#include ++#include ++ + /* basic data types */ + typedef uint8_t icns_bool_t; + +diff --git a/src/icns_colormaps.h b/src/icns_colormaps.h +index 74b9b81..522511e 100644 +--- a/src/icns_colormaps.h ++++ b/src/icns_colormaps.h +@@ -23,6 +23,8 @@ Boston, MA 02110-1301, USA. + #ifndef _COLORMAPS_H_ + #define _COLORMAPS_H_ 1 + ++#include "icns.h" ++ + typedef struct icns_colormap_rgb_t + { + icns_byte_t r; +diff --git a/src/icns_debug.c b/src/icns_debug.c +index a3dd075..846d30f 100644 +--- a/src/icns_debug.c ++++ b/src/icns_debug.c +@@ -18,14 +18,10 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + ++#ifdef ICNS_DEBUG ++ + #include +-#include +-#include +-#include + +-#include "icns.h" +-#include "icns_internals.h" +-#ifdef ICNS_DEBUG + void bin_print_byte(int x) + { + int n; +diff --git a/src/icns_element.c b/src/icns_element.c +index 1b08668..5132953 100644 +--- a/src/icns_element.c ++++ b/src/icns_element.c +@@ -22,7 +22,6 @@ Boston, MA 02110-1301, USA. + + #include + #include +-#include + #include + + #include "icns.h" +diff --git a/src/icns_family.c b/src/icns_family.c +index bcc4d70..83f7d8b 100644 +--- a/src/icns_family.c ++++ b/src/icns_family.c +@@ -20,10 +20,7 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +-#include + #include +-#include +-#include + + #include "icns.h" + #include "icns_internals.h" +diff --git a/src/icns_internals.h b/src/icns_internals.h +index cfda3da..1adf671 100644 +--- a/src/icns_internals.h ++++ b/src/icns_internals.h +@@ -20,11 +20,6 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +-#include +-#include +-#include +-#include +- + #include "icns.h" + + #include "config.h" +@@ -150,6 +145,7 @@ memory alignment. So, we try to work around this here. + #define ICNS_READ_UNALIGNED(val, addr, size) icns_memcpy(&(val), (addr), size) + #define ICNS_WRITE_UNALIGNED(addr, val, size) icns_memcpy((addr), &(val), size) + #else ++ #include + #define ICNS_READ_UNALIGNED(val, addr, size) memcpy(&(val), (addr), size) + #define ICNS_WRITE_UNALIGNED(addr, val, size) memcpy((addr), &(val), size) + #endif +diff --git a/src/icns_jp2.c b/src/icns_jp2.c +index 6d809fb..7c71cc7 100644 +--- a/src/icns_jp2.c ++++ b/src/icns_jp2.c +@@ -21,9 +21,13 @@ Boston, MA 02110-1301, USA. + */ + + #include ++#ifdef ICNS_DEBUG + #include ++#endif + #include ++#ifdef ICNS_OPENJPEG + #include ++#endif + + #include "icns.h" + #include "icns_internals.h" +diff --git a/src/icns_png.c b/src/icns_png.c +index a5b26e3..8a5facf 100644 +--- a/src/icns_png.c ++++ b/src/icns_png.c +@@ -20,13 +20,14 @@ Boston, MA 02110-1301, USA. + + #include + #include +-#include ++#include + #include + + #include "icns.h" + #include "icns_internals.h" + + #include ++#include + + typedef struct icns_png_io_ref { + void* data; +diff --git a/src/icns_rle24.c b/src/icns_rle24.c +index 2f07213..914542d 100644 +--- a/src/icns_rle24.c ++++ b/src/icns_rle24.c +@@ -22,7 +22,6 @@ Boston, MA 02110-1301, USA. + + #include + #include +-#include + #include + + #include "icns.h" +diff --git a/src/icns_utils.c b/src/icns_utils.c +index 47bdbeb..2b1af72 100644 +--- a/src/icns_utils.c ++++ b/src/icns_utils.c +@@ -19,7 +19,6 @@ Boston, MA 02110-1301, USA. + */ + + #include +-#include + #include + #include + #include +-- +2.45.2 + diff --git a/flatpaker/data/patches/icoutils-fix-iterators.patch b/flatpaker/data/patches/icoutils-fix-iterators.patch new file mode 100644 index 0000000..5f3bffb --- /dev/null +++ b/flatpaker/data/patches/icoutils-fix-iterators.patch @@ -0,0 +1,134 @@ +From 298da402990ebe1279fb82b63ae2dc66ad78fd36 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Tue, 18 Feb 2025 10:01:05 +0000 +Subject: [PATCH] Specify arguments in function declarations for iterators + +GCC 15 rejected the previous code, since it is no longer valid in C23. + +Fixes: https://bugs.debian.org/1096829 +--- + common/hmap.c | 4 ++-- + common/hmap.h | 4 ++-- + common/llist.c | 2 +- + common/llist.h | 2 +- + common/tmap.c | 8 ++++---- + common/tmap.h | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/common/hmap.c b/common/hmap.c +index 9c5d657..8b77205 100644 +--- a/common/hmap.c ++++ b/common/hmap.c +@@ -363,7 +363,7 @@ hmap_iterator(HMap *map, HMapIterator *it) + * function. But no other entry. + */ + void +-hmap_foreach_value(HMap *map, void (*iterator)()) ++hmap_foreach_value(HMap *map, void (*iterator)(void *)) + { + uint32_t c; + +@@ -378,7 +378,7 @@ hmap_foreach_value(HMap *map, void (*iterator)()) + } + + void +-hmap_foreach_key(HMap *map, void (*iterator)()) ++hmap_foreach_key(HMap *map, void (*iterator)(void *)) + { + uint32_t c; + +diff --git a/common/hmap.h b/common/hmap.h +index bf6684b..a124b53 100644 +--- a/common/hmap.h ++++ b/common/hmap.h +@@ -50,8 +50,8 @@ void *hmap_put(HMap *map, void *key, void *value); + bool hmap_contains_key(HMap *map, const void *key); + void *hmap_remove(HMap *map, const void *key); + void hmap_iterator(HMap *map, HMapIterator *it); +-void hmap_foreach_key(HMap *map, void (*iterator)()); +-void hmap_foreach_value(HMap *map, void (*iterator)()); ++void hmap_foreach_key(HMap *map, void (*iterator)(void *)); ++void hmap_foreach_value(HMap *map, void (*iterator)(void *)); + void hmap_clear(HMap *map); + size_t hmap_size(HMap *map); + void hmap_set_hash_fn(HMap *map, hash_fn_t hash); +diff --git a/common/llist.c b/common/llist.c +index 873f36c..d65438d 100644 +--- a/common/llist.c ++++ b/common/llist.c +@@ -445,7 +445,7 @@ llist_is_empty(LList *list) + } + + void +-llist_iterate(LList *list, void (*iterator_func)()) ++llist_iterate(LList *list, void (*iterator_func)(void *)) + { + LNode *entry; + for (entry = list->first; entry != NULL; entry = entry->next) +diff --git a/common/llist.h b/common/llist.h +index 11d13a3..a2bf77b 100644 +--- a/common/llist.h ++++ b/common/llist.h +@@ -68,7 +68,7 @@ LList *llist_clone(LList *list); + void **llist_to_array(LList *list); + void **llist_to_null_terminated_array(LList *list); + +-void llist_iterate(LList *list, void (*iterator_func)()); ++void llist_iterate(LList *list, void (*iterator_func)(void *)); + void llist_iterator(LList *list, LListIterator *it); + + void llist_reverse(LList *list); +diff --git a/common/tmap.c b/common/tmap.c +index bdbd0e3..1512c7c 100644 +--- a/common/tmap.c ++++ b/common/tmap.c +@@ -512,7 +512,7 @@ predecessor(TMapNode *node) + #endif + + static void +-tmap_foreach_nodes_key(TMapNode *node, void (*iterator)()) ++tmap_foreach_nodes_key(TMapNode *node, void (*iterator)(void *)) + { + if (node->left != &nil) + tmap_foreach_nodes_key(node->left, iterator); +@@ -522,7 +522,7 @@ tmap_foreach_nodes_key(TMapNode *node, void (*iterator)()) + } + + static void +-tmap_foreach_nodes_value(TMapNode *node, void (*iterator)()) ++tmap_foreach_nodes_value(TMapNode *node, void (*iterator)(void *)) + { + if (node->left != &nil) + tmap_foreach_nodes_value(node->left, iterator); +@@ -532,14 +532,14 @@ tmap_foreach_nodes_value(TMapNode *node, void (*iterator)()) + } + + void +-tmap_foreach_key(TMap *map, void (*iterator)()) ++tmap_foreach_key(TMap *map, void (*iterator)(void *)) + { + if (map->root != &nil) + tmap_foreach_nodes_key(map->root, iterator); + } + + void +-tmap_foreach_value(TMap *map, void (*iterator)()) ++tmap_foreach_value(TMap *map, void (*iterator)(void *)) + { + if (map->root != &nil) + tmap_foreach_nodes_value(map->root, iterator); +diff --git a/common/tmap.h b/common/tmap.h +index b1368f8..e3e422d 100644 +--- a/common/tmap.h ++++ b/common/tmap.h +@@ -51,8 +51,8 @@ void *tmap_remove(TMap *map, const void *key); + void tmap_iterator(TMap *map, TMapIterator *it); /* value iterator */ + bool tmap_iterator_partial(TMap *map, TMapIterator *it, const void *match, comparison_fn_t comparator); + void tmap_clear(TMap *map); +-void tmap_foreach_key(TMap *map, void (*iterator)()); +-void tmap_foreach_value(TMap *map, void (*iterator)()); ++void tmap_foreach_key(TMap *map, void (*iterator)(void *)); ++void tmap_foreach_value(TMap *map, void (*iterator)(void *)); + + #ifdef ENABLE_TMAP_TESTING + #include