diff --git net-im/telepathy-idle/Makefile net-im/telepathy-idle/Makefile index d123a04adf4d..fcdacd6d7349 100644 --- net-im/telepathy-idle/Makefile +++ net-im/telepathy-idle/Makefile @@ -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 diff --git net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py new file mode 100644 index 000000000000..39816830d2a4 --- /dev/null +++ net-im/telepathy-idle/files/patch-tools_glib-ginterface-gen.py @@ -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 ') + self.h('#include ') +@@ -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) + + diff --git net-im/telepathy-idle/files/patch-tools_libglibcodegen.py net-im/telepathy-idle/files/patch-tools_libglibcodegen.py new file mode 100644 index 000000000000..2765534f85db --- /dev/null +++ net-im/telepathy-idle/files/patch-tools_libglibcodegen.py @@ -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)