mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
Remove telepathy-logger, nothing uses it anymore and it does not build with
llvm 22.
This commit is contained in:
ajacoutot
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
|
|||||||
DISTFILES =
|
DISTFILES =
|
||||||
|
|
||||||
# API.rev
|
# API.rev
|
||||||
PKGNAME = quirks-7.201
|
PKGNAME = quirks-7.202
|
||||||
PKG_ARCH = *
|
PKG_ARCH = *
|
||||||
MAINTAINER = Marc Espie <espie@openbsd.org>
|
MAINTAINER = Marc Espie <espie@openbsd.org>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#! /usr/bin/perl
|
#! /usr/bin/perl
|
||||||
|
|
||||||
# ex:ts=8 sw=4:
|
# ex:ts=8 sw=4:
|
||||||
# $OpenBSD: Quirks.pm,v 1.1808 2026/05/28 15:19:08 naddy Exp $
|
# $OpenBSD: Quirks.pm,v 1.1809 2026/05/30 12:50:06 ajacoutot Exp $
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
|
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
|
||||||
#
|
#
|
||||||
@@ -1110,6 +1110,7 @@ my $obsolete_suggestion = {
|
|||||||
'usmb' => 'susmb',
|
'usmb' => 'susmb',
|
||||||
# 8.0
|
# 8.0
|
||||||
'facette' => 'grafana',
|
'facette' => 'grafana',
|
||||||
|
'telepathy-logger' => '5',
|
||||||
};
|
};
|
||||||
|
|
||||||
# reasons for obsolete packages
|
# reasons for obsolete packages
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
SUBDIR += folks
|
SUBDIR += folks
|
||||||
SUBDIR += telepathy-glib
|
SUBDIR += telepathy-glib
|
||||||
SUBDIR += telepathy-idle
|
SUBDIR += telepathy-idle
|
||||||
SUBDIR += telepathy-logger
|
|
||||||
SUBDIR += telepathy-mission-control
|
SUBDIR += telepathy-mission-control
|
||||||
|
|
||||||
.include <bsd.port.subdir.mk>
|
.include <bsd.port.subdir.mk>
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
COMMENT= flexible communications framework, logger component
|
|
||||||
|
|
||||||
DISTNAME= telepathy-logger-0.8.2
|
|
||||||
REVISION= 11
|
|
||||||
|
|
||||||
SHARED_LIBS += telepathy-logger 4.1 # 6.0
|
|
||||||
|
|
||||||
HOMEPAGE= ${HOMEPAGE_TP:=Logger}
|
|
||||||
|
|
||||||
SITES= ${SITES_TP:=telepathy-logger/}
|
|
||||||
EXTRACT_SUFX= .tar.bz2
|
|
||||||
|
|
||||||
WANTLIB = c dbus-1 dbus-glib-1 execinfo ffi gio-2.0 glib-2.0
|
|
||||||
WANTLIB += gmodule-2.0 gobject-2.0 iconv intl lzma m pcre2-8 pthread
|
|
||||||
WANTLIB += sqlite3 telepathy-glib xml2 z
|
|
||||||
|
|
||||||
MODULES= devel/dconf \
|
|
||||||
lang/python \
|
|
||||||
textproc/intltool
|
|
||||||
|
|
||||||
MODPY_RUNDEP= No
|
|
||||||
|
|
||||||
USE_GMAKE= Yes
|
|
||||||
|
|
||||||
BUILD_DEPENDS= devel/gobject-introspection \
|
|
||||||
devel/py-twisted \
|
|
||||||
textproc/libxslt
|
|
||||||
LIB_DEPENDS= databases/sqlite3 \
|
|
||||||
net/telepathy/telepathy-glib \
|
|
||||||
textproc/libxml \
|
|
||||||
x11/dbus-glib
|
|
||||||
|
|
||||||
MODGCONF2_SCHEMAS_DIR= telepathy-logger
|
|
||||||
|
|
||||||
TEST_IS_INTERACTIVE=x11
|
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
SHA256 (telepathy/telepathy-logger-0.8.2.tar.bz2) = j8rVNNZTsbNlEyxbFYra6UeBD/uumEP3LdF5eWZBXa4=
|
|
||||||
SIZE (telepathy/telepathy-logger-0.8.2.tar.bz2) = 562670
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
Bug 627126 - gsettings schema files don't get installed on FreeBSD
|
|
||||||
glib commit 136e705e8383ff8848e425ac01278102d7badc52
|
|
||||||
|
|
||||||
--- configure.orig Thu Apr 30 13:32:10 2015
|
|
||||||
+++ configure Sun May 3 16:22:05 2015
|
|
||||||
@@ -14347,22 +14347,10 @@ install-data-am: install-gsettings-schemas
|
|
||||||
|
|
||||||
.SECONDARY: $(gsettings_SCHEMAS)
|
|
||||||
|
|
||||||
-gsettings__base_list = \
|
|
||||||
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
|
|
||||||
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
|
|
||||||
-
|
|
||||||
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
|
|
||||||
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
|
|
||||||
@$(NORMAL_INSTALL)
|
|
||||||
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
|
|
||||||
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
|
|
||||||
- for p in $$list; do \
|
|
||||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
||||||
- echo "$$d$$p"; \
|
|
||||||
- done | $(gsettings__base_list) | \
|
|
||||||
- while read files; do \
|
|
||||||
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
|
|
||||||
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
|
|
||||||
- done
|
|
||||||
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
|
|
||||||
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
|
|
||||||
|
|
||||||
uninstall-gsettings-schemas:
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/c-constants-gen.py
|
|
||||||
--- tools/c-constants-gen.py.orig
|
|
||||||
+++ 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):
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/glib-client-gen.py
|
|
||||||
--- tools/glib-client-gen.py.orig
|
|
||||||
+++ 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]
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/glib-client-marshaller-gen.py
|
|
||||||
--- tools/glib-client-marshaller-gen.py.orig
|
|
||||||
+++ 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):
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/glib-ginterface-gen.py
|
|
||||||
--- tools/glib-ginterface-gen.py.orig
|
|
||||||
+++ 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)
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/glib-gtypes-generator.py
|
|
||||||
--- tools/glib-gtypes-generator.py.orig
|
|
||||||
+++ 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:]
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/glib-interfaces-gen.py
|
|
||||||
--- tools/glib-interfaces-gen.py.orig
|
|
||||||
+++ 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):
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/libglibcodegen.py
|
|
||||||
--- tools/libglibcodegen.py.orig
|
|
||||||
+++ 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)
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/libtpcodegen.py
|
|
||||||
--- tools/libtpcodegen.py.orig
|
|
||||||
+++ 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
|
|
||||||
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
From ffc23c3b3d49d265997b6bb5d55d9463080c1cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Debarshi Ray <debarshir@freedesktop.org>
|
|
||||||
Date: Mon, 10 Feb 2020 15:20:38 +0100
|
|
||||||
Subject: [PATCH] tools: Fix the build with Python 3
|
|
||||||
|
|
||||||
Index: tools/xincludator.py
|
|
||||||
--- tools/xincludator.py.orig
|
|
||||||
+++ tools/xincludator.py
|
|
||||||
@@ -1,17 +1,19 @@
|
|
||||||
#!/usr/bin/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')
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
tp-logger is a headless Observer client that logs information received
|
|
||||||
by the Telepathy framework. It features pluggable backends to log
|
|
||||||
different sorts of messages, in different formats.
|
|
||||||
|
|
||||||
tp-logger features a Telepathy-style D-Bus API to expose logs and
|
|
||||||
interesting information related to logging (most frequent contacts,
|
|
||||||
etc.). It also provides a GLib-compatible client API for making bulk log
|
|
||||||
requests (e.g. for display logs in applications without having to
|
|
||||||
provide lots of information over D-Bus).
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
include/telepathy-logger-0.2/
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/call-event.h
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/entity.h
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/event.h
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/log-manager.h
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/log-walker.h
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/telepathy-logger.h
|
|
||||||
include/telepathy-logger-0.2/telepathy-logger/text-event.h
|
|
||||||
lib/girepository-1.0/TelepathyLogger-0.2.typelib
|
|
||||||
@static-lib lib/libtelepathy-logger.a
|
|
||||||
lib/libtelepathy-logger.la
|
|
||||||
@lib lib/libtelepathy-logger.so.${LIBtelepathy-logger_VERSION}
|
|
||||||
lib/pkgconfig/telepathy-logger-0.2.pc
|
|
||||||
@bin libexec/telepathy-logger
|
|
||||||
share/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service
|
|
||||||
share/dbus-1/services/org.freedesktop.Telepathy.Logger.service
|
|
||||||
share/gir-1.0/TelepathyLogger-0.2.gir
|
|
||||||
share/glib-2.0/schemas/org.freedesktop.Telepathy.Logger.gschema.xml
|
|
||||||
share/gtk-doc/html/telepathy-logger/
|
|
||||||
share/gtk-doc/html/telepathy-logger/TplCallEvent.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/TplEntity.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/TplEvent.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/TplLogManager.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/TplLogWalker.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/TplTextEvent.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/ch-public.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/home.png
|
|
||||||
share/gtk-doc/html/telepathy-logger/index.html
|
|
||||||
share/gtk-doc/html/telepathy-logger/index.sgml
|
|
||||||
share/gtk-doc/html/telepathy-logger/left-insensitive.png
|
|
||||||
share/gtk-doc/html/telepathy-logger/left.png
|
|
||||||
share/gtk-doc/html/telepathy-logger/right-insensitive.png
|
|
||||||
share/gtk-doc/html/telepathy-logger/right.png
|
|
||||||
share/gtk-doc/html/telepathy-logger/style.css
|
|
||||||
share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp2
|
|
||||||
share/gtk-doc/html/telepathy-logger/up-insensitive.png
|
|
||||||
share/gtk-doc/html/telepathy-logger/up.png
|
|
||||||
share/telepathy/
|
|
||||||
share/telepathy/clients/
|
|
||||||
share/telepathy/clients/Logger.client
|
|
||||||
@tag glib-compile-schemas
|
|
||||||
Reference in New Issue
Block a user