From d33c2fbb065ec163877f27edc36cfa45fa59e539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Fri, 18 Sep 2020 22:49:19 +0200 Subject: [PATCH] Flatpak: Fix install location + update dependencies Fixes #521. --- flatpak/modules/python3-pillow.yaml | 3 +-- flatpak/modules/python3-python-gnupg.yaml | 3 +-- .../org.gajim.Gajim.Plugin.appindicator.yaml | 2 +- flatpak/org.gajim.Gajim.Plugin.omemo.yaml | 22 ++++++++----------- flatpak/org.gajim.Gajim.Plugin.openpgp.yaml | 2 +- flatpak/org.gajim.Gajim.Plugin.pgp.yaml | 2 +- ...g.gajim.Gajim.Plugin.syntax_highlight.yaml | 16 ++++++++++---- ....gajim.Gajim.Plugin.url_image_preview.yaml | 2 +- 8 files changed, 27 insertions(+), 25 deletions(-) diff --git a/flatpak/modules/python3-pillow.yaml b/flatpak/modules/python3-pillow.yaml index 0205678..b916951 100644 --- a/flatpak/modules/python3-pillow.yaml +++ b/flatpak/modules/python3-pillow.yaml @@ -1,8 +1,7 @@ name: python3-pillow buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} . + - pip3 install . sources: - type: archive url: https://files.pythonhosted.org/packages/3e/02/b09732ca4b14405ff159c470a612979acfc6e8645dc32f83ea0129709f7a/Pillow-7.2.0.tar.gz diff --git a/flatpak/modules/python3-python-gnupg.yaml b/flatpak/modules/python3-python-gnupg.yaml index 2ea2024..a7b7b24 100644 --- a/flatpak/modules/python3-python-gnupg.yaml +++ b/flatpak/modules/python3-python-gnupg.yaml @@ -1,8 +1,7 @@ name: python3-python-gnupg buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} python_gnupg-0.4.6-py2.py3-none-any.whl + - pip3 install python_gnupg-0.4.6-py2.py3-none-any.whl sources: - type: file url: https://files.pythonhosted.org/packages/cb/85/8a1588a04172e0853352ecfe214264c65a62ab35374d9ad9c569cf94c2a3/python_gnupg-0.4.6-py2.py3-none-any.whl diff --git a/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml b/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml index e6f3e7b..8e24e45 100644 --- a/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml @@ -7,7 +7,7 @@ appstream-compose: false build-options: env: - PYTHONPATH: /app/plugins/appindicator/lib/python3.7/site-packages/ + PIP_TARGET: /app/plugins/appindicator/site-packages prefix: /app/plugins/appindicator prepend-pkg-config-path: /app/plugins/appindicator/lib/pkgconfig prepend-path: /app/plugins/appindicator/bin diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml index 3506731..854f9ee 100644 --- a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml @@ -7,7 +7,7 @@ appstream-compose: false build-options: env: - PYTHONPATH: /app/plugins/omemo/lib/python3.7/site-packages/ + PIP_TARGET: /app/plugins/omemo/site-packages modules: - modules/python3-pillow.yaml @@ -15,18 +15,16 @@ modules: - name: protobuf buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} protobuf-3.11.3-py2.py3-none-any.whl + - pip3 install --no-deps protobuf-3.13.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/27/9c/ef816295b4b40298fd0a17bf8f0ba6cf3e0c44cb2ce72257168e09996b8b/protobuf-3.11.3-py2.py3-none-any.whl - sha256: 24e3b6ad259544d717902777b33966a1a069208c885576254c112663e6a5bb0f + url: https://files.pythonhosted.org/packages/3b/ba/276d817d4b0184e544a9295e14e95f6148af5c5652033d30eb63d2c13bfa/protobuf-3.13.0-py2.py3-none-any.whl + sha256: d69697acac76d9f250ab745b46c725edf3e98ac24763990b24d58c16c642947a - name: python3-axolotl-curve25519 buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} . + - pip3 install . sources: - type: archive url: https://files.pythonhosted.org/packages/59/ca/c8111718bcc8da18e9b9868e784293232a58c57159a5ea18f00ee967258f/python-axolotl-curve25519-0.4.1.post2.tar.gz @@ -35,8 +33,7 @@ modules: - name: python3-axolotl buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} python_axolotl-0.2.3-py3-none-any.whl + - pip3 install --no-deps python_axolotl-0.2.3-py3-none-any.whl sources: - type: file url: https://files.pythonhosted.org/packages/0f/b3/4a0b0e664435691bba36fac6e366cece506d002294c293bd3dcb40c2b2ba/python_axolotl-0.2.3-py3-none-any.whl @@ -45,8 +42,7 @@ modules: - name: python3-qrcode buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} qrcode-6.1-py2.py3-none-any.whl + - pip3 install --no-deps qrcode-6.1-py2.py3-none-any.whl sources: - type: file url: https://files.pythonhosted.org/packages/42/87/4a3a77e59ab7493d64da1f69bf1c2e899a4cf81e51b2baa855e8cc8115be/qrcode-6.1-py2.py3-none-any.whl @@ -61,8 +57,8 @@ modules: - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo sources: - type: archive - url: https://ftp.gajim.org/plugins_releases/omemo_2.7.7.zip - sha256: d08cb21cf7372c0e8c78a1e824da10c58c5957f8262b08de788a003ce922549e + url: https://ftp.gajim.org/plugins_releases/omemo_2.7.8.zip + sha256: 4f36407ace3f61ee462b754cb8c7a19a4600fcde1d89a5a2e6c90935f22e0793 - type: shell commands: - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml index 591a4d8..7dfea9e 100644 --- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml @@ -6,7 +6,7 @@ separate-locales: false appstream-compose: false build-options: env: - PYTHONPATH: /app/plugins/openpgp/lib/python3.7/site-packages/ + PIP_TARGET: /app/plugins/openpgp/site-packages modules: - modules/python3-python-gnupg.yaml diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml index a18044d..569be55 100644 --- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml @@ -7,7 +7,7 @@ appstream-compose: false build-options: env: - PYTHONPATH: /app/plugins/pgp/lib/python3.7/site-packages/ + PIP_TARGET: /app/plugins/pgp/site-packages modules: - modules/python3-python-gnupg.yaml diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml index 2baa457..2a666c8 100644 --- a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml @@ -7,19 +7,27 @@ appstream-compose: false build-options: env: - PYTHONPATH: /app/plugins/syntax_highlight/lib/python3.7/site-packages/ + PIP_TARGET: /app/plugins/syntax_highlight/site-packages modules: - name: python3-pygments buildsystem: simple build-commands: - - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/ - - pip3 install --prefix=${FLATPAK_DEST} --ignore-installed Pygments-2.7.0-py3-none-any.whl + - pip3 install --ignore-installed Pygments-2.7.0-py3-none-any.whl sources: - type: file url: https://files.pythonhosted.org/packages/5e/ac/cc00398eccce66515a8acac52afa3e51bbe9a8080e9f232aa91cbb041856/Pygments-2.7.0-py3-none-any.whl sha256: 2df50d16b45b977217e02cba6c8422aaddb859f3d0570a88e09b00eafae89c6e + - name: python3-MarkupSafe + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz + sha256: 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b + - name: gajim-syntax_highlight buildsystem: simple build-commands: @@ -30,7 +38,7 @@ modules: sources: - type: archive url: https://ftp.gajim.org/plugins_releases/syntax_highlight_1.3.2.zip - sha256: 7abf68db96839f9f1e7ebbcfa6e7794d7f504550c1edbb03f2f9c91b0eb3ee2e + sha256: 7abf68db96839f9f1e7ebbcfa6e7794d7f504550c1edbb03f2f9c91b0eb3ee2e - type: shell commands: - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml index 0425983..1ba0703 100644 --- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml @@ -7,7 +7,7 @@ appstream-compose: false build-options: env: - PYTHONPATH: /app/plugins/url_image_preview/lib/python3.7/site-packages/ + PIP_TARGET: /app/plugins/url_image_preview/site-packages modules: - modules/python3-pillow.yaml