diff --git a/telepathy-salut-0.8.1-python3.patch b/telepathy-salut-0.8.1-python3.patch new file mode 100644 index 0000000..6498ddb --- /dev/null +++ b/telepathy-salut-0.8.1-python3.patch @@ -0,0 +1,145 @@ +diff -up telepathy-salut-0.8.1/tools/glib-client-marshaller-gen.py.py3 telepathy-salut-0.8.1/tools/glib-client-marshaller-gen.py +--- telepathy-salut-0.8.1/tools/glib-client-marshaller-gen.py.py3 2011-08-16 07:04:41.000000000 -0400 ++++ telepathy-salut-0.8.1/tools/glib-client-marshaller-gen.py 2019-12-20 11:19:32.682996743 -0500 +@@ -31,22 +31,22 @@ class Generator(object): + for signal in signals: + self.do_signal(signal) + +- print 'void' +- print '%s_register_dbus_glib_marshallers (void)' % self.prefix +- print '{' ++ print('void') ++ print('%s_register_dbus_glib_marshallers (void)' % self.prefix) ++ print('{') + +- all = self.marshallers.keys() +- all.sort() ++ all = list(self.marshallers.keys()) ++ sorted(all) + for marshaller in all: + rhs = self.marshallers[marshaller] + +- print ' dbus_g_object_register_marshaller (%s,' % marshaller +- print ' G_TYPE_NONE, /* return */' ++ print(' dbus_g_object_register_marshaller (%s,' % marshaller) ++ print(' G_TYPE_NONE, /* return */') + for type in rhs: +- print ' G_TYPE_%s,' % type.replace('VOID', 'NONE') +- print ' G_TYPE_INVALID);' ++ print(' G_TYPE_%s,' % type.replace('VOID', 'NONE')) ++ print(' G_TYPE_INVALID);') + +- print '}' ++ print('}') + + + def types_to_gtypes(types): +diff -up telepathy-salut-0.8.1/tools/glib-ginterface-gen.py.py3 telepathy-salut-0.8.1/tools/glib-ginterface-gen.py +--- telepathy-salut-0.8.1/tools/glib-ginterface-gen.py.py3 2011-08-16 07:04:41.000000000 -0400 ++++ telepathy-salut-0.8.1/tools/glib-ginterface-gen.py 2019-12-20 11:19:32.683996724 -0500 +@@ -26,7 +26,7 @@ import sys + import os.path + import xml.dom.minidom + +-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \ ++from libglibcodegen import Signature, type_to_gtype, \ + camelcase_to_lower, NS_TP, dbus_gutils_wincaps_to_uscore, \ + signal_to_marshal_name, method_to_glue_marshal_name + +@@ -620,7 +620,7 @@ class Generator(object): + self.b('') + + nodes = self.dom.getElementsByTagName('node') +- nodes.sort(cmp_by_name) ++ nodes.sort(key=lambda node : node.getAttributeNode('name').nodeValue) + + for node in nodes: + self.do_node(node) +@@ -639,7 +639,7 @@ class Generator(object): + + + def cmdline_error(): +- print """\ ++ print("""\ + usage: + gen-ginterface [OPTIONS] xmlfile Prefix_ + options: +@@ -659,7 +659,7 @@ options: + void symbol (DBusGMethodInvocation *context) + and return some sort of "not implemented" error via + dbus_g_method_return_error (context, ...) +-""" ++""") + sys.exit(1) + + +diff -up telepathy-salut-0.8.1/tools/glib-signals-marshal-gen.py.py3 telepathy-salut-0.8.1/tools/glib-signals-marshal-gen.py +--- telepathy-salut-0.8.1/tools/glib-signals-marshal-gen.py.py3 2011-08-16 07:04:41.000000000 -0400 ++++ telepathy-salut-0.8.1/tools/glib-signals-marshal-gen.py 2019-12-20 11:19:32.683996724 -0500 +@@ -42,11 +42,11 @@ class Generator(object): + self.do_signal(signal) + + all = self.marshallers.keys() +- all.sort() ++ sorted(all) + for marshaller in all: + rhs = self.marshallers[marshaller] + if not marshaller.startswith('g_cclosure'): +- print 'VOID:' + ','.join(rhs) ++ print('VOID:' + ','.join(rhs)) + + if __name__ == '__main__': + argv = sys.argv[1:] +diff -up telepathy-salut-0.8.1/tools/libglibcodegen.py.py3 telepathy-salut-0.8.1/tools/libglibcodegen.py +--- telepathy-salut-0.8.1/tools/libglibcodegen.py.py3 2011-07-07 11:24:48.000000000 -0400 ++++ telepathy-salut-0.8.1/tools/libglibcodegen.py 2019-12-20 11:22:38.687463535 -0500 +@@ -191,7 +191,10 @@ class _SignatureIter: + def __init__(self, string): + self.remaining = string + +- def next(self): ++ def __iter__(self): ++ self ++ ++ def __next__(self): + if self.remaining == '': + raise StopIteration + +@@ -297,7 +300,7 @@ def type_to_gtype(s): + return ("GHashTable *", "DBUS_TYPE_G_STRING_STRING_HASHTABLE", "BOXED", False) + elif s[:2] == 'a{': #some arbitrary hash tables + if s[2] not in ('y', 'b', 'n', 'q', 'i', 'u', 's', 'o', 'g'): +- raise Exception, "can't index a hashtable off non-basic type " + s ++ raise Exception("can't index a hashtable off non-basic type " + s) + first = type_to_gtype(s[2]) + second = type_to_gtype(s[3:-1]) + return ("GHashTable *", "(dbus_g_type_get_map (\"GHashTable\", " + first[1] + ", " + second[1] + "))", "BOXED", False) +@@ -312,7 +315,7 @@ def type_to_gtype(s): + return ("GValueArray *", gtype, "BOXED", True) + + # we just don't know .. +- raise Exception, "don't know the GType for " + s ++ raise Exception("don't know the GType for " + s) + + + def xml_escape(s): +diff -up telepathy-salut-0.8.1/tools/make-release-mail.py.py3 telepathy-salut-0.8.1/tools/make-release-mail.py +--- telepathy-salut-0.8.1/tools/make-release-mail.py.py3 2012-11-12 09:13:18.000000000 -0500 ++++ telepathy-salut-0.8.1/tools/make-release-mail.py 2019-12-20 11:19:32.684996705 -0500 +@@ -50,14 +50,14 @@ GIT_URL = 'http://cgit.freedesktop.org/t + def main(package, version, news_path): + release_name, details = extract_description(package, version, news_path) + +- print """ ++ print(""" + %(release_name)s + + tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz + signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz.asc + git: %(git_url)s/%(package)s + +-%(details)s""".strip().rstrip() % { ++%(details)s""").strip().rstrip() % { + 'base_url': BASE_URL, + 'git_url': GIT_URL, + 'package': package, diff --git a/telepathy-salut.spec b/telepathy-salut.spec index 8a9e9e7..10c71cc 100644 --- a/telepathy-salut.spec +++ b/telepathy-salut.spec @@ -1,6 +1,6 @@ Name: telepathy-salut Version: 0.8.1 -Release: 1mamba +Release: 2mamba Summary: Link-local XMPP connection manager for the Telepathy framework Group: Graphical Desktop/Applications/Networking Vendor: openmamba @@ -8,6 +8,7 @@ Distribution: openmamba Packager: Davide Madrisan URL: http://telepathy.freedesktop.org/wiki/ Source: http://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-%{version}.tar.gz +Patch0: telepathy-salut-0.8.1-python3.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -16,24 +17,24 @@ BuildRequires: libavahi-glib-devel BuildRequires: libdbus-devel BuildRequires: libdbus-glib-devel BuildRequires: libffi-devel -BuildRequires: libgcrypt-devel BuildRequires: libglib-devel +BuildRequires: libgmp-devel BuildRequires: libgnutls-devel -BuildRequires: libgpg-error-devel +BuildRequires: liblzma-devel +BuildRequires: libnettle-devel +BuildRequires: libp11-kit-devel BuildRequires: libselinux-devel BuildRequires: libsoup-devel BuildRequires: libsqlite-devel BuildRequires: libssp-devel +BuildRequires: libsystemd-devel BuildRequires: libtasn1-devel +BuildRequires: libunistring-devel BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: libz-devel BuildRequires: telepathy-glib-devel ## AUTOBUILDREQ-END -BuildRequires: python-twisted -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%debug_package %description Salut is a link-local XMPP (XEP-0174) connection manager for the Telepathy framework, currently supporting presence and single-user chats with iChat interoperability, and multi-user chats and Tubes using the Clique protocol @@ -41,14 +42,18 @@ Salut is a link-local XMPP (XEP-0174) connection manager for the Telepathy frame Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications. +%debug_package + %prep %setup -q +%patch0 -p1 %build %configure --enable-gtk-doc \ --enable-olpc \ --disable-avahi-tests \ --enable-static=no + %make %install @@ -78,6 +83,9 @@ rm -f %{buildroot}%{_libdir}/telepathy/salut-0/lib/libwocky.*a %doc AUTHORS COPYING %changelog +* Tue Apr 27 2021 Silvan Calarco 0.8.1-2mamba +- rebuilt with python3 patch + * Tue Oct 28 2014 Silvan Calarco 0.8.1-1mamba - update to 0.8.1