diff --git a/flatpak/org.zoitechat.ZoiteChat.json b/flatpak/org.zoitechat.ZoiteChat.json index 8b4caeaf..1f931795 100644 --- a/flatpak/org.zoitechat.ZoiteChat.json +++ b/flatpak/org.zoitechat.ZoiteChat.json @@ -1,7 +1,7 @@ { "app-id": "org.zoitechat.ZoiteChat", "runtime": "org.gnome.Platform", - "runtime-version": "49", + "runtime-version": "50", "sdk": "org.gnome.Sdk", "command": "zoitechat", "finish-args": [ @@ -22,7 +22,7 @@ ], "add-extensions": { "org.zoitechat.ZoiteChat.Plugin": { - "version": "49", + "version": "50", "directory": "extensions", "add-ld-path": "lib", "merge-dirs": "lib/zoitechat/plugins", @@ -35,8 +35,45 @@ "shared-modules/lua5.4/lua-5.4.json", "shared-modules/libcanberra/libcanberra.json", "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json", - "python3-cffi.json", - "perl.json", + { + "name": "python3-cffi", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz", + "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", + "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824" + } + ] + }, + { + "name": "perl", + "buildsystem": "simple", + "build-commands": [ + "./Configure -des -Dprefix=/app -Dvendorprefix=/app -Duseshrplib -Dman1dir=none -Dman3dir=none", + "make -j${FLATPAK_BUILDER_N_JOBS}", + "make install" + ], + "cleanup": [ + "/share/man", + "/lib/perl5/*/*/CORE/*.a" + ], + "sources": [ + { + "type": "archive", + "url": "https://www.cpan.org/src/5.0/perl-5.42.2.tar.xz", + "sha256": "0a585eeb9e363c0f80482ddb3571625250c2c86aeb408853e8ea50805cfb14bb" + } + ] + }, { "name": "lgi", "buildsystem": "meson", diff --git a/flatpak/perl.json b/flatpak/perl.json deleted file mode 100644 index bdcc7c59..00000000 --- a/flatpak/perl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "perl", - "buildsystem": "simple", - "build-commands": [ - "./Configure -des -Dprefix=/app -Dvendorprefix=/app -Duseshrplib -Dman1dir=none -Dman3dir=none", - "make -j${FLATPAK_BUILDER_N_JOBS}", - "make install" - ], - "cleanup": [ - "/share/man", - "/lib/perl5/*/*/CORE/*.a" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.cpan.org/src/5.0/perl-5.42.2.tar.xz", - "sha256": "0a585eeb9e363c0f80482ddb3571625250c2c86aeb408853e8ea50805cfb14bb" - } - ] -} diff --git a/flatpak/python3-cffi.json b/flatpak/python3-cffi.json deleted file mode 100644 index 8d35ce69..00000000 --- a/flatpak/python3-cffi.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "python3-cffi", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz", - "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", - "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824" - } - ] -} \ No newline at end of file