André pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • flatpak/org.gajim.Gajim.yaml
    ... ... @@ -43,6 +43,10 @@ add-extensions:
    43 43 
         no-autodownload: true
    44 44 
         autodelete: true
    45 45
    46 
    +build-options:
    47 
    +  env:
    48 
    +    PIP_PREFIX: /app
    49 
    +
    46 50 
     cleanup:
    47 51 
       - /include
    48 52 
       - /lib/debug
    ... ... @@ -56,73 +60,86 @@ modules:
    56 60 
       - name: python3-pyparsing
    57 61 
         buildsystem: simple
    58 62 
         build-commands:
    59 
    -      - pip3 install --prefix=/app pyparsing-2.4.7-py2.py3-none-any.whl
    63 
    +      - pip3 install pyparsing-2.4.7-py2.py3-none-any.whl
    60 64 
         sources:
    61 65 
           - type: file
    62 
    -        url: https://files.pythonhosted.org/packages/8a/bb/488841f56197b13700afd5658fc279a2025a39e22449b7cf29864669b15d/pyparsing-2.4.7-py2.py3-none-any.whl
    66 
    +        url: https://files.pythonhosted.org/packages/py2.py3/p/pyparsing/pyparsing-2.4.7-py2.py3-none-any.whl
    63 67 
             sha256: ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b
    64 68
    65 69 
       - name: python3-packaging
    66 70 
         buildsystem: simple
    67 71 
         build-commands:
    68 
    -      - pip3 install --prefix=/app packaging-20.9-py2.py3-none-any.whl
    72 
    +      - pip3 install packaging-20.9-py2.py3-none-any.whl
    69 73 
         sources:
    70 74 
           - type: file
    71 
    -        url: https://files.pythonhosted.org/packages/3e/89/7ea760b4daa42653ece2380531c90f64788d979110a2ab51049d92f408af/packaging-20.9-py2.py3-none-any.whl
    75 
    +        url: https://files.pythonhosted.org/packages/py2.py3/p/packaging/packaging-20.9-py2.py3-none-any.whl
    72 76 
             sha256: 67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a
    73 77
    74 78 
       - name: python3-pycparser
    75 79 
         buildsystem: simple
    76 80 
         build-commands:
    77 
    -      - pip3 install --prefix=/app pycparser-2.20-py2.py3-none-any.whl
    81 
    +      - pip3 install pycparser-2.20-py2.py3-none-any.whl
    78 82 
         sources:
    79 83 
           - type: file
    80 
    -        url: https://files.pythonhosted.org/packages/ae/e7/d9c3a176ca4b02024debf82342dab36efadfc5776f9c8db077e8f6e71821/pycparser-2.20-py2.py3-none-any.whl
    84 
    +        url: https://files.pythonhosted.org/packages/py2.py3/p/pycparser/pycparser-2.20-py2.py3-none-any.whl
    81 85 
             sha256: 7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705
    82 86
    83 87 
       - name: python3-cffi
    84 88 
         buildsystem: simple
    85 89 
         build-commands:
    86 
    -      - pip3 install --prefix=/app .
    90 
    +      - pip3 install .
    87 91 
         sources:
    88 92 
           - type: archive
    89 
    -        url: https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438135918484fffaacfaddba776b374563/cffi-1.14.5.tar.gz
    93 
    +        url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.14.5.tar.gz
    90 94 
             sha256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c
    91 95
    92 96 
       - name: python3-asn1crypto
    93 97 
         buildsystem: simple
    94 98 
         build-commands:
    95 
    -      - pip3 install --prefix=/app asn1crypto-1.4.0-py2.py3-none-any.whl
    99 
    +      - pip3 install asn1crypto-1.4.0-py2.py3-none-any.whl
    96 100 
         sources:
    97 101 
           - type: file
    98 
    -        url: https://files.pythonhosted.org/packages/b5/a8/56be92dcd4a5bf1998705a9b4028249fe7c9a035b955fe93b6a3e5b829f8/asn1crypto-1.4.0-py2.py3-none-any.whl
    102 
    +        url: https://files.pythonhosted.org/packages/py2.py3/a/asn1crypto/asn1crypto-1.4.0-py2.py3-none-any.whl
    99 103 
             sha256: 4bcdf33c861c7d40bdcd74d8e4dd7661aac320fcdf40b9a3f95b4ee12fde2fa8
    100 104
    101 105 
       - name: python3-idna
    102 106 
         buildsystem: simple
    103 107 
         build-commands:
    104 
    -      - pip3 install --prefix=/app idna-3.1-py3-none-any.whl
    108 
    +      - pip3 install idna-3.1-py3-none-any.whl
    105 109 
         sources:
    106 110 
           - type: file
    107 
    -        url: https://files.pythonhosted.org/packages/29/88/c52aae187d3b128a0f13f36a6c987fc0d408d03a678ad9996516925d8495/idna-3.1-py3-none-any.whl
    111 
    +        url: https://files.pythonhosted.org/packages/py3/i/idna/idna-3.1-py3-none-any.whl
    108 112 
             sha256: 5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16
    109 113
    110 114 
       - name: python3-cryptography
    111 115 
         buildsystem: simple
    116 
    +    only-arches:
    117 
    +      - aarch64
    112 118 
         build-commands:
    113 
    -      - python3 setup.py install --prefix=/app
    119 
    +      - pip3 install cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl
    114 120 
         sources:
    115 
    -      - type: archive
    116 
    -        url: https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c/cryptography-3.3.2.tar.gz
    117 
    -        sha256: 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed
    121 
    +      - type: file
    122 
    +        url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl
    123 
    +        sha256: 240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6
    124 
    +
    125 
    +  - name: python3-cryptography
    126 
    +    buildsystem: simple
    127 
    +    only-arches:
    128 
    +      - x86_64
    129 
    +    build-commands:
    130 
    +      - pip3 install cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl
    131 
    +    sources:
    132 
    +      - type: file
    133 
    +        url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl
    134 
    +        sha256: 1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959
    118 135
    119 136 
       - name: python3-pyopenssl
    120 137 
         buildsystem: simple
    121 138 
         build-commands:
    122 
    -      - pip3 install --prefix=/app pyOpenSSL-20.0.1-py2.py3-none-any.whl
    139 
    +      - pip3 install pyOpenSSL-20.0.1-py2.py3-none-any.whl
    123 140 
         sources:
    124 141 
           - type: file
    125 
    -        url: https://files.pythonhosted.org/packages/b2/5e/06351ede29fd4899782ad335c2e02f1f862a887c20a3541f17c3fa1a3525/pyOpenSSL-20.0.1-py2.py3-none-any.whl
    142 
    +        url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-20.0.1-py2.py3-none-any.whl
    126 143 
             sha256: 818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b
    127 144
    128 145 
       - name: python3-dbus-python
    ... ... @@ -131,77 +148,96 @@ modules:
    131 148 
             PYTHON_VERSION: '3'
    132 149 
         sources:
    133 150 
           - type: archive
    134 
    -        url: https://files.pythonhosted.org/packages/62/7e/d4fb56a1695fa65da0c8d3071855fa5408447b913c58c01933c2f81a269a/dbus-python-1.2.16.tar.gz
    151 
    +        url: https://files.pythonhosted.org/packages/source/d/dbus-python/dbus-python-1.2.16.tar.gz
    135 152 
             sha256: 11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4
    136 153
    137 154 
       - name: python3-jeepney
    138 155 
         buildsystem: simple
    139 156 
         build-commands:
    140 
    -      - pip3 install --prefix=/app jeepney-0.6.0-py3-none-any.whl
    157 
    +      - pip3 install jeepney-0.6.0-py3-none-any.whl
    141 158 
         sources:
    142 159 
           - type: file
    143 
    -        url: https://files.pythonhosted.org/packages/51/b0/a6ea72741aaac3f37fb96d195e4ee576a103c4c04e279bc6b446a70960e1/jeepney-0.6.0-py3-none-any.whl
    160 
    +        url: https://files.pythonhosted.org/packages/py3/j/jeepney/jeepney-0.6.0-py3-none-any.whl
    144 161 
             sha256: aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae
    145 162
    146 163 
       - name: python3-secretstorage
    147 164 
         buildsystem: simple
    148 165 
         build-commands:
    149 
    -      - pip3 install --prefix=/app SecretStorage-3.3.1-py3-none-any.whl
    166 
    +      - pip3 install SecretStorage-3.3.1-py3-none-any.whl
    150 167 
         sources:
    151 168 
           - type: file
    152 
    -        url: https://files.pythonhosted.org/packages/d9/1e/29cd69fdac7391aa51510dfd42aa70b4e6a826c8cd019ee2a8ab9ec0777f/SecretStorage-3.3.1-py3-none-any.whl
    169 
    +        url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3.3.1-py3-none-any.whl
    153 170 
             sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f
    154 171
    155 172 
       - name: python3-zipp
    156 173 
         buildsystem: simple
    157 174 
         build-commands:
    158 
    -      - pip3 install --prefix=/app zipp-3.4.1-py3-none-any.whl
    175 
    +      - pip3 install zipp-3.4.1-py3-none-any.whl
    159 176 
         sources:
    160 177 
           - type: file
    161 
    -        url: https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7de3337d0cd79074dd1bed4dd840f16ae/zipp-3.4.1-py3-none-any.whl
    178 
    +        url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.4.1-py3-none-any.whl
    162 179 
             sha256: 51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098
    163 180
    164 181 
       # keyring dependency
    165 182 
       - name: python3-importlib-metadata
    166 183 
         buildsystem: simple
    167 184 
         build-commands:
    168 
    -      - pip3 install --prefix=/app importlib_metadata-3.9.0-py3-none-any.whl
    185 
    +      - pip3 install importlib_metadata-4.0.1-py3-none-any.whl
    169 186 
         cleanup:
    170 187 
           - /bin
    171 188 
         sources:
    172 189 
           - type: file
    173 
    -        url: https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b26feeefbca5a8f7f4687bca71e215cc6/importlib_metadata-3.9.0-py3-none-any.whl
    174 
    -        sha256: 6fd684b4c6c7bb36d57e93d57fc244b5ffc08faa1c298bcda3dfbbbf19d7550a
    190 
    +        url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_metadata-4.0.1-py3-none-any.whl
    191 
    +        sha256: d7eb1dea6d6a6086f8be21784cc9e3bcfa55872b52309bc5fad53a8ea444465d
    175 192
    176 193 
       - name: python3-keyring
    177 194 
         buildsystem: simple
    178 195 
         build-commands:
    179 
    -      - pip3 install --prefix=/app keyring-23.0.1-py3-none-any.whl
    196 
    +      - pip3 install keyring-23.0.1-py3-none-any.whl
    180 197 
         cleanup:
    181 198 
           - /bin
    182 199 
         sources:
    183 200 
           - type: file
    184 
    -        url: https://files.pythonhosted.org/packages/26/f9/41230ac47f738f1ba66676dc8d3b30ca5b1f9eb0230fc204bcd9836c4ae9/keyring-23.0.1-py3-none-any.whl
    201 
    +        url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.0.1-py3-none-any.whl
    185 202 
             sha256: 8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48
    186 203
    187 204 
       - name: python3-css-parser
    188 205 
         buildsystem: simple
    189 206 
         build-commands:
    190 
    -      - pip3 install --prefix=/app css_parser-1.0.6-py2.py3-none-any.whl
    207 
    +      - pip3 install css_parser-1.0.6-py2.py3-none-any.whl
    191 208 
         sources:
    192 209 
           - type: file
    193 
    -        url: https://files.pythonhosted.org/packages/64/7a/5ea4d019d36e07026ac194817104ef2e82ba1384aab69fb75ebf56de97c2/css_parser-1.0.6-py2.py3-none-any.whl
    210 
    +        url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0.6-py2.py3-none-any.whl
    194 211 
             sha256: 6fc4f8f0a4b62c77f043765e375cc64971c54ff9a0502fec7e8f1fb28bb96082
    195 212
    196 213 
       - name: python3-precis_i18n
    197 214 
         buildsystem: simple
    198 215 
         build-commands:
    199 
    -      - pip3 install --prefix=/app precis_i18n-1.0.3-py3-none-any.whl
    216 
    +      - pip3 install precis_i18n-1.0.3-py3-none-any.whl
    200 217 
         sources:
    201 218 
           - type: file
    202 
    -        url: https://files.pythonhosted.org/packages/c1/28/0df691ebe7e28a68b839887ce81be07d30cf165b6013c10009184284a303/precis_i18n-1.0.3-py3-none-any.whl
    219 
    +        url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.3-py3-none-any.whl
    203 220 
             sha256: b9a4ff1f2f8c4a762393cb1b80bf4cadfbe861ec299f752068cc42f281322d45
    204 221
    222 
    +  # gssapi dependency
    223 
    +  - name: python3-decorator
    224 
    +    buildsystem: simple
    225 
    +    build-commands:
    226 
    +      - pip3 install decorator-5.0.9-py3-none-any.whl
    227 
    +    sources:
    228 
    +      - type: file
    229 
    +        url: https://files.pythonhosted.org/packages/py3/d/decorator/decorator-5.0.9-py3-none-any.whl
    230 
    +        sha256: 6e5c199c16f7a9f0e3a61a4a54b3d27e7dad0dbdde92b944426cb20914376323
    231 
    +
    232 
    +  - name: python3-gssapi
    233 
    +    buildsystem: simple
    234 
    +    build-commands:
    235 
    +      - pip3 install .
    236 
    +    sources:
    237 
    +      - type: archive
    238 
    +        url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.6.12.tar.gz
    239 
    +        sha256: 16ed3b5d7fc37683be27f34a2a65062cb11d815d019bb2e89ffeb395576e51c8
    240 
    +
    205 241 
       # GSound dependency
    206 242 
       - name: libcanberra
    207 243 
         sources:
    ... ... @@ -239,7 +275,7 @@ modules:
    239 275 
       - name: python3-nbxmpp
    240 276 
         buildsystem: simple
    241 277 
         build-commands:
    242 
    -      - pip3 install --prefix=/app .
    278 
    +      - pip3 install .
    243 279 
         sources:
    244 280 
           - type: git
    245 281 
             url: https://dev.gajim.org/gajim/python-nbxmpp.git
    ... ... @@ -247,7 +283,7 @@ modules:
    247 283 
       - name: gajim
    248 284 
         buildsystem: simple
    249 285 
         build-commands:
    250 
    -      - pip3 install --prefix=/app .
    286 
    +      - pip3 install .
    251 287 
           - touch /app/share/run-as-flatpak
    252 288 
           - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel
    253 289 
           - chmod 755 /app/bin/gajim-devel

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.