svn commit: r550445 - in head/net-im: telepathy-gabble telepathy-gabble/files telepathy-glib telepathy-idle telepathy-idle/files telepathy-logger telepathy-logger/files telepathy-mission-control te...
Steve Wills
swills at FreeBSD.org
Mon Sep 28 20:10:07 UTC 2020
Author: swills
Date: Mon Sep 28 20:09:59 2020
New Revision: 550445
URL: https://svnweb.freebsd.org/changeset/ports/550445
Log:
telepathy ports: fix build with python 3
PR: 249549
PR: 249550
PR: 249570
PR: 249734
PR: 249735
PR: 249738
Approved by: desktop (tcberner)
Obtained from: ArchLinux, see Bugzilla PRs for details
Added:
head/net-im/telepathy-gabble/files/patch-tools_c-constants-gen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_glib-client-gen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_glib-client-marshaller-gen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_glib-errors-str-gen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_glib-ginterface-gen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_glib-gtypes-generator.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_glib-interfaces-gen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_gobject-foo.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_libglibcodegen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_libtpcodegen.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_make-release-mail.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_manager-file.py (contents, props changed)
head/net-im/telepathy-gabble/files/patch-tools_xincludator.py (contents, props changed)
head/net-im/telepathy-idle/files/
head/net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py (contents, props changed)
head/net-im/telepathy-idle/files/patch-tools_libglibcodegen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_c-constants-gen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_glib-client-gen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_glib-client-marshaller-gen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_glib-ginterface-gen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_glib-gtypes-generator.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_glib-interfaces-gen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_libglibcodegen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_libtpcodegen.py (contents, props changed)
head/net-im/telepathy-logger/files/patch-tools_xincludator.py (contents, props changed)
head/net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py (contents, props changed)
head/net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py (contents, props changed)
head/net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py (contents, props changed)
head/net-im/telepathy-salut/files/patch-tools_libglibcodegen.py (contents, props changed)
head/net-im/telepathy-salut/files/patch-tools_make-release-mail.py (contents, props changed)
Modified:
head/net-im/telepathy-gabble/Makefile (contents, props changed)
head/net-im/telepathy-gabble/distinfo (contents, props changed)
head/net-im/telepathy-gabble/files/patch-Makefile.in (contents, props changed)
head/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c (contents, props changed)
head/net-im/telepathy-glib/Makefile (contents, props changed)
head/net-im/telepathy-idle/Makefile (contents, props changed)
head/net-im/telepathy-logger/Makefile (contents, props changed)
head/net-im/telepathy-logger/files/patch-configure (contents, props changed)
head/net-im/telepathy-mission-control/Makefile (contents, props changed)
head/net-im/telepathy-mission-control/distinfo (contents, props changed)
head/net-im/telepathy-mission-control/pkg-plist (contents, props changed)
head/net-im/telepathy-salut/Makefile (contents, props changed)
head/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h (contents, props changed)
head/net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c (contents, props changed)
head/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c (contents, props changed)
head/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c (contents, props changed)
Modified: head/net-im/telepathy-gabble/Makefile
==============================================================================
--- head/net-im/telepathy-gabble/Makefile Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-gabble/Makefile Mon Sep 28 20:09:59 2020 (r550445)
@@ -28,7 +28,7 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
PORTSCOUT= limitw:1,even
-USES= alias gmake gnome libtool pathfix pkgconfig python:2.7,build \
+USES= alias gmake gnome libtool pathfix pkgconfig python:build \
shebangfix sqlite ssl
USE_GNOME= glib20 gtksourceview3 libxslt:build
GNU_CONFIGURE= yes
Modified: head/net-im/telepathy-gabble/distinfo
==============================================================================
--- head/net-im/telepathy-gabble/distinfo Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-gabble/distinfo Mon Sep 28 20:09:59 2020 (r550445)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1600948310
SHA256 (telepathy-gabble-0.18.3.tar.gz) = 8ec714607e9bcb8d5a3f44adf871e7b07d5db8e326e47536e74e09cba59989c2
SIZE (telepathy-gabble-0.18.3.tar.gz) = 2793195
Modified: head/net-im/telepathy-gabble/files/patch-Makefile.in
==============================================================================
--- head/net-im/telepathy-gabble/files/patch-Makefile.in Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-gabble/files/patch-Makefile.in Mon Sep 28 20:09:59 2020 (r550445)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2010-09-18 17:29:38.000000000 +0000
-+++ Makefile.in 2010-09-18 17:29:53.000000000 +0000
-@@ -267,7 +267,7 @@
+--- Makefile.in.orig 2020-09-24 11:51:08 UTC
++++ Makefile.in
+@@ -349,7 +349,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
Modified: head/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
==============================================================================
--- head/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c Mon Sep 28 20:09:59 2020 (r550445)
@@ -1,6 +1,6 @@
---- lib/gibber/gibber-unix-transport.c.orig 2010-06-09 16:09:58.000000000 +0000
-+++ lib/gibber/gibber-unix-transport.c 2010-09-18 21:24:44.000000000 +0000
-@@ -375,6 +375,167 @@ gibber_unix_transport_recv_credentials (
+--- lib/gibber/gibber-unix-transport.c.orig 2013-10-04 15:51:47 UTC
++++ lib/gibber/gibber-unix-transport.c
+@@ -374,6 +374,167 @@ gibber_unix_transport_recv_credentials (GibberUnixTran
return TRUE;
}
@@ -168,7 +168,7 @@
#else /* OSs where we have no implementation */
gboolean
-@@ -393,9 +554,7 @@ gibber_unix_transport_recv_credentials (
+@@ -392,9 +553,7 @@ gibber_unix_transport_recv_credentials (GibberUnixTran
}
gboolean
Added: head/net-im/telepathy-gabble/files/patch-tools_c-constants-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_c-constants-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,24 @@
+--- tools/c-constants-gen.py.orig 2014-05-07 14:28:43 UTC
++++ tools/c-constants-gen.py
+@@ -12,7 +12,7 @@ class Generator(object):
+ self.prefix = prefix + '_'
+ self.spec = get_by_path(dom, "spec")[0]
+
+- self.output_base = output_base
++ self.output_base = output_base
+ self.__header = []
+ self.__docs = []
+
+@@ -25,10 +25,10 @@ class Generator(object):
+ file_set_contents(self.output_base + '-gtk-doc.h', ''.join(self.__docs))
+
+ def write(self, code):
+- self.__header.append(code.encode('utf-8'))
++ self.__header.append(code)
+
+ def d(self, code):
+- self.__docs.append(code.encode('utf-8'))
++ self.__docs.append(code)
+
+ # Header
+ def do_header(self):
Added: head/net-im/telepathy-gabble/files/patch-tools_glib-client-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_glib-client-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,23 @@
+--- tools/glib-client-gen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/glib-client-gen.py
+@@ -74,17 +74,17 @@ class Generator(object):
+ self.guard = opts.get('--guard', None)
+
+ def h(self, s):
+- if isinstance(s, unicode):
++ if isinstance(s, str):
+ s = s.encode('utf-8')
+ self.__header.append(s)
+
+ def b(self, s):
+- if isinstance(s, unicode):
++ if isinstance(s, str):
+ s = s.encode('utf-8')
+ self.__body.append(s)
+
+ def d(self, s):
+- if isinstance(s, unicode):
++ if isinstance(s, str):
+ s = s.encode('utf-8')
+ self.__docs.append(s)
+
Added: head/net-im/telepathy-gabble/files/patch-tools_glib-client-marshaller-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_glib-client-marshaller-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,37 @@
+--- tools/glib-client-marshaller-gen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/glib-client-marshaller-gen.py
+@@ -31,23 +31,23 @@ 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 ('
+- print ' g_cclosure_marshal_generic,'
+- print ' G_TYPE_NONE, /* return */'
++ print(' dbus_g_object_register_marshaller (')
++ print(' g_cclosure_marshal_generic,')
++ 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):
Added: head/net-im/telepathy-gabble/files/patch-tools_glib-errors-str-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_glib-errors-str-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,23 @@
+--- tools/glib-errors-str-gen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/glib-errors-str-gen.py
+@@ -17,17 +17,17 @@ class Generator(object):
+ self.__docs = []
+
+ def h(self, s):
+- if isinstance(s, unicode):
++ if isinstance(s, str):
+ s = s.encode('utf-8')
+ self.__header.append(s)
+
+ def b(self, s):
+- if isinstance(s, unicode):
++ if isinstance(s, str):
+ s = s.encode('utf-8')
+ self.__body.append(s)
+
+ def d(self, s):
+- if isinstance(s, unicode):
++ if isinstance(s, str):
+ s = s.encode('utf-8')
+ self.__docs.append(s)
+
Added: head/net-im/telepathy-gabble/files/patch-tools_glib-ginterface-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_glib-ginterface-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,63 @@
+--- tools/glib-ginterface-gen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/glib-ginterface-gen.py
+@@ -27,7 +27,7 @@ import os.path
+ import xml.dom.minidom
+
+ from libtpcodegen import file_set_contents
+-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
++from libglibcodegen import Signature, type_to_gtype, \
+ NS_TP, dbus_gutils_wincaps_to_uscore
+
+
+@@ -85,18 +85,18 @@ class Generator(object):
+ self.allow_havoc = allow_havoc
+
+ def h(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
++ if isinstance(s, bytes):
++ s = str(s, 'ascii')
+ self.__header.append(s)
+
+ def b(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
++ if isinstance(s, bytes):
++ s = str(s, 'ascii')
+ self.__body.append(s)
+
+ def d(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
++ if isinstance(s, bytes):
++ s = str(s, 'ascii')
+ self.__docs.append(s)
+
+ def do_node(self, node):
+@@ -733,7 +733,7 @@ class Generator(object):
+
+ def __call__(self):
+ nodes = self.dom.getElementsByTagName('node')
+- nodes.sort(cmp_by_name)
++ nodes.sort(key=lambda node : node.getAttributeNode('name').nodeValue)
+
+ self.h('#include <glib-object.h>')
+ self.h('#include <dbus/dbus-glib.h>')
+@@ -766,7 +766,7 @@ class Generator(object):
+ file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
+
+ def cmdline_error():
+- print """\
++ print("""\
+ usage:
+ gen-ginterface [OPTIONS] xmlfile Prefix_
+ options:
+@@ -786,7 +786,7 @@ options:
+ void symbol (DBusGMethodInvocation *context)
+ and return some sort of "not implemented" error via
+ dbus_g_method_return_error (context, ...)
+-"""
++""")
+ sys.exit(1)
+
+
Added: head/net-im/telepathy-gabble/files/patch-tools_glib-gtypes-generator.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_glib-gtypes-generator.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,19 @@
+--- tools/glib-gtypes-generator.py.orig 2014-05-07 14:28:02 UTC
++++ tools/glib-gtypes-generator.py
+@@ -68,13 +68,13 @@ class GTypesGenerator(object):
+ self.need_other_arrays = {}
+
+ def h(self, code):
+- self.header.append(code.encode("utf-8"))
++ self.header.append(code)
+
+ def c(self, code):
+- self.body.append(code.encode("utf-8"))
++ self.body.append(code)
+
+ def d(self, code):
+- self.docs.append(code.encode('utf-8'))
++ self.docs.append(code)
+
+ def do_mapping_header(self, mapping):
+ members = mapping.getElementsByTagNameNS(NS_TP, 'member')
Added: head/net-im/telepathy-gabble/files/patch-tools_glib-interfaces-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_glib-interfaces-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,19 @@
+--- tools/glib-interfaces-gen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/glib-interfaces-gen.py
+@@ -24,13 +24,13 @@ class Generator(object):
+ self.spec = get_by_path(dom, "spec")[0]
+
+ def h(self, code):
+- self.decls.append(code.encode('utf-8'))
++ self.decls.append(code)
+
+ def c(self, code):
+- self.impls.append(code.encode('utf-8'))
++ self.impls.append(code)
+
+ def d(self, code):
+- self.docs.append(code.encode('utf-8'))
++ self.docs.append(code)
+
+ def __call__(self):
+ for f in self.h, self.c:
Added: head/net-im/telepathy-gabble/files/patch-tools_gobject-foo.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_gobject-foo.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,8 @@
+--- tools/gobject-foo.py.orig 2014-05-07 14:28:02 UTC
++++ tools/gobject-foo.py
+@@ -87,4 +87,4 @@ if __name__ == '__main__':
+
+ head, tail = argv
+
+- print '\n'.join(gobject_header(head, tail, as_interface=as_interface))
++ print('\n'.join(gobject_header(head, tail, as_interface=as_interface)))
Added: head/net-im/telepathy-gabble/files/patch-tools_libglibcodegen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_libglibcodegen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,25 @@
+--- tools/libglibcodegen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/libglibcodegen.py
+@@ -23,7 +23,6 @@ please make any changes there.
+
+ from libtpcodegen import NS_TP, \
+ Signature, \
+- cmp_by_name, \
+ escape_as_identifier, \
+ get_by_path, \
+ get_descendant_text, \
+@@ -154,7 +153,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)
+@@ -169,4 +168,4 @@ 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)
Added: head/net-im/telepathy-gabble/files/patch-tools_libtpcodegen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_libtpcodegen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,14 @@
+--- tools/libtpcodegen.py.orig 2014-05-07 14:28:02 UTC
++++ tools/libtpcodegen.py
+@@ -167,7 +167,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
+
Added: head/net-im/telepathy-gabble/files/patch-tools_make-release-mail.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_make-release-mail.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,39 @@
+--- tools/make-release-mail.py.orig 2013-10-09 23:29:36 UTC
++++ tools/make-release-mail.py
+@@ -28,8 +28,8 @@ def extract_description(package, version, news_path):
+ break
+
+ # Skip the ====== line, and the first blank line
+- lines.next()
+- lines.next()
++ next(lines)
++ next(lines)
+
+ got_release_name = False
+
+@@ -59,7 +59,7 @@ GIT_URL = 'http://cgit.freedesktop.org/telepathy'
+ 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
+@@ -73,14 +73,14 @@ git: %(git_url)s/%(package)s
+ 'version': version,
+ 'release_name': release_name,
+ 'details': details,
+- }
++ })
+
+ if __name__ == '__main__':
+ try:
+ package, version, news_path = sys.argv[1:]
+
+ main(package, version, news_path)
+- except ValueError, e:
++ except ValueError as e:
+ sys.stderr.write(
+ 'Usage: %s package-name package.version.number path/to/NEWS\n' %
+ sys.argv[0])
Added: head/net-im/telepathy-gabble/files/patch-tools_manager-file.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_manager-file.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,77 @@
+--- tools/manager-file.py.orig 2014-05-07 14:16:47 UTC
++++ tools/manager-file.py
+@@ -87,18 +87,18 @@ gflags = {
+
+ def write_manager(f, manager, protos):
+ # pointless backwards compat section
+- print >> f, '[ConnectionManager]'
+- print >> f, 'BusName=org.freedesktop.Telepathy.ConnectionManager.' + manager
+- print >> f, 'ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/' + manager
++ print('[ConnectionManager]', file=f)
++ print('BusName=org.freedesktop.Telepathy.ConnectionManager.' + manager, file=f)
++ print('ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/' + manager, file=f)
+
+ # protocols
+- for proto, params in protos.iteritems():
+- print >> f
+- print >> f, '[Protocol %s]' % proto
++ for proto, params in protos.items():
++ print(file=f)
++ print('[Protocol %s]' % proto, file=f)
+
+ defaults = {}
+
+- for param, info in params.iteritems():
++ for param, info in params.items():
+ dtype = info['dtype']
+ flags = info.get('flags', '').split()
+ struct_field = info.get('struct_field', param.replace('-', '_'))
+@@ -115,15 +115,15 @@ def write_manager(f, manager, protos):
+ else:
+ flags = ''
+
+- print >> f, 'param-%s=%s%s' % (param, desktop_string(dtype), flags)
++ print('param-%s=%s%s' % (param, desktop_string(dtype), flags), file=f)
+
+- for param, default in defaults.iteritems():
+- print >> f, 'default-%s=%s' % (param, default)
++ for param, default in defaults.items():
++ print('default-%s=%s' % (param, default), file=f)
+
+ def write_c_params(f, manager, proto, struct, params):
+- print >> f, "static const TpCMParamSpec %s_%s_params[] = {" % (manager, proto)
++ print("static const TpCMParamSpec %s_%s_params[] = {" % (manager, proto), file=f)
+
+- for param, info in params.iteritems():
++ for param, info in params.items():
+ dtype = info['dtype']
+ flags = info.get('flags', '').split()
+ struct_field = info.get('struct_field', param.replace('-', '_'))
+@@ -146,7 +146,7 @@ def write_c_params(f, manager, proto, struct, params):
+ else:
+ struct_offset = 'G_STRUCT_OFFSET (%s, %s)' % (struct, struct_field)
+
+- print >> f, (''' { %s, %s, %s,
++ print((''' { %s, %s, %s,
+ %s,
+ %s, /* default */
+ %s, /* struct offset */
+@@ -154,14 +154,14 @@ def write_c_params(f, manager, proto, struct, params):
+ %s, /* filter data */
+ %s /* setter data */ },''' %
+ (c_string(param), c_string(dtype), gtypes[dtype], flags,
+- default, struct_offset, filter, filter_data, setter_data))
++ default, struct_offset, filter, filter_data, setter_data)), file=f)
+
+- print >> f, " { NULL }"
+- print >> f, "};"
++ print(" { NULL }", file=f)
++ print("};", file=f)
+
+ if __name__ == '__main__':
+ environment = {}
+- execfile(sys.argv[1], environment)
++ exec(compile(open(sys.argv[1], "rb").read(), sys.argv[1], 'exec'), environment)
+
+ filename = '%s/%s.manager' % (sys.argv[2], environment['MANAGER'])
+ try:
Added: head/net-im/telepathy-gabble/files/patch-tools_xincludator.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-gabble/files/patch-tools_xincludator.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,32 @@
+--- tools/xincludator.py.orig 2014-05-07 14:28:02 UTC
++++ tools/xincludator.py
+@@ -1,17 +1,17 @@
+ #!/usr/bin/python
+
+ from sys import argv, stdout, stderr
+-import codecs, locale
+-import os
++import locale
++import os, sys
+ import xml.dom.minidom
+
+-stdout = codecs.getwriter('utf-8')(stdout)
++sys.stdout.reconfigure(encoding='utf-8')
+
+ NS_XI = 'http://www.w3.org/2001/XInclude'
+
+ def xincludate(dom, base, dropns = []):
+ remove_attrs = []
+- for i in xrange(dom.documentElement.attributes.length):
++ for i in range(dom.documentElement.attributes.length):
+ attr = dom.documentElement.attributes.item(i)
+ if attr.prefix == 'xmlns':
+ if attr.localName in dropns:
+@@ -35,5 +35,5 @@ if __name__ == '__main__':
+ dom = xml.dom.minidom.parse(argv[0])
+ xincludate(dom, argv[0])
+ xml = dom.toxml()
+- stdout.write(xml)
+- stdout.write('\n')
++ sys.stdout.write(xml)
++ sys.stdout.write('\n')
Modified: head/net-im/telepathy-glib/Makefile
==============================================================================
--- head/net-im/telepathy-glib/Makefile Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-glib/Makefile Mon Sep 28 20:09:59 2020 (r550445)
@@ -20,7 +20,7 @@ RUN_DEPENDS= vapigen:lang/vala
PORTSCOUT= limitw:1,even
-USES= gmake gnome libtool pathfix pkgconfig python:2.7,build
+USES= gmake gnome libtool pathfix pkgconfig python:build
USE_GNOME= glib20 introspection:build libxslt:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
Modified: head/net-im/telepathy-idle/Makefile
==============================================================================
--- head/net-im/telepathy-idle/Makefile Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-idle/Makefile Mon Sep 28 20:09:59 2020 (r550445)
@@ -14,7 +14,7 @@ COMMENT= IRC Connection Manager for Telepathy Framewor
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libtelepathy-glib.so:net-im/telepathy-glib
-USES= gmake gnome libtool pathfix pkgconfig python:2.7,build ssl
+USES= gmake gnome libtool pathfix pkgconfig python:build ssl
USE_GNOME= glib20 libxslt:build
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
Added: head/net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,56 @@
+--- tools/glib-ginterface-gen.py.orig 2020-09-28 19:59:50 UTC
++++ tools/glib-ginterface-gen.py
+@@ -22,6 +22,7 @@
+ # License along with this library; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
++import functools
+ import sys
+ import os.path
+ import xml.dom.minidom
+@@ -85,18 +86,12 @@ class Generator(object):
+ self.allow_havoc = allow_havoc
+
+ def h(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__header.append(s)
+
+ def b(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__body.append(s)
+
+ def d(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__docs.append(s)
+
+ def do_node(self, node):
+@@ -733,7 +728,7 @@ class Generator(object):
+
+ def __call__(self):
+ nodes = self.dom.getElementsByTagName('node')
+- nodes.sort(cmp_by_name)
++ nodes.sort(key=functools.cmp_to_key(cmp_by_name))
+
+ self.h('#include <glib-object.h>')
+ self.h('#include <dbus/dbus-glib.h>')
+@@ -768,7 +763,7 @@ class Generator(object):
+ file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
+
+ def cmdline_error():
+- print """\
++ print ("""\
+ usage:
+ gen-ginterface [OPTIONS] xmlfile Prefix_
+ options:
+@@ -788,7 +783,7 @@ options:
+ void symbol (DBusGMethodInvocation *context)
+ and return some sort of "not implemented" error via
+ dbus_g_method_return_error (context, ...)
+-"""
++""")
+ sys.exit(1)
+
+
Added: head/net-im/telepathy-idle/files/patch-tools_libglibcodegen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-idle/files/patch-tools_libglibcodegen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,17 @@
+--- tools/libglibcodegen.py.orig 2013-09-19 15:01:59 UTC
++++ tools/libglibcodegen.py
+@@ -154,7 +154,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)
+@@ -169,4 +169,4 @@ 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)
Modified: head/net-im/telepathy-logger/Makefile
==============================================================================
--- head/net-im/telepathy-logger/Makefile Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-logger/Makefile Mon Sep 28 20:09:59 2020 (r550445)
@@ -18,13 +18,14 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libtelepathy-glib.so:net-im/telepathy-glib
USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
- python:2.7,build sqlite tar:bzip2
+ python:build sqlite tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= glib20 intltool libxml2 \
libxslt:build introspection:build
GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml
INSTALL_TARGET= install-strip
+MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
post-patch:
@${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
Modified: head/net-im/telepathy-logger/files/patch-configure
==============================================================================
--- head/net-im/telepathy-logger/files/patch-configure Mon Sep 28 20:05:01 2020 (r550444)
+++ head/net-im/telepathy-logger/files/patch-configure Mon Sep 28 20:09:59 2020 (r550445)
@@ -1,6 +1,6 @@
---- configure.orig 2010-08-18 14:48:05.000000000 +0200
-+++ configure 2010-08-18 14:49:13.000000000 +0200
-@@ -13281,8 +13281,8 @@
+--- configure.orig 2015-04-30 11:32:10 UTC
++++ configure
+@@ -14348,8 +14348,8 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
Added: head/net-im/telepathy-logger/files/patch-tools_c-constants-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_c-constants-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,39 @@
+--- tools/c-constants-gen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/c-constants-gen.py
+@@ -3,7 +3,7 @@
+ from sys import argv, stdout, stderr
+ import xml.dom.minidom
+
+-from libtpcodegen import file_set_contents
++from libtpcodegen import file_set_contents, u
+ from libglibcodegen import NS_TP, get_docstring, \
+ get_descendant_text, get_by_path
+
+@@ -12,7 +12,7 @@ class Generator(object):
+ self.prefix = prefix + '_'
+ self.spec = get_by_path(dom, "spec")[0]
+
+- self.output_base = output_base
++ self.output_base = output_base
+ self.__header = []
+ self.__docs = []
+
+@@ -21,14 +21,14 @@ class Generator(object):
+ self.do_body()
+ self.do_footer()
+
+- file_set_contents(self.output_base + '.h', ''.join(self.__header))
+- file_set_contents(self.output_base + '-gtk-doc.h', ''.join(self.__docs))
++ file_set_contents(self.output_base + '.h', u('').join(self.__header).encode('utf-8'))
++ file_set_contents(self.output_base + '-gtk-doc.h', u('').join(self.__docs).encode('utf-8'))
+
+ def write(self, code):
+- self.__header.append(code.encode('utf-8'))
++ self.__header.append(code)
+
+ def d(self, code):
+- self.__docs.append(code.encode('utf-8'))
++ self.__docs.append(code)
+
+ # Header
+ def do_header(self):
Added: head/net-im/telepathy-logger/files/patch-tools_glib-client-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_glib-client-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,54 @@
+--- tools/glib-client-gen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/glib-client-gen.py
+@@ -27,8 +27,8 @@ import os.path
+ import xml.dom.minidom
+ from getopt import gnu_getopt
+
+-from libtpcodegen import file_set_contents
+-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
++from libtpcodegen import file_set_contents, key_by_name, u
++from libglibcodegen import Signature, type_to_gtype, \
+ get_docstring, xml_escape, get_deprecated
+
+
+@@ -74,18 +74,12 @@ class Generator(object):
+ self.guard = opts.get('--guard', None)
+
+ def h(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__header.append(s)
+
+ def b(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__body.append(s)
+
+ def d(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__docs.append(s)
+
+ def get_iface_quark(self):
+@@ -1187,7 +1181,7 @@ class Generator(object):
+ self.b('')
+
+ nodes = self.dom.getElementsByTagName('node')
+- nodes.sort(cmp_by_name)
++ nodes.sort(key=key_by_name)
+
+ for node in nodes:
+ self.do_interface(node)
+@@ -1240,9 +1234,9 @@ class Generator(object):
+ self.h('#endif /* defined (%s) */' % self.guard)
+ self.h('')
+
+- file_set_contents(self.basename + '.h', '\n'.join(self.__header))
+- file_set_contents(self.basename + '-body.h', '\n'.join(self.__body))
+- file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
++ file_set_contents(self.basename + '.h', u('\n').join(self.__header).encode('utf-8'))
++ file_set_contents(self.basename + '-body.h', u('\n').join(self.__body).encode('utf-8'))
++ file_set_contents(self.basename + '-gtk-doc.h', u('\n').join(self.__docs).encode('utf-8'))
+
+ def types_to_gtypes(types):
+ return [type_to_gtype(t)[1] for t in types]
Added: head/net-im/telepathy-logger/files/patch-tools_glib-client-marshaller-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_glib-client-marshaller-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,36 @@
+--- tools/glib-client-marshaller-gen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/glib-client-marshaller-gen.py
+@@ -31,23 +31,23 @@ 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 = list(self.marshallers.keys())
+ all.sort()
+ for marshaller in all:
+ rhs = self.marshallers[marshaller]
+
+- print ' dbus_g_object_register_marshaller ('
+- print ' g_cclosure_marshal_generic,'
+- print ' G_TYPE_NONE, /* return */'
++ print(' dbus_g_object_register_marshaller (')
++ print(' g_cclosure_marshal_generic,')
++ 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):
Added: head/net-im/telepathy-logger/files/patch-tools_glib-ginterface-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_glib-ginterface-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,67 @@
+--- tools/glib-ginterface-gen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/glib-ginterface-gen.py
+@@ -26,8 +26,8 @@ import sys
+ import os.path
+ import xml.dom.minidom
+
+-from libtpcodegen import file_set_contents
+-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
++from libtpcodegen import file_set_contents, key_by_name, u
++from libglibcodegen import Signature, type_to_gtype, \
+ NS_TP, dbus_gutils_wincaps_to_uscore
+
+
+@@ -85,18 +85,12 @@ class Generator(object):
+ self.allow_havoc = allow_havoc
+
+ def h(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__header.append(s)
+
+ def b(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__body.append(s)
+
+ def d(self, s):
+- if isinstance(s, unicode):
+- s = s.encode('utf-8')
+ self.__docs.append(s)
+
+ def do_node(self, node):
+@@ -733,7 +727,7 @@ class Generator(object):
+
+ def __call__(self):
+ nodes = self.dom.getElementsByTagName('node')
+- nodes.sort(cmp_by_name)
++ nodes.sort(key=key_by_name)
+
+ self.h('#include <glib-object.h>')
+ self.h('#include <dbus/dbus-glib.h>')
+@@ -763,12 +757,12 @@ class Generator(object):
+
+ self.h('')
+ self.b('')
+- file_set_contents(self.basename + '.h', '\n'.join(self.__header))
+- file_set_contents(self.basename + '.c', '\n'.join(self.__body))
+- file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs))
++ file_set_contents(self.basename + '.h', u('\n').join(self.__header).encode('utf-8'))
++ file_set_contents(self.basename + '.c', u('\n').join(self.__body).encode('utf-8'))
++ file_set_contents(self.basename + '-gtk-doc.h', u('\n').join(self.__docs).encode('utf-8'))
+
+ def cmdline_error():
+- print """\
++ print("""\
+ usage:
+ gen-ginterface [OPTIONS] xmlfile Prefix_
+ options:
+@@ -788,7 +782,7 @@ options:
+ void symbol (DBusGMethodInvocation *context)
+ and return some sort of "not implemented" error via
+ dbus_g_method_return_error (context, ...)
+-"""
++""")
+ sys.exit(1)
+
+
Added: head/net-im/telepathy-logger/files/patch-tools_glib-gtypes-generator.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_glib-gtypes-generator.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,41 @@
+--- tools/glib-gtypes-generator.py.orig 2020-09-23 16:17:54 UTC
++++ tools/glib-gtypes-generator.py
+@@ -23,7 +23,7 @@
+ import sys
+ import xml.dom.minidom
+
+-from libtpcodegen import file_set_contents
++from libtpcodegen import file_set_contents, u
+ from libglibcodegen import escape_as_identifier, \
+ get_docstring, \
+ NS_TP, \
+@@ -68,13 +68,13 @@ class GTypesGenerator(object):
+ self.need_other_arrays = {}
+
+ def h(self, code):
+- self.header.append(code.encode("utf-8"))
++ self.header.append(code)
+
+ def c(self, code):
+- self.body.append(code.encode("utf-8"))
++ self.body.append(code)
+
+ def d(self, code):
+- self.docs.append(code.encode('utf-8'))
++ self.docs.append(code)
+
+ def do_mapping_header(self, mapping):
+ members = mapping.getElementsByTagNameNS(NS_TP, 'member')
+@@ -292,9 +292,9 @@ class GTypesGenerator(object):
+ self.c(' return t;\n')
+ self.c('}\n\n')
+
+- file_set_contents(self.output + '.h', ''.join(self.header))
+- file_set_contents(self.output + '-body.h', ''.join(self.body))
+- file_set_contents(self.output + '-gtk-doc.h', ''.join(self.docs))
++ file_set_contents(self.output + '.h', u('').join(self.header).encode('utf-8'))
++ file_set_contents(self.output + '-body.h', u('').join(self.body).encode('utf-8'))
++ file_set_contents(self.output + '-gtk-doc.h', u('').join(self.docs).encode('utf-8'))
+
+ if __name__ == '__main__':
+ argv = sys.argv[1:]
Added: head/net-im/telepathy-logger/files/patch-tools_glib-interfaces-gen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_glib-interfaces-gen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,40 @@
+--- tools/glib-interfaces-gen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/glib-interfaces-gen.py
+@@ -3,7 +3,7 @@
+ from sys import argv, stdout, stderr
+ import xml.dom.minidom
+
+-from libtpcodegen import file_set_contents
++from libtpcodegen import file_set_contents, u
+ from libglibcodegen import NS_TP, get_docstring, \
+ get_descendant_text, get_by_path
+
+@@ -24,22 +24,22 @@ class Generator(object):
+ self.spec = get_by_path(dom, "spec")[0]
+
+ def h(self, code):
+- self.decls.append(code.encode('utf-8'))
++ self.decls.append(code)
+
+ def c(self, code):
+- self.impls.append(code.encode('utf-8'))
++ self.impls.append(code)
+
+ def d(self, code):
+- self.docs.append(code.encode('utf-8'))
++ self.docs.append(code)
+
+ def __call__(self):
+ for f in self.h, self.c:
+ self.do_header(f)
+ self.do_body()
+
+- file_set_contents(self.implfile, ''.join(self.impls))
+- file_set_contents(self.declfile, ''.join(self.decls))
+- file_set_contents(self.docfile, ''.join(self.docs))
++ file_set_contents(self.implfile, u('').join(self.impls).encode('utf-8'))
++ file_set_contents(self.declfile, u('').join(self.decls).encode('utf-8'))
++ file_set_contents(self.docfile, u('').join(self.docs).encode('utf-8'))
+
+ # Header
+ def do_header(self, f):
Added: head/net-im/telepathy-logger/files/patch-tools_libglibcodegen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_libglibcodegen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,17 @@
+--- tools/libglibcodegen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/libglibcodegen.py
+@@ -154,7 +154,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)
+@@ -169,4 +169,4 @@ 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)
Added: head/net-im/telepathy-logger/files/patch-tools_libtpcodegen.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telepathy-logger/files/patch-tools_libtpcodegen.py Mon Sep 28 20:09:59 2020 (r550445)
@@ -0,0 +1,58 @@
+--- tools/libtpcodegen.py.orig 2020-09-23 16:17:54 UTC
++++ tools/libtpcodegen.py
+@@ -21,6 +21,7 @@ please make any changes there.
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ import os
++import sys
+ from string import ascii_letters, digits
+
+
+@@ -28,6 +29,20 @@ NS_TP = "http://telepathy.freedesktop.org/wiki/DbusSpe
+
+ _ASCII_ALNUM = ascii_letters + digits
+
++if sys.version_info[0] >= 3:
++ def u(s):
++ """Return s, which must be a str literal with no non-ASCII characters.
++ This is like a more restricted form of the Python 2 u'' syntax.
++ """
++ return s.encode('ascii').decode('ascii')
++else:
++ def u(s):
++ """Return a Unicode version of s, which must be a str literal
++ (a bytestring) in which each byte is an ASCII character.
++ This is like a more restricted form of the u'' syntax.
++ """
++ return s.decode('ascii')
++
+ def file_set_contents(filename, contents):
+ try:
+ os.remove(filename)
+@@ -38,13 +53,15 @@ def file_set_contents(filename, contents):
+ except OSError:
+ pass
+
+- open(filename + '.tmp', 'w').write(contents)
++ open(filename + '.tmp', 'wb').write(contents)
+ os.rename(filename + '.tmp', filename)
+
+ def cmp_by_name(node1, node2):
+ return cmp(node1.getAttributeNode("name").nodeValue,
+ node2.getAttributeNode("name").nodeValue)
+
++def key_by_name(node):
++ return node.getAttributeNode("name").nodeValue
+
+ def escape_as_identifier(identifier):
+ """Escape the given string to be a valid D-Bus object path or service
+@@ -168,6 +185,9 @@ class _SignatureIter:
+ self.remaining = string
+
+ def next(self):
++ return self.__next__()
++
++ def __next__(self):
+ if self.remaining == '':
+ raise StopIteration
+
Added: head/net-im/telepathy-logger/files/patch-tools_xincludator.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list