André pushed to branch gajim_1.2 at gajim / gajim

Commits:

1 changed file:

Changes:

  • flatpak/org.gajim.Gajim.yaml
    1
    -app-id: org.gajim.Gajim.Devel
    
    1
    +app-id: org.gajim.Gajim
    
    2 2
     runtime: org.gnome.Platform
    
    3 3
     runtime-version: '3.36'
    
    4 4
     sdk: org.gnome.Sdk
    
    5
    -command: gajim-devel
    
    6
    -tags:
    
    7
    -  - devel
    
    8
    -  - development
    
    9
    -  - nightly
    
    10
    -rename-icon: org.gajim.Gajim
    
    11
    -rename-desktop-file: org.gajim.Gajim.desktop
    
    12
    -rename-appdata-file: org.gajim.Gajim.appdata.xml
    
    5
    +command: gajim
    
    13 6
     finish-args:
    
    14 7
       - --share=ipc
    
    15 8
       - --share=network
    
    ... ... @@ -32,7 +25,7 @@ finish-args:
    32 25
       - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages
    
    33 26
     
    
    34 27
     add-extensions:
    
    35
    -  org.gajim.Gajim.Devel.Plugin:
    
    28
    +  org.gajim.Gajim.Plugin:
    
    36 29
         directory: plugins
    
    37 30
         merge-dirs: lib/python3.7/site-packages
    
    38 31
         subdirectories: true
    
    ... ... @@ -91,8 +84,8 @@ modules:
    91 84
           - python3 setup.py install --prefix=/app
    
    92 85
         sources:
    
    93 86
           - type: archive
    
    94
    -        url: https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4/cryptography-2.8.tar.gz
    
    95
    -        sha256: 3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651
    
    87
    +        url: https://files.pythonhosted.org/packages/56/3b/78c6816918fdf2405d62c98e48589112669f36711e50158a0c15d804c30d/cryptography-2.9.2.tar.gz
    
    88
    +        sha256: a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229
    
    96 89
     
    
    97 90
       - name: python3-pyopenssl
    
    98 91
         buildsystem: simple
    
    ... ... @@ -142,11 +135,11 @@ modules:
    142 135
       - name: python3-importlib_metadata
    
    143 136
         buildsystem: simple
    
    144 137
         build-commands:
    
    145
    -      - pip3 install --prefix=/app importlib_metadata-1.5.0-py2.py3-none-any.whl
    
    138
    +      - pip3 install --prefix=/app importlib_metadata-1.6.0-py2.py3-none-any.whl
    
    146 139
         sources:
    
    147 140
           - type: file
    
    148
    -        url: https://files.pythonhosted.org/packages/8b/03/a00d504808808912751e64ccf414be53c29cad620e3de2421135fcae3025/importlib_metadata-1.5.0-py2.py3-none-any.whl
    
    149
    -        sha256: b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b
    
    141
    +        url: https://files.pythonhosted.org/packages/ad/e4/891bfcaf868ccabc619942f27940c77a8a4b45fd8367098955bb7e152fb1/importlib_metadata-1.6.0-py2.py3-none-any.whl
    
    142
    +        sha256: 2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f
    
    150 143
     
    
    151 144
       - name: python3-keyring
    
    152 145
         buildsystem: simple
    
    ... ... @@ -211,15 +204,9 @@ modules:
    211 204
         build-commands:
    
    212 205
           - pip3 install --prefix=/app .
    
    213 206
           - touch /app/share/run-as-flatpak
    
    214
    -      - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel
    
    215
    -      - chmod 755 /app/bin/gajim-devel
    
    216 207
         sources:
    
    217 208
           - type: git
    
    218 209
             url: https://dev.gajim.org/gajim/gajim.git
    
    219
    -      - type: shell
    
    220
    -        commands:
    
    221
    -          - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in
    
    222
    -          - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in
    
    223
    -          - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
    
    210
    +        branch: gajim_1.2
    
    224 211
         post-install:
    
    225 212
           - install -d /app/plugins