FreeBSD Bugzilla – Attachment 218383 Details for
Bug 249738
net-im/telepathy-salut: depends on python 2.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to fix build with python 3
telepathy-salut-python3-rev0.diff (text/plain), 11.94 KB, created by
Steve Wills
on 2020-09-28 19:51:38 UTC
(
hide
)
Description:
patch to fix build with python 3
Filename:
MIME Type:
Creator:
Steve Wills
Created:
2020-09-28 19:51:38 UTC
Size:
11.94 KB
patch
obsolete
>diff --git net-im/telepathy-salut/Makefile net-im/telepathy-salut/Makefile >index 886cec4e1e59..dedad1ed1847 100644 >--- net-im/telepathy-salut/Makefile >+++ net-im/telepathy-salut/Makefile >@@ -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 >diff --git net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h >index 22af230b175d..d2f8cdb47b0f 100644 >--- net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h >+++ net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h >@@ -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__ >diff --git net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c >index 4d69b0f5585a..978ca8f3e348 100644 >--- net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c >+++ net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c >@@ -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 > */ >diff --git net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c >index 5711d4b293db..f51056643ee7 100644 >--- net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c >+++ net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c >@@ -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> >diff --git net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c >index 4eb7a48494ea..7845fd0cd6dc 100644 >--- net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c >+++ net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c >@@ -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; >diff --git net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py >new file mode 100644 >index 000000000000..69cfb895c0cb >--- /dev/null >+++ net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py >@@ -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): >diff --git net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py >new file mode 100644 >index 000000000000..0ac13ef86397 >--- /dev/null >+++ net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py >@@ -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) >+ >+ >diff --git net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py >new file mode 100644 >index 000000000000..8030597fbaae >--- /dev/null >+++ net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py >@@ -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:] >diff --git net-im/telepathy-salut/files/patch-tools_libglibcodegen.py net-im/telepathy-salut/files/patch-tools_libglibcodegen.py >new file mode 100644 >index 000000000000..6d37d66dd906 >--- /dev/null >+++ net-im/telepathy-salut/files/patch-tools_libglibcodegen.py >@@ -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): >diff --git net-im/telepathy-salut/files/patch-tools_make-release-mail.py net-im/telepathy-salut/files/patch-tools_make-release-mail.py >new file mode 100644 >index 000000000000..f6658b1f6b8f >--- /dev/null >+++ net-im/telepathy-salut/files/patch-tools_make-release-mail.py >@@ -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,
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 249738
: 218383