Hello community,
here is the log from the commit of package telepathy-logger for
openSUSE:Factory checked in at 2020-12-08 13:23:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telepathy-logger (Old)
and /work/SRC/openSUSE:Factory/.telepathy-logger.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-logger"
Tue Dec 8 13:23:39 2020 rev:26 rq:853262 version:0.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/telepathy-logger/telepathy-logger.changes
2019-08-19 20:46:47.281106194 +0200
+++
/work/SRC/openSUSE:Factory/.telepathy-logger.new.5913/telepathy-logger.changes
2020-12-08 13:25:18.806660190 +0100
@@ -1,0 +2,10 @@
+Fri Dec 4 09:37:53 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Build with python3 instead of python2:
+ + Add 1.diff: tools: Fix the build with Python 3.
+ + Drop python2-devel and python-xml BuildRequires.
+- Drop empty post/postun scriptlets that were calling
+ glib2_gsettings_schema_post/postun: macros are now empty
+ placeholder and the funcionality handled by file triggers.
+
+-------------------------------------------------------------------
New:
----
1.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telepathy-logger.spec ++++++
--- /var/tmp/diff_new_pack.50C8FZ/_old 2020-12-08 13:25:19.230661399 +0100
+++ /var/tmp/diff_new_pack.50C8FZ/_new 2020-12-08 13:25:19.234661411 +0100
@@ -1,7 +1,7 @@
#
# spec file for package telepathy-logger
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,18 +22,18 @@
Summary: Centralized Logging for the Telepathy Framework
License: LGPL-2.1-or-later
Group: System/GUI/GNOME
-Url: http://telepathy.freedesktop.org/wiki/Logger
+URL: http://telepathy.freedesktop.org/wiki/Logger
Source:
http://telepathy.freedesktop.org/releases/telepathy-logger/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM telepathy-logger-tests-Rename-function.patch
[email protected] -- Fix build
Patch0: telepathy-logger-tests-Rename-function.patch
# PATCH-FIx-UPSTREAM libtpl-extensions-dependencies.patch
gh#TelepathyIM/telepathy-logger#2 [email protected] -- Fix dependencies of
tpl-extensions
Patch1: libtpl-extensions-dependencies.patch
+# PATCH-FIX-UPSTREAM 1.diff [email protected] -- tools: Fix the build with
Python 3
+Patch2:
https://gitlab.freedesktop.org/telepathy/telepathy-logger/-/merge_requests/1.diff
BuildRequires: gnome-doc-utils-devel
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: pkgconfig
-BuildRequires: python2-devel
-BuildRequires: python2-xml
BuildRequires: pkgconfig(dbus-1) >= 1.1.0
BuildRequires: pkgconfig(dbus-glib-1) >= 0.82
BuildRequires: pkgconfig(glib-2.0) >= 2.28
@@ -126,12 +126,6 @@
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
-%post
-%glib2_gsettings_schema_post
-
-%postun
-%glib2_gsettings_schema_postun
-
%post -n libtelepathy-logger3 -p /sbin/ldconfig
%postun -n libtelepathy-logger3 -p /sbin/ldconfig
%post -n libtpl-extensions3 -p /sbin/ldconfig
++++++ 1.diff ++++++
diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py
index
c7a93d3714e503555e80dfbe0b9de5f233cee695..a08afee06196cfe2e1dac3fe051434238a7a33d9
100644
--- a/tools/c-constants-gen.py
+++ b/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):
diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
index
6b2b97f1d80dfbccef278724f95feccf3ec57dc6..fb083a11431494c66b429a0138e1c69e69523cb1
100644
--- a/tools/glib-client-gen.py
+++ b/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]
diff --git a/tools/glib-client-marshaller-gen.py
b/tools/glib-client-marshaller-gen.py
index
cb27d638a45dc0203c11426991e5b880c4522eee..cd9823bdffb234730667f8ec1fbffee4ab1d017a
100644
--- a/tools/glib-client-marshaller-gen.py
+++ b/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):
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index
784397738fc2ec9389aab1ca15c24f147f388c1d..97369d36fe48c336c692e7b2230039573c5ae7e5
100644
--- a/tools/glib-ginterface-gen.py
+++ b/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)
diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py
index
21dfc6aa78fef50075af1b2221cbad2627298963..1477bd37bad5b98f0441b5af6d36fd984e08ed19
100644
--- a/tools/glib-gtypes-generator.py
+++ b/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:]
diff --git a/tools/glib-interfaces-gen.py b/tools/glib-interfaces-gen.py
index
410762cdeb114bdb8282707731ded2f6fd838d11..b67d7b4f0c8013d450f4cf6bd0cf4cdbc55d39d6
100644
--- a/tools/glib-interfaces-gen.py
+++ b/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):
diff --git a/tools/libglibcodegen.py b/tools/libglibcodegen.py
index
6a9d214850317dec556db5fd8cce637bf7e4a26a..6cd1a6277841e311494a3d682b5693ef34fe6594
100644
--- a/tools/libglibcodegen.py
+++ b/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)
diff --git a/tools/libtpcodegen.py b/tools/libtpcodegen.py
index
7e9eb9a5078dffdbe068d399595813f9b7f46d73..99de66340d780e05a0fd887c11df65eff0050423
100644
--- a/tools/libtpcodegen.py
+++ b/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/DbusSpec#extensions-v0";
_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
diff --git a/tools/xincludator.py b/tools/xincludator.py
index
63e106ace13664eb71571342bec39780175e25bd..f9ed49ce475ca9e4b4ce222db5d192f80042a20b
100644
--- a/tools/xincludator.py
+++ b/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')
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
