Philipp Hörist pushed to branch omemo_integration at gajim / gajim

Commits:

5 changed files:

Changes:

  • README.md
    ... ... @@ -12,6 +12,8 @@ ### Runtime Requirements
    12 12
     - [keyring](https://pypi.org/project/keyring/)
    
    13 13
     - [precis_i18n](https://pypi.org/project/precis-i18n/)
    
    14 14
     - [packaging](https://pypi.org/project/packaging/)
    
    15
    +- [qrcode](https://pypi.org/project/qrcode/) (>=7.3.1)
    
    16
    +- [python-axolotl](https://pypi.org/project/python-axolotl/) (>=0.2.3)
    
    15 17
     - [Pillow](https://pypi.org/project/Pillow/)
    
    16 18
     - [setuptools](https://pypi.org/project/setuptools/)
    
    17 19
     - [Gtk3](https://gitlab.com/gnome/gtk) (>=3.24.30)
    

  • debian/control
    ... ... @@ -41,6 +41,8 @@ Depends:
    41 41
         python3-pil,
    
    42 42
         python3-setuptools,
    
    43 43
         python3-css-parser,
    
    44
    +    python3-qrcode (>=7.3.1),
    
    45
    +    python3-axolotl (>=0.2.3),
    
    44 46
         gir1.2-pango-1.0 (>= 1.50.0),
    
    45 47
         gir1.2-gtk-3.0 (>= 3.24.30),
    
    46 48
         gir1.2-gtksource-4,
    

  • flatpak/org.gajim.Gajim.Devel.yaml
    ... ... @@ -348,3 +348,40 @@ modules:
    348 348
               - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
    
    349 349
         post-install:
    
    350 350
           - install -d /app/plugins
    
    351
    +
    
    352
    +  # OMEMO dependenies
    
    353
    +  - name: protobuf
    
    354
    +    buildsystem: simple
    
    355
    +    build-commands:
    
    356
    +      - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl
    
    357
    +    sources:
    
    358
    +      - type: file
    
    359
    +        url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-none-any.whl
    
    360
    +        sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b
    
    361
    +
    
    362
    +  - name: python3-axolotl-curve25519
    
    363
    +    buildsystem: simple
    
    364
    +    build-commands:
    
    365
    +      - pip3 install .
    
    366
    +    sources:
    
    367
    +      - type: archive
    
    368
    +        url: https://files.pythonhosted.org/packages/source/p/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1.post2.tar.gz
    
    369
    +        sha256: 0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3
    
    370
    +
    
    371
    +  - name: python3-axolotl
    
    372
    +    buildsystem: simple
    
    373
    +    build-commands:
    
    374
    +      - pip3 install --no-deps python_axolotl-0.2.3-py3-none-any.whl
    
    375
    +    sources:
    
    376
    +      - type: file
    
    377
    +        url: https://files.pythonhosted.org/packages/0f/b3/4a0b0e664435691bba36fac6e366cece506d002294c293bd3dcb40c2b2ba/python_axolotl-0.2.3-py3-none-any.whl
    
    378
    +        sha256: 6a22acbf646c3b736ea1a4663ab5c52687fce6612e92ae6a7fe63803c212fb9e
    
    379
    +
    
    380
    +  - name: python3-qrcode
    
    381
    +    buildsystem: simple
    
    382
    +    build-commands:
    
    383
    +      - pip3 install .
    
    384
    +    sources:
    
    385
    +      - type: archive
    
    386
    +        url: https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz
    
    387
    +        sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578
    \ No newline at end of file

  • flatpak/org.gajim.Gajim.yaml
    ... ... @@ -335,3 +335,40 @@ modules:
    335 335
             path: app-overrides.json
    
    336 336
         post-install:
    
    337 337
           - install -d /app/plugins
    
    338
    +
    
    339
    +  # OMEMO dependenies
    
    340
    +  - name: protobuf
    
    341
    +    buildsystem: simple
    
    342
    +    build-commands:
    
    343
    +      - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl
    
    344
    +    sources:
    
    345
    +      - type: file
    
    346
    +        url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-none-any.whl
    
    347
    +        sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b
    
    348
    +
    
    349
    +  - name: python3-axolotl-curve25519
    
    350
    +    buildsystem: simple
    
    351
    +    build-commands:
    
    352
    +      - pip3 install .
    
    353
    +    sources:
    
    354
    +      - type: archive
    
    355
    +        url: https://files.pythonhosted.org/packages/source/p/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1.post2.tar.gz
    
    356
    +        sha256: 0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3
    
    357
    +
    
    358
    +  - name: python3-axolotl
    
    359
    +    buildsystem: simple
    
    360
    +    build-commands:
    
    361
    +      - pip3 install --no-deps python_axolotl-0.2.3-py3-none-any.whl
    
    362
    +    sources:
    
    363
    +      - type: file
    
    364
    +        url: https://files.pythonhosted.org/packages/0f/b3/4a0b0e664435691bba36fac6e366cece506d002294c293bd3dcb40c2b2ba/python_axolotl-0.2.3-py3-none-any.whl
    
    365
    +        sha256: 6a22acbf646c3b736ea1a4663ab5c52687fce6612e92ae6a7fe63803c212fb9e
    
    366
    +
    
    367
    +  - name: python3-qrcode
    
    368
    +    buildsystem: simple
    
    369
    +    build-commands:
    
    370
    +      - pip3 install .
    
    371
    +    sources:
    
    372
    +      - type: archive
    
    373
    +        url: https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz
    
    374
    +        sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578
    \ No newline at end of file

  • setup.cfg
    ... ... @@ -45,6 +45,8 @@ install_requires =
    45 45
         precis-i18n>=1.0.0
    
    46 46
         pyOpenSSL>=16.2
    
    47 47
         pycairo>=1.16.0
    
    48
    +    qrcode>=7.3.1
    
    49
    +    python-axolotl>=0.2.3
    
    48 50
     
    
    49 51
     [options.package_data]
    
    50 52
     gajim =