Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2017-05-21 08:55:04 +03:00
parent 32ed7435bc 65e5c3afc6
commit 0d66c40dc3
8 changed files with 134 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/chat/loudmouth/pspec.xml
+1 -1
View File
@@ -50,7 +50,7 @@
<History>
<Update release="1">
<Date>2017-01-07</Date>
<Date>2017-05-19</Date>
<Version>1.5.3</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
network/chat/pidgin/files/pidgin-py3-fixes.patch
+69
View File
@@ -0,0 +1,69 @@
diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote pidgin-2.10.12/libpurple/purple-remote
--- pidgin-2.10.12.orig/libpurple/purple-remote 2016-01-01 01:19:41.000000000 +0200
+++ pidgin-2.10.12/libpurple/purple-remote 2016-01-02 06:23:14.082831498 +0200
@@ -3,13 +3,20 @@
import codecs
import dbus
import re
-import urllib
import sys
+try:
+ from urllib.parse import unquote
+except ImportError:
+ from urllib import unquote
import xml.dom.minidom
-sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
-sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
+if sys.version_info[0] >= 3:
+ sys.stdin = codecs.getwriter('utf-8')(sys.stdin.buffer)
+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer)
+else:
+ sys.stdin = codecs.getwriter('utf-8')(sys.stdin)
+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName
@@ -41,7 +48,7 @@ class CheckedAttribute:
return result
def show_help(requested=False):
- print """This program uses D-Bus to communicate with purple.
+ print("""This program uses D-Bus to communicate with purple.
Usage:
@@ -72,7 +79,7 @@ Examples of commands:
PurpleAccountsFindConnected?name=&protocol=prpl-jabber
PurpleAccountsFindConnected(,prpl-jabber)
-""" % sys.argv[0]
+""" % sys.argv[0])
if (requested):
sys.exit(0)
else:
@@ -120,7 +127,7 @@ def execute(uri):
if paramstring is not None:
for param in paramstring.split("&"):
key, value = extendlist(param.split("=",1), 2, "")
- params[key] = urllib.unquote(value)
+ params[key] = unquote(value)
accountname = params.get("account", "")
@@ -233,12 +240,11 @@ if len(sys.argv) == 1:
elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
show_help(True)
elif (obj == None):
- print "No existing libpurple instance detected."
+ print("No existing libpurple instance detected.")
sys.exit(1);
for arg in sys.argv[1:]:
output = execute(arg)
if (output != None):
- print output
-
+ print(output)
network/chat/pidgin/pspec.xml
+11 -17
View File
@@ -12,7 +12,7 @@
<Icon>pidgin</Icon>
<Summary>Instant messaging application previously known as gaim</Summary>
<Description>Multi-protocol instant messaging tool for MSN, Yahoo, IRC, Jabber and Gadu-Gadu protocols.</Description>
<Archive sha1sum="5e0062b81bdb01300804e12bc0b6a04a91984631" type="tarbz2">mirrors://sourceforge/pidgin/pidgin-2.10.11.tar.bz2</Archive>
<Archive sha1sum="38f48c48978425b86fc9f4e8ba08216ff379451b" type="tarbz2">mirrors://sourceforge/pidgin/pidgin-2.12.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>intltool</Dependency>
<Dependency>glib2-devel</Dependency>
@@ -44,23 +44,8 @@
<Dependency>python-devel</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="0">pidgin-desktop.patch</Patch> -->
<!-- <Patch level="1">mageia/pidgin-2.7.0-smiley.patch</Patch> -->
<!-- <Patch level="1">mageia/pidgin-2.8.0-reread-resolvconf.patch</Patch> -->
<!-- <Patch level="1">mageia/pidgin-2.10.0-gg-search-by-uin.patch</Patch> -->
<!-- <Patch level="0">mageia/pidgin-2.4.2-set-jabber-as-module.patch</Patch> -->
<!-- <Patch level="1">mageia/pidgin-2.8.0-gg-disconnect.patch</Patch> -->
<!-- <Patch level="1">mageia/pidgin-2.7.0-mono-build.patch</Patch> -->
<!-- <Patch level="1">fedora/pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch</Patch> -->
<Patch level="1">suse/ pidgin-2.10.11-send-video-enum.patch</Patch>
<Patch level="1">suse/pidgin-2.10.11-add-dtmf-support.patch</Patch>
<!-- <Patch level="1">suse/pidgin-2.10.11-application-media.patch</Patch> -->
<Patch level="1">suse/pidgin-2.10.11-fix-sound-play-fd-leak.patch</Patch>
<Patch level="1">suse/pidgin-2.10.11-gst-references.patch</Patch>
<Patch level="1">suse/pidgin-2.10.11-init-media-optional.patch</Patch>
<Patch level="1">suse/pidgin-2.10.11-private-media.patch</Patch>
<Patch level="1">suse/pidgin-ncurses-6.0-accessors.patch</Patch>
<!-- <Patch level="1">suse/pidgin-port-to-gst-1.0.patch</Patch> -->
<Patch level="1">pidgin-py3-fixes.patch</Patch>
</Patches>
</Source>
@@ -85,6 +70,8 @@
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libXScrnSaver</Dependency>
<Dependency release="current">libpurple</Dependency>
<Dependency>gstreamer-next</Dependency>
<Dependency>farstream</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="man">/usr/share/man</Path>
@@ -203,6 +190,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-05-18</Date>
<Version>2.12.0</Version>
<Comment>Rebuild with new toolchain</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2016-06-15</Date>
<Version>2.10.11</Version>
network/chat/telepathy-butterfly/pspec.xml
+7
View File
@@ -30,6 +30,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-05-18</Date>
<Version>0.5.18</Version>
<Comment>Rebuild with new toolchain</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.5.15</Version>
network/chat/telepathy-farstream/pspec.xml
+7
View File
@@ -71,6 +71,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-05-18</Date>
<Version>0.6.2</Version>
<Comment>Rebuild with new toolchain</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.6.2</Version>
network/chat/telepathy-haze/actions.py
+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()
network/chat/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch
+22
View File
@@ -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");
network/chat/telepathy-haze/pspec.xml
+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>