Date: Sun, 2 Aug 2020 15:43:29 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543971 - in head/net-im/telepathy-farstream: . files Message-ID: <202008021543.072FhTbO071839@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Aug 2 15:43:28 2020 New Revision: 543971 URL: https://svnweb.freebsd.org/changeset/ports/543971 Log: net-im/telepathy-farstream: fix with python 3 PR: 247333 Submitted by: swills Added: head/net-im/telepathy-farstream/files/ head/net-im/telepathy-farstream/files/patch-tools_glib-client-marshaller-gen.py (contents, props changed) head/net-im/telepathy-farstream/files/patch-tools_glib-ginterface-gen.py (contents, props changed) head/net-im/telepathy-farstream/files/patch-tools_libglibcodegen.py (contents, props changed) Modified: head/net-im/telepathy-farstream/Makefile Modified: head/net-im/telepathy-farstream/Makefile ============================================================================== --- head/net-im/telepathy-farstream/Makefile Sun Aug 2 15:25:37 2020 (r543970) +++ head/net-im/telepathy-farstream/Makefile Sun Aug 2 15:43:28 2020 (r543971) @@ -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 Added: head/net-im/telepathy-farstream/files/patch-tools_glib-client-marshaller-gen.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telepathy-farstream/files/patch-tools_glib-client-marshaller-gen.py Sun Aug 2 15:43:28 2020 (r543971) @@ -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): Added: head/net-im/telepathy-farstream/files/patch-tools_glib-ginterface-gen.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telepathy-farstream/files/patch-tools_glib-ginterface-gen.py Sun Aug 2 15:43:28 2020 (r543971) @@ -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) + + Added: head/net-im/telepathy-farstream/files/patch-tools_libglibcodegen.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telepathy-farstream/files/patch-tools_libglibcodegen.py Sun Aug 2 15:43:28 2020 (r543971) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008021543.072FhTbO071839>