cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

telepathy ports: fix build with python 3

Browse Source 
PR:		249549
PR:		249550
PR:		249570
PR:		249734
PR:		249735
PR:		249738
Approved by:	desktop (tcberner)
Obtained from:	ArchLinux, see Bugzilla PRs for details
This commit is contained in:
Steve Wills 2020-09-28 20:09:59 +00:00
parent acd1ae3a87
commit b90364b34f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=550445
45 changed files with 1075 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-im/telepathy-gabble/Makefile
View File

@ -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

1
net-im/telepathy-gabble/distinfo
View File

@ -1,2 +1,3 @@
TIMESTAMP = 1600948310
SHA256 (telepathy-gabble-0.18.3.tar.gz) = 8ec714607e9bcb8d5a3f44adf871e7b07d5db8e326e47536e74e09cba59989c2
SIZE (telepathy-gabble-0.18.3.tar.gz) = 2793195

6
net-im/telepathy-gabble/files/patch-Makefile.in
View File

@ -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

8
net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
View File

@ -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

24
net-im/telepathy-gabble/files/patch-tools_c-constants-gen.py Normal file
View File

@ -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):

23
net-im/telepathy-gabble/files/patch-tools_glib-client-gen.py Normal file
View File

@ -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)

37
net-im/telepathy-gabble/files/patch-tools_glib-client-marshaller-gen.py Normal file
View File

@ -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):

23
net-im/telepathy-gabble/files/patch-tools_glib-errors-str-gen.py Normal file
View File

@ -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)

63
net-im/telepathy-gabble/files/patch-tools_glib-ginterface-gen.py Normal file
View File

@ -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)

19
net-im/telepathy-gabble/files/patch-tools_glib-gtypes-generator.py Normal file
View File

@ -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')

19
net-im/telepathy-gabble/files/patch-tools_glib-interfaces-gen.py Normal file
View File

@ -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:

8
net-im/telepathy-gabble/files/patch-tools_gobject-foo.py Normal file
View File

@ -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)))

25
net-im/telepathy-gabble/files/patch-tools_libglibcodegen.py Normal file
View File

@ -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)

14
net-im/telepathy-gabble/files/patch-tools_libtpcodegen.py Normal file
View File

@ -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

39
net-im/telepathy-gabble/files/patch-tools_make-release-mail.py Normal file
View File

@ -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])

77
net-im/telepathy-gabble/files/patch-tools_manager-file.py Normal file
View File

@ -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:

32
net-im/telepathy-gabble/files/patch-tools_xincludator.py Normal file
View File

@ -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')

2
net-im/telepathy-glib/Makefile
View File

@ -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

2
net-im/telepathy-idle/Makefile
View File

@ -14,7 +14,7 @@ COMMENT= IRC Connection Manager for Telepathy Framework
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

56
net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py Normal file
View File

@ -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)

17
net-im/telepathy-idle/files/patch-tools_libglibcodegen.py Normal file
View File

@ -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)

3
net-im/telepathy-logger/Makefile
View File

@ -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' \

6
net-im/telepathy-logger/files/patch-configure
View File

@ -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 = \

39
net-im/telepathy-logger/files/patch-tools_c-constants-gen.py Normal file
View File

@ -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):

54
net-im/telepathy-logger/files/patch-tools_glib-client-gen.py Normal file
View File

@ -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]

36
net-im/telepathy-logger/files/patch-tools_glib-client-marshaller-gen.py Normal file
View File

@ -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):

67
net-im/telepathy-logger/files/patch-tools_glib-ginterface-gen.py Normal file
View File

@ -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)

41
net-im/telepathy-logger/files/patch-tools_glib-gtypes-generator.py Normal file
View File

@ -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:]

40
net-im/telepathy-logger/files/patch-tools_glib-interfaces-gen.py Normal file
View File

@ -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):

17
net-im/telepathy-logger/files/patch-tools_libglibcodegen.py Normal file
View File

@ -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)

58
net-im/telepathy-logger/files/patch-tools_libtpcodegen.py Normal file
View File

@ -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

37
net-im/telepathy-logger/files/patch-tools_xincludator.py Normal file
View File

@ -0,0 +1,37 @@
--- tools/xincludator.py.orig 2020-09-23 16:17:54 UTC
+++ tools/xincludator.py
@@ -1,17 +1,19 @@
#!/usr/bin/env python
+import sys
from sys import argv, stdout, stderr
import codecs, locale
import os
import xml.dom.minidom
-stdout = codecs.getwriter('utf-8')(stdout)
+if sys.version_info[0] < 3:
+ stdout = codecs.getwriter('utf-8')(stdout)
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:
@@ -34,6 +36,11 @@ if __name__ == '__main__':
argv = argv[1:]
dom = xml.dom.minidom.parse(argv[0])
xincludate(dom, argv[0])
- xml = dom.toxml()
+
+ if sys.version_info[0] >= 3:
+ xml = dom.toxml(encoding=None)
+ else:
+ xml = dom.toxml()
+
stdout.write(xml)
stdout.write('\n')

10
net-im/telepathy-mission-control/Makefile
View File

@ -3,18 +3,18 @@
# $MCom: ports/trunk/net-im/telepathy-mission-control/Makefile 19955 2014-10-15 10:15:00Z gusi $
PORTNAME= telepathy-mission-control
PORTVERSION= 5.16.3
PORTREVISION= 1
PORTVERSION= 5.16.6
CATEGORIES= net-im devel
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Telepathy component to apps to abstract details of connection managers
LIB_DEPENDS= libtelepathy.so:net-im/libtelepathy \
libdbus-glib-1.so:devel/dbus-glib
LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib \
libdbus-glib-1.so:devel/dbus-glib \
libdbus-1.so:devel/dbus
USES= gmake gnome libtool pathfix pkgconfig python:2.7,build
USES= gmake gnome libtool pathfix pkgconfig python:build
USE_GNOME= glib20 libxslt
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include

5
net-im/telepathy-mission-control/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (telepathy-mission-control-5.16.3.tar.gz) = 71575d2ff8aa7337aca355e3d921eba5cd2ff050fabc01e51577343093e98b7d
SIZE (telepathy-mission-control-5.16.3.tar.gz) = 1096019
TIMESTAMP = 1600879605
SHA256 (telepathy-mission-control-5.16.6.tar.gz) = 2df8ae3995e919a7670e01aa3568215ef0777e34961ace1cac1c6477cb297a45
SIZE (telepathy-mission-control-5.16.6.tar.gz) = 1127785

46
net-im/telepathy-mission-control/pkg-plist
View File

@ -20,27 +20,29 @@ libexec/mission-control-5
man/man1/mc-tool.1.gz
man/man1/mc-wait-for-name.1.gz
man/man8/mission-control-5.8.gz
share/doc/telepathy-mission-control/mission-control-plugins/McpAccountManager.html
share/doc/telepathy-mission-control/mission-control-plugins/McpDispatchOperation.html
share/doc/telepathy-mission-control/mission-control-plugins/McpRequest.html
share/doc/telepathy-mission-control/mission-control-plugins/annotation-glossary.html
share/doc/telepathy-mission-control/mission-control-plugins/api-index-full.html
share/doc/telepathy-mission-control/mission-control-plugins/ch01.html
share/doc/telepathy-mission-control/mission-control-plugins/ch02.html
share/doc/telepathy-mission-control/mission-control-plugins/ch03.html
share/doc/telepathy-mission-control/mission-control-plugins/ch04.html
share/doc/telepathy-mission-control/mission-control-plugins/home.png
share/doc/telepathy-mission-control/mission-control-plugins/index.html
share/doc/telepathy-mission-control/mission-control-plugins/index.sgml
share/doc/telepathy-mission-control/mission-control-plugins/left.png
share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpAccountStorage.html
share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpDispatchOperationPolicy.html
share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpRequestPolicy.html
share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins.devhelp2
share/doc/telepathy-mission-control/mission-control-plugins/object-tree.html
share/doc/telepathy-mission-control/mission-control-plugins/right.png
share/doc/telepathy-mission-control/mission-control-plugins/style.css
share/doc/telepathy-mission-control/mission-control-plugins/up.png
%%DOCSDIR%%/mission-control-plugins/McpAccountManager.html
%%DOCSDIR%%/mission-control-plugins/McpDispatchOperation.html
%%DOCSDIR%%/mission-control-plugins/McpDispatchOperationPolicy.html
%%DOCSDIR%%/mission-control-plugins/McpRequest.html
%%DOCSDIR%%/mission-control-plugins/McpRequestPolicy.html
%%DOCSDIR%%/mission-control-plugins/annotation-glossary.html
%%DOCSDIR%%/mission-control-plugins/api-index-full.html
%%DOCSDIR%%/mission-control-plugins/ch01.html
%%DOCSDIR%%/mission-control-plugins/ch02.html
%%DOCSDIR%%/mission-control-plugins/ch03.html
%%DOCSDIR%%/mission-control-plugins/ch04.html
%%DOCSDIR%%/mission-control-plugins/home.png
%%DOCSDIR%%/mission-control-plugins/index.html
%%DOCSDIR%%/mission-control-plugins/left-insensitive.png
%%DOCSDIR%%/mission-control-plugins/left.png
%%DOCSDIR%%/mission-control-plugins/mission-control-plugins-McpAccountStorage.html
%%DOCSDIR%%/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
%%DOCSDIR%%/mission-control-plugins/mission-control-plugins.devhelp2
%%DOCSDIR%%/mission-control-plugins/object-tree.html
%%DOCSDIR%%/mission-control-plugins/right-insensitive.png
%%DOCSDIR%%/mission-control-plugins/right.png
%%DOCSDIR%%/mission-control-plugins/style.css
%%DOCSDIR%%/mission-control-plugins/up-insensitive.png
%%DOCSDIR%%/mission-control-plugins/up.png
share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service

2
net-im/telepathy-salut/Makefile
View File

@ -19,7 +19,7 @@ LIB_DEPENDS= libavahi-glib.so:net/avahi-app \
libsoup-2.4.so:devel/libsoup
GNU_CONFIGURE= yes
USES= gmake gnome libtool pathfix pkgconfig python:2.7,build sqlite ssl
USES= gmake gnome libtool pathfix pkgconfig python:build sqlite ssl
USE_GNOME= glib20 libxslt:build
CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no
LDFLAGS+= -lpthread

4
net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
View File

@ -1,5 +1,5 @@
--- lib/gibber/gibber-bytestream-oob.h.orig 2010-05-20 06:10:39.000000000 -0400
+++ lib/gibber/gibber-bytestream-oob.h 2010-07-24 20:41:19.000000000 -0400
--- lib/gibber/gibber-bytestream-oob.h.orig 2010-10-22 15:15:56 UTC
+++ lib/gibber/gibber-bytestream-oob.h
@@ -20,6 +20,7 @@
#ifndef __GIBBER_BYTESTREAM_OOB_H__
#define __GIBBER_BYTESTREAM_OOB_H__

4
net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c
View File

@ -1,5 +1,5 @@
--- lib/gibber/gibber-muc-connection.c.orig Sun Jun 24 15:48:48 2007
+++ lib/gibber/gibber-muc-connection.c Sun Jun 24 15:49:19 2007
--- lib/gibber/gibber-muc-connection.c.orig 2012-11-12 14:13:18 UTC
+++ lib/gibber/gibber-muc-connection.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

4
net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
View File

@ -1,5 +1,5 @@
--- lib/gibber/gibber-tcp-transport.c.orig 2010-05-20 06:10:39.000000000 -0400
+++ lib/gibber/gibber-tcp-transport.c 2010-07-24 20:42:16.000000000 -0400
--- lib/gibber/gibber-tcp-transport.c.orig 2010-10-22 15:15:56 UTC
+++ lib/gibber/gibber-tcp-transport.c
@@ -20,6 +20,7 @@
#include <config.h>

29
net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
View File

@ -1,6 +1,6 @@
--- lib/gibber/gibber-unix-transport.c.orig 2010-05-20 06:10:39.000000000 -0400
+++ lib/gibber/gibber-unix-transport.c 2010-07-24 20:47:17.000000000 -0400
@@ -217,11 +217,12 @@ gibber_unix_transport_send_credentials (
--- lib/gibber/gibber-unix-transport.c.orig 2010-10-22 15:15:56 UTC
+++ lib/gibber/gibber-unix-transport.c
@@ -217,11 +217,12 @@ gibber_unix_transport_send_credentials (GibberUnixTran
gsize size)
{
int fd, ret;
@ -16,7 +16,7 @@
DEBUG ("send credentials");
fd = GIBBER_FD_TRANSPORT (transport)->fd;
@@ -234,20 +235,14 @@ gibber_unix_transport_send_credentials (
@@ -234,21 +235,15 @@ gibber_unix_transport_send_credentials (GibberUnixTran
memset (&msg, 0, sizeof (msg));
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
@ -31,18 +31,19 @@
- ch->cmsg_len = CMSG_LEN (sizeof (struct ucred));
- ch->cmsg_level = SOL_SOCKET;
- ch->cmsg_type = SCM_CREDENTIALS;
-
- cred = (struct ucred *) CMSG_DATA (ch);
- cred->pid = getpid ();
- cred->uid = getuid ();
- cred->gid = getgid ();
+ buffer.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ buffer.hdr.cmsg_level = SOL_SOCKET;
+ buffer.hdr.cmsg_type = SCM_CREDS;
- cred = (struct ucred *) CMSG_DATA (ch);
- cred->pid = getpid ();
- cred->uid = getuid ();
- cred->gid = getgid ();
-
ret = sendmsg (fd, &msg, 0);
if (ret == -1)
@@ -274,10 +269,10 @@ gibber_unix_transport_read (GibberFdTran
{
@@ -274,10 +269,10 @@ gibber_unix_transport_read (GibberFdTransport *transpo
GibberBuffer buf;
struct iovec iov;
struct msghdr msg;
@ -57,7 +58,7 @@
if (priv->recv_creds_cb == NULL)
return gibber_fd_transport_read (transport, channel, error);
@@ -285,10 +280,6 @@ gibber_unix_transport_read (GibberFdTran
@@ -285,10 +280,6 @@ gibber_unix_transport_read (GibberFdTransport *transpo
/* We are waiting for credentials */
fd = transport->fd;
@ -68,7 +69,7 @@
memset (buffer, 0, sizeof (buffer));
memset (&iov, 0, sizeof (iov));
iov.iov_base = buffer;
@@ -297,8 +288,9 @@ gibber_unix_transport_read (GibberFdTran
@@ -297,8 +288,9 @@ gibber_unix_transport_read (GibberFdTransport *transpo
memset (&msg, 0, sizeof (msg));
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
@ -80,7 +81,7 @@
bytes_read = recvmsg (fd, &msg, 0);
@@ -317,16 +309,11 @@ gibber_unix_transport_read (GibberFdTran
@@ -317,16 +309,11 @@ gibber_unix_transport_read (GibberFdTransport *transpo
return GIBBER_FD_IO_RESULT_ERROR;
}
@ -98,7 +99,7 @@
{
GError *err = NULL;
@@ -342,11 +329,12 @@ gibber_unix_transport_read (GibberFdTran
@@ -342,11 +329,12 @@ gibber_unix_transport_read (GibberFdTransport *transpo
else
{
GibberCredentials credentials;

35
net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py Normal file
View File

@ -0,0 +1,35 @@
--- tools/glib-client-marshaller-gen.py.orig 2011-08-16 11:04:41 UTC
+++ tools/glib-client-marshaller-gen.py
@@ -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):

38
net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py Normal file
View File

@ -0,0 +1,38 @@
--- tools/glib-ginterface-gen.py.orig 2011-08-16 11:04:41 UTC
+++ tools/glib-ginterface-gen.py
@@ -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)

16
net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py Normal file
View File

@ -0,0 +1,16 @@
--- tools/glib-signals-marshal-gen.py.orig 2011-08-16 11:04:41 UTC
+++ tools/glib-signals-marshal-gen.py
@@ -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:]

32
net-im/telepathy-salut/files/patch-tools_libglibcodegen.py Normal file
View File

@ -0,0 +1,32 @@
--- tools/libglibcodegen.py.orig 2011-07-07 15:24:48 UTC
+++ tools/libglibcodegen.py
@@ -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):

19
net-im/telepathy-salut/files/patch-tools_make-release-mail.py Normal file
View File

@ -0,0 +1,19 @@
--- tools/make-release-mail.py.orig 2012-11-12 14:13:18 UTC
+++ tools/make-release-mail.py
@@ -50,14 +50,14 @@ 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
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,