Merge pull request #3543 from suvari/master

telepathy-haze: patched
This commit is contained in:
Kamil ATLI
2017-05-19 20:49:58 +03:00
committed by GitHub
3 changed files with 39 additions and 3 deletions
+3 -1
View File
@@ -6,10 +6,12 @@
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
autotools.configure("--disable-static")
autotools.configure("--disable-static --libexecdir=/usr/lib")
shelltools.export("PYTHON", "/usr/bin/python2.7")
def build():
autotools.make()
@@ -0,0 +1,22 @@
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "media-stream.h"
+#include <libpurple/version.h>
#include <libpurple/media/backend-iface.h>
#include <string.h>
#include <telepathy-glib/dbus.h>
@@ -1076,7 +1077,11 @@ haze_media_stream_new_native_candidate (
if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP)
protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP)
+#if PURPLE_VERSION_CHECK (2, 10, 12)
+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE;
+#else
protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP;
+#endif
else
DEBUG ("Unknown network protocol");
+14 -2
View File
@@ -20,7 +20,11 @@
<Dependency>libpurple-devel</Dependency>
<Dependency>telepathy-glib-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>python-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch</Patch>
</Patches>
</Source>
<Package>
@@ -33,14 +37,22 @@
<Dependency>telepathy-glib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/libexec</Path>
<!-- <Path fileType="executable">/usr/libexec</Path> -->
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="library">/usr/lib</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2017-05-19</Date>
<Version>0.8.0</Version>
<Comment>Release Bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.8.0</Version>
@@ -56,4 +68,4 @@
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>