Philipp Hörist pushed to branch omemo_integration at gajim / gajim
Commits:
2ff4b19d by Philipp Hörist at 2022-10-19T21:05:49+02:00
fix: Fix Flatpak build
- - - - -
2 changed files:
- flatpak/org.gajim.Gajim.Devel.yaml
- flatpak/org.gajim.Gajim.yaml
Changes:
=====================================
flatpak/org.gajim.Gajim.Devel.yaml
=====================================
@@ -327,28 +327,6 @@ modules:
- type: git
url: https://dev.gajim.org/gajim/python-nbxmpp.git
- - name: gajim
- buildsystem: simple
- build-commands:
- - pip3 install .
- - touch /app/share/run-as-flatpak
- - cp -t ${FLATPAK_DEST} app-overrides.json
- - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel
"$@"' > /app/bin/gajim-devel
- - chmod 755 /app/bin/gajim-devel
- sources:
- - type: git
- url: https://dev.gajim.org/gajim/gajim.git
- - type: file
- path: app-overrides.json
- - type: shell
- commands:
- - sed -i
"s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+"
data/org.gajim.Gajim.appdata.xml.in
- - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+"
data/org.gajim.Gajim.appdata.xml.in
- - sed -i "s+Exec=gajim+Exec=gajim-devel+"
data/org.gajim.Gajim.desktop.in
- - mv
gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
- post-install:
- - install -d /app/plugins
-
# OMEMO dependenies
- name: protobuf
buildsystem: simple
@@ -384,4 +362,26 @@ modules:
sources:
- type: archive
url:
https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz
- sha256:
375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578
\ No newline at end of file
+ sha256:
375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578
+
+ - name: gajim
+ buildsystem: simple
+ build-commands:
+ - pip3 install .
+ - touch /app/share/run-as-flatpak
+ - cp -t ${FLATPAK_DEST} app-overrides.json
+ - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel
"$@"' > /app/bin/gajim-devel
+ - chmod 755 /app/bin/gajim-devel
+ sources:
+ - type: git
+ url: https://dev.gajim.org/gajim/gajim.git
+ - type: file
+ path: app-overrides.json
+ - type: shell
+ commands:
+ - sed -i
"s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+"
data/org.gajim.Gajim.appdata.xml.in
+ - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+"
data/org.gajim.Gajim.appdata.xml.in
+ - sed -i "s+Exec=gajim+Exec=gajim-devel+"
data/org.gajim.Gajim.desktop.in
+ - mv
gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
+ post-install:
+ - install -d /app/plugins
=====================================
flatpak/org.gajim.Gajim.yaml
=====================================
@@ -321,21 +321,6 @@ modules:
url:
https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.4-py3-none-any.whl
sha256:
46394624acdced9cd83c06a665a109d74132642cd3f8e427a197465aabcbf42e
- - name: gajim
- buildsystem: simple
- build-commands:
- - pip3 install .
- - touch /app/share/run-as-flatpak
- - cp -t ${FLATPAK_DEST} app-overrides.json
- sources:
- - type: git
- url: https://dev.gajim.org/gajim/gajim.git
- tag: 1.5.2
- - type: file
- path: app-overrides.json
- post-install:
- - install -d /app/plugins
-
# OMEMO dependenies
- name: protobuf
buildsystem: simple
@@ -371,4 +356,19 @@ modules:
sources:
- type: archive
url:
https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz
- sha256:
375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578
\ No newline at end of file
+ sha256:
375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578
+
+ - name: gajim
+ buildsystem: simple
+ build-commands:
+ - pip3 install .
+ - touch /app/share/run-as-flatpak
+ - cp -t ${FLATPAK_DEST} app-overrides.json
+ sources:
+ - type: git
+ url: https://dev.gajim.org/gajim/gajim.git
+ tag: 1.5.2
+ - type: file
+ path: app-overrides.json
+ post-install:
+ - install -d /app/plugins
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/2ff4b19d5b9b337d8c28dc2a0b97f9a5e5150a1d
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/2ff4b19d5b9b337d8c28dc2a0b97f9a5e5150a1d
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
