Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Flatpak: bundle plugin installer
by Philipp Hörist 12 Feb '18

12 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 782243ce by André Apitzsch at 2018-02-11T19:41:20+01:00 Flatpak: bundle plugin installer - - - - - cde19359 by André Apitzsch at 2018-02-11T22:10:23+01:00 Flatpak: add OMEMO dependencies - - - - - 1071603b by Philipp Hörist at 2018-02-12T08:12:58+01:00 Merge branch 'flatpak_plugin' into 'master' Flatpak: bundle plugin installer See merge request gajim/gajim!207 - - - - - 2 changed files: - flatpak/README.md - org.gajim.Gajim.json Changes: ===================================== flatpak/README.md ===================================== --- a/flatpak/README.md +++ b/flatpak/README.md @@ -4,8 +4,8 @@ Install gajim flatpak repo -------------------------- 1. `flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo` -1. `flatpak --user install gnome org.gnome.Platform//3.24` -1. `flatpak --user install gnome org.gnome.Sdk//3.24` +1. `flatpak --user install gnome org.gnome.Platform//3.26` +1. `flatpak --user install gnome org.gnome.Sdk//3.26` 1. `flatpak-builder --repo=repo directory gajim/org.gajim.Gajim.json` 1. `flatpak --user remote-add --no-gpg-verify repo repo` 1. `flatpak --user install repo org.gajim.Gajim` ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -1,7 +1,7 @@ { "app-id": "org.gajim.Gajim", "runtime": "org.gnome.Platform", - "runtime-version": "3.24", + "runtime-version": "3.26", "sdk": "org.gnome.Sdk", "command": "gajim", "tags": ["nightly"], @@ -17,12 +17,9 @@ "--filesystem=home", "--socket=system-bus" ], - "build-options" : { + "build-options": { "cflags": "-O2 -g", - "cxxflags": "-O2 -g", - "env": { - "PYTHON": "python3" - } + "cxxflags": "-O2 -g" }, "cleanup": [ "/include", @@ -58,8 +55,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/62/ea/f41d44e0a4222fe8317ffe1fe7a5c75ec71c…", - "sha256": "8456abb0f892eb7d545f9ce94f4ba78d651365b1a59f9ce9ae7b5325a95dc698" + "url": "https://files.pythonhosted.org/packages/10/f7/3b302ff34045f25065091d40e0744…", + "sha256": "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d" } ] }, @@ -132,8 +129,8 @@ "sources": [ { "type": "archive", - "url": "https://pypi.python.org/packages/41/5f/6da80400340fd48ba4ae1c673be4dc3821ac…", - "sha256": "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75" + "url": "https://files.pythonhosted.org/packages/6c/54/f7e9cea6897636a04e74c3954f0d8…", + "sha256": "6425484c08e99a98a42209c25c3d325f749230b55284d66192784f941a7e6628" } ] }, @@ -257,11 +254,21 @@ /* Zeroconf support */ { "name": "avahi", - "cleanup": [ "/bin", "/lib/avahi", "/share" ], + "cleanup": [ + "/bin", + "/lib/avahi", + "/share" + ], "config-opts": [ - "--with-distro=none", "--disable-qt3", "--disable-qt4", - "--disable-libdaemon", "--disable-pygtk", "--disable-gdbm", - "--disable-mono", "--disable-monodoc", "--disable-manpages" + "--with-distro=none", + "--disable-qt3", + "--disable-qt4", + "--disable-libdaemon", + "--disable-pygtk", + "--disable-gdbm", + "--disable-mono", + "--disable-monodoc", + "--disable-manpages" ], "sources": [ { @@ -271,6 +278,60 @@ } ] }, + /* OMEMO support */ + { + "name": "protobuf", + "ensure-writable": [ + "easy-install.pth", + "setuptools.pth" + ], + "buildsystem": "simple", + "build-commands": [ + "python3 setup.py install --prefix=/app" + ], + "sources": [ + { + "type": "archive", + "url": "https://files.pythonhosted.org/packages/14/03/ff5279abda7b46e9538bfb1411d42…", + "sha256": "95b78959572de7d7fafa3acb718ed71f482932ddddddbd29ba8319c10639d863" + } + ] + }, + { + "name": "python3-axolotl-curve25519", + "ensure-writable": [ + "easy-install.pth" + ], + "buildsystem": "simple", + "build-commands": [ + "python3 setup.py install --prefix=/app" + ], + "sources": [ + { + "type": "archive", + "url": "https://files.pythonhosted.org/packages/69/e0/9605cac4c83c12d0bef5c2e9992f0…", + "sha256": "c559f6a5bf51e869325b36bd83c14cccd7dec1c6e7599e797f9ba27a72d339c0" + } + ] + }, + { + "name": "python3-axolotl", + "ensure-writable": [ + "easy-install.pth", + "setuptools.pth" + ], + "buildsystem": "simple", + "build-commands": [ + "python3 setup.py install --prefix=/app" + ], + "sources": [ + { + "type": "archive", + "url": "https://files.pythonhosted.org/packages/7f/9d/410ce5c2322180cae7025e52e2f91…", + "sha256": "9af9c937d0d05ebea414f1be79ecc7517cc3541a77101941e6a2a71bdd2b6e25" + } + ] + }, { "name": "python3-nbxmpp", "buildsystem": "simple", @@ -289,12 +350,18 @@ "name": "gajim", "buildsystem": "simple", "build-commands": [ - "pip3 install --prefix=/app --no-deps ." + "pip3 install --prefix=/app ." ], "sources": [ { "type": "git", "url": "https://dev.gajim.org/gajim/gajim.git" + }, + { + "type": "archive", + "url": "https://ftp.gajim.org/plugins_1/plugin_installer.zip", + "sha256": "7d5dcd9a5e05d214ca85651784bda732aac3b5c363a6e23529e6e777f9d24d42", + "dest": "gajim/data/plugins/plugin_installer" } ] } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9e26411bd61498a3e6ea2a0b2d08f3ab4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9e26411bd61498a3e6ea2a0b2d08f3ab4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Windows build
by Philipp Hörist 11 Feb '18

11 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e26411b by Philipp Hörist at 2018-02-11T23:45:36+01:00 Fix Windows build - - - - - 2 changed files: - appveyor.yml - win/_base.sh Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ environment: matrix: - - MSYS: C:/msys64/mingw32 + - MSYSTEM: MINGW32 branches: only: @@ -11,10 +11,9 @@ clone_depth: 1 # init: # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -install: - +build_script: + - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127 - ps: | - $env:MSYSTEM="MINGW32" $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" @@ -23,14 +22,11 @@ install: C:\msys64\usr\bin\sh.exe --login -c $command } - bash 'pacman -Sy --noconfirm git' bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim' bash 'C:/msys64/home/appveyor/gajim/win/build.sh' Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:TIME_STRING).exe" Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:TIME_STRING).exe" -build: off - # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -51,9 +51,8 @@ function build_compileall { } function install_pre_deps { - pacman -S --needed --noconfirm p7zip git \ - mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain \ - mingw-w64-i686-python3 + pacman -S --needed --noconfirm p7zip \ + mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain } function create_root { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e26411bd61498a3e6ea2a0b2d08f3ab49… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e26411bd61498a3e6ea2a0b2d08f3ab49… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Read config files with UTF-8
by Philipp Hörist 10 Feb '18

10 Feb '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f47ea05b by Philipp Hörist at 2018-02-10T18:59:34+01:00 Read config files with UTF-8 - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -48,7 +48,7 @@ class OptionsParser: def read(self): try: - fd = open(self.__filename) + fd = open(self.__filename, encoding='utf-8') except Exception: if os.path.exists(self.__filename): #we talk about a file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f47ea05b79ce30e27b8962cd7296a73b08… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f47ea05b79ce30e27b8962cd7296a73b08… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist pushed new tag gajim-1.0.0-beta1 at gajim / gajim --- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.0.0-beta1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted tag gajim-1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist deleted tag gajim-1.0.0-beta1 at gajim / gajim --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted tag gajim-1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist deleted tag gajim-1.0.0-beta1 at gajim / gajim --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

1 0

[Git][gajim/gajim] Deleted tag gajim_1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist deleted tag gajim_1.0.0-beta1 at gajim / gajim --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted tag gajim_1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist deleted tag gajim_1.0.0-beta1 at gajim / gajim --- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim_1.0.0-beta1
by Philipp Hörist 08 Feb '18

08 Feb '18

Philipp Hörist pushed new tag gajim_1.0.0-beta1 at gajim / gajim --- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim_1.0.0-beta1 You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits