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

net-im/telepathy-farstream: fix with python 3

Browse Source 
PR:		247333
Submitted by:	swills
This commit is contained in:
Tobias C. Berner 2020-08-02 15:43:28 +00:00
parent f1a645e1bf
commit 69c95aeba9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=543971
4 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net-im/telepathy-farstream/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= telepathy-farstream
PORTVERSION= 0.6.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@ -18,7 +18,7 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libtelepathy-glib.so:net-im/telepathy-glib \
libfarstream-0.2.so:net-im/farstream
USES= gmake gnome libtool localbase:ldflags pathfix pkgconfig python:2.7
USES= gmake gnome libtool localbase:ldflags pathfix pkgconfig python
USE_GNOME= glib20 libxslt:build introspection:build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes

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

@ -0,0 +1,33 @@
--- tools/glib-client-marshaller-gen.py.orig 2020-06-17 05:49:16 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()
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):

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

@ -0,0 +1,19 @@
--- tools/glib-ginterface-gen.py.orig 2020-06-17 05:47:06 UTC
+++ tools/glib-ginterface-gen.py
@@ -748,7 +748,7 @@ class Generator(object):
def cmdline_error():
- print """\
+ print("""\
usage:
gen-ginterface [OPTIONS] xmlfile Prefix_
options:
@@ -769,6 +769,7 @@ options:
and return some sort of "not implemented" error via
dbus_g_method_return_error (context, ...)
"""
+)
sys.exit(1)

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

@ -0,0 +1,17 @@
--- tools/libglibcodegen.py.orig 2020-06-17 05:45:14 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)