gajim: 0.16.8 -> 0.16.9

Upstream changes:

  * Improve Zeroconf behavior
  * Fix showing normal message event
  * remove usage of OpenSSL.rand
  * a few minor bugfixes

The really important part here is the third point about OpenSSL.rand,
because the rand attribute no longer exists in pyopenssl and thus Gajim
doesn't even start.

Also the fix-tests.patch has been fixed upstream as well, so we don't
need it anymore.

Another change in 0.16.9 that's not included in the changelog is that
there is a test_nogui target, which is also run by the CI upstream is
using, so let's use that and remove xvfb_run.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c, @Mic92
This commit is contained in:
aszlig 2018-02-09 16:16:43 +01:00
parent 669e03ecce
commit 855e66860a
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
2 changed files with 4 additions and 24 deletions

View File

@ -1,9 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11
, ldns, pythonPackages
# Test requirements
, xvfb_run
, enableJingle ? true, farstream ? null, gst-plugins-bad ? null
, libnice ? null
, enableE2E ? true
@ -25,13 +22,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gajim-${version}";
version = "0.16.8";
version = "0.16.9";
src = fetchurl {
name = "${name}.tar.bz2";
url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
+ "ref=${name}";
sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb";
sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3";
};
patches = let
@ -46,8 +43,7 @@ stdenv.mkDerivation rec {
name = "gajim-${name}.patch";
url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff";
inherit sha256;
}) cherries)
++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660
}) cherries);
postPatch = ''
sed -i -e '0,/^[^#]/ {
@ -74,8 +70,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook pythonPackages.wrapPython intltool pkgconfig
# Test dependencies
xvfb_run
];
autoreconfPhase = ''
@ -114,9 +108,8 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
installCheckPhase = ''
XDG_DATA_DIRS="$out/share/gajim''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" \
PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \
xvfb-run make test
make test_nogui
'';
enableParallelBuilding = true;

View File

@ -1,13 +0,0 @@
diff --git a/src/common/gajim.py b/src/common/gajim.py
index 4a5d884b6..95d401b67 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False):
jid = name + '@' + hostname
if full:
resource = connections[account_name].server_resource
- jid += '/' + resource
+ jid += '/' + str(resource)
return jid
def get_our_jids():