Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim

Commits:

2 changed files:

Changes:

  • flatpak/README.md
    ... ... @@ -4,8 +4,8 @@ Install gajim flatpak repo
    4 4 
     --------------------------
    5 5
    6 6 
     1. `flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo`
    7 
    -1. `flatpak --user install gnome org.gnome.Platform//3.24`
    8 
    -1. `flatpak --user install gnome org.gnome.Sdk//3.24`
    7 
    +1. `flatpak --user install gnome org.gnome.Platform//3.26`
    8 
    +1. `flatpak --user install gnome org.gnome.Sdk//3.26`
    9 9 
     1. `flatpak-builder --repo=repo directory gajim/org.gajim.Gajim.json`
    10 10 
     1. `flatpak --user remote-add --no-gpg-verify repo repo`
    11 11 
     1. `flatpak --user install repo org.gajim.Gajim`

  • org.gajim.Gajim.json
    1 1 
     {
    2 2 
         "app-id": "org.gajim.Gajim",
    3 3 
         "runtime": "org.gnome.Platform",
    4 
    -    "runtime-version": "3.24",
    4 
    +    "runtime-version": "3.26",
    5 5 
         "sdk": "org.gnome.Sdk",
    6 6 
         "command": "gajim",
    7 
    -    "tags": ["nightly"],
    8 
    -    "desktop-file-name-prefix": "(Nightly) ",
    9 7 
         "finish-args": [
    10 8 
             /* X11 + XShm access */
    11 9 
             "--share=ipc",
    ... ... @@ -17,12 +15,9 @@
    17 15 
             "--filesystem=home",
    18 16 
             "--socket=system-bus"
    19 17 
         ],
    20 
    -    "build-options" : {
    18 
    +    "build-options": {
    21 19 
             "cflags": "-O2 -g",
    22 
    -        "cxxflags": "-O2 -g",
    23 
    -        "env": {
    24 
    -            "PYTHON": "python3"
    25 
    -        }
    20 
    +        "cxxflags": "-O2 -g"
    26 21 
         },
    27 22 
         "cleanup": [
    28 23 
             "/include",
    ... ... @@ -58,8 +53,8 @@
    58 53 
                 "sources": [
    59 54 
                     {
    60 55 
                         "type": "archive",
    61 
    -                    "url": "https://pypi.python.org/packages/62/ea/f41d44e0a4222fe8317ffe1fe7a5c75ec71ca233b4067850567922f8b7be/cffi-1.11.3.tar.gz",
    62 
    -                    "sha256": "8456abb0f892eb7d545f9ce94f4ba78d651365b1a59f9ce9ae7b5325a95dc698"
    56 
    +                    "url": "https://files.pythonhosted.org/packages/10/f7/3b302ff34045f25065091d40e074479d6893882faef135c96f181a57ed06/cffi-1.11.4.tar.gz",
    57 
    +                    "sha256": "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d"
    63 58 
                     }
    64 59 
                 ]
    65 60 
             },
    ... ... @@ -132,8 +127,8 @@
    132 127 
                 "sources": [
    133 128 
                     {
    134 129 
                         "type": "archive",
    135 
    -                    "url": "https://pypi.python.org/packages/41/5f/6da80400340fd48ba4ae1c673be4dc3821ac06cd9821ea60f9c7d32a009f/setuptools-38.4.0.zip",
    136 
    -                    "sha256": "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75"
    130 
    +                    "url": "https://files.pythonhosted.org/packages/6c/54/f7e9cea6897636a04e74c3954f0d8335cc38f7d01e27eec98026b049a300/setuptools-38.5.1.zip",
    131 
    +                    "sha256": "6425484c08e99a98a42209c25c3d325f749230b55284d66192784f941a7e6628"
    137 132 
                     }
    138 133 
                 ]
    139 134 
             },
    ... ... @@ -257,11 +252,21 @@
    257 252 
             /* Zeroconf support */
    258 253 
             {
    259 254 
                 "name": "avahi",
    260 
    -            "cleanup": [ "/bin", "/lib/avahi", "/share" ],
    255 
    +            "cleanup": [
    256 
    +                "/bin",
    257 
    +                "/lib/avahi",
    258 
    +                "/share"
    259 
    +            ],
    261 260 
                 "config-opts": [
    262 
    -                "--with-distro=none", "--disable-qt3", "--disable-qt4",
    263 
    -                "--disable-libdaemon", "--disable-pygtk", "--disable-gdbm",
    264 
    -                "--disable-mono", "--disable-monodoc", "--disable-manpages"
    261 
    +                "--with-distro=none",
    262 
    +                "--disable-qt3",
    263 
    +                "--disable-qt4",
    264 
    +                "--disable-libdaemon",
    265 
    +                "--disable-pygtk",
    266 
    +                "--disable-gdbm",
    267 
    +                "--disable-mono",
    268 
    +                "--disable-monodoc",
    269 
    +                "--disable-manpages"
    265 270 
                 ],
    266 271 
                 "sources": [
    267 272 
                     {
    ... ... @@ -271,6 +276,60 @@
    271 276 
                     }
    272 277 
                 ]
    273 278 
             },
    279 
    +        /* OMEMO support */
    280 
    +        {
    281 
    +            "name": "protobuf",
    282 
    +            "ensure-writable": [
    283 
    +                "easy-install.pth",
    284 
    +                "setuptools.pth"
    285 
    +            ],
    286 
    +            "buildsystem": "simple",
    287 
    +            "build-commands": [
    288 
    +                "python3 setup.py install --prefix=/app"
    289 
    +            ],
    290 
    +            "sources": [
    291 
    +                {
    292 
    +                    "type": "archive",
    293 
    +                    "url": "https://files.pythonhosted.org/packages/14/03/ff5279abda7b46e9538bfb1411d42831b7e65c460d73831ed2445649bc02/protobuf-3.5.1.tar.gz",
    294 
    +                    "sha256": "95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863"
    295 
    +                }
    296 
    +            ]
    297 
    +        },
    298 
    +        {
    299 
    +            "name": "python3-axolotl-curve25519",
    300 
    +            "ensure-writable": [
    301 
    +                "easy-install.pth"
    302 
    +            ],
    303 
    +            "buildsystem": "simple",
    304 
    +            "build-commands": [
    305 
    +                "python3 setup.py install --prefix=/app"
    306 
    +            ],
    307 
    +            "sources": [
    308 
    +                {
    309 
    +                    "type": "archive",
    310 
    +                    "url": "https://files.pythonhosted.org/packages/69/e0/9605cac4c83c12d0bef5c2e9992f0bcbce4fae9a252899d545ccb7dc8717/python-axolotl-curve25519-0.1.tar.gz",
    311 
    +                    "sha256": "c559f6a5bf51e869325b36bd83c14cccd7dec1c6e7599e797f9ba27a72d339c0"
    312 
    +                }
    313 
    +            ]
    314 
    +        },
    315 
    +        {
    316 
    +            "name": "python3-axolotl",
    317 
    +            "ensure-writable": [
    318 
    +                "easy-install.pth",
    319 
    +                "setuptools.pth"
    320 
    +            ],
    321 
    +            "buildsystem": "simple",
    322 
    +            "build-commands": [
    323 
    +                "python3 setup.py install --prefix=/app"
    324 
    +            ],
    325 
    +            "sources": [
    326 
    +                {
    327 
    +                    "type": "archive",
    328 
    +                    "url": "https://files.pythonhosted.org/packages/7f/9d/410ce5c2322180cae7025e52e2f91f585d2be71f30ebbcfd605d2c9a1cd5/python-axolotl-0.1.39.tar.gz",
    329 
    +                    "sha256": "9af9c937d0d05ebea414f1be79ecc7517cc3541a77101941e6a2a71bdd2b6e25"
    330 
    +                }
    331 
    +            ]
    332 
    +        },
    274 333 
             {
    275 334 
                 "name": "python3-nbxmpp",
    276 335 
                 "buildsystem": "simple",
    ... ... @@ -289,12 +348,19 @@
    289 348 
                 "name": "gajim",
    290 349 
                 "buildsystem": "simple",
    291 350 
                 "build-commands": [
    292 
    -                "pip3 install --prefix=/app --no-deps ."
    351 
    +                "pip3 install --prefix=/app ."
    293 352 
                 ],
    294 353 
                 "sources": [
    295 354 
                     {
    296 355 
                         "type": "git",
    297 
    -                    "url": "https://dev.gajim.org/gajim/gajim.git"
    356 
    +                    "url": "https://dev.gajim.org/gajim/gajim.git",
    357 
    +                    "branch": "gajim_1.0"
    358 
    +                },
    359 
    +                {
    360 
    +                    "type": "archive",
    361 
    +                    "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip",
    362 
    +                    "sha256": "7d5dcd9a5e05d214ca85651784bda732aac3b5c363a6e23529e6e777f9d24d42",
    363 
    +                    "dest": "gajim/data/plugins/plugin_installer"
    298 364 
                     }
    299 365 
                 ]
    300 366 
             }

    • —
    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.