commit a0b472b330298c119168e4d48dee97d326049d1681bcac47f79d8dabd5ce27d5 Author: Adrian Schröter Date: Sat May 4 01:06:59 2024 +0200 Sync from SUSE:SLFO:Main telepathy-logger revision 67dac650a967c04e2003a9040af53a9f diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/1.diff b/1.diff new file mode 100644 index 0000000..7244b0c --- /dev/null +++ b/1.diff @@ -0,0 +1,407 @@ +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 ') + self.h('#include ') +@@ -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') diff --git a/libtpl-extensions-dependencies.patch b/libtpl-extensions-dependencies.patch new file mode 100644 index 0000000..37f6fb2 --- /dev/null +++ b/libtpl-extensions-dependencies.patch @@ -0,0 +1,9 @@ +Index: telepathy-logger-0.8.2/extensions/tpl-extensions.pc.in +=================================================================== +--- telepathy-logger-0.8.2.orig/extensions/tpl-extensions.pc.in ++++ telepathy-logger-0.8.2/extensions/tpl-extensions.pc.in +@@ -8,4 +8,3 @@ Description: Telepathy Logger GLib conve + Version: @VERSION@ + Libs: -L${libdir} -ltpl-extensions + Cflags: -I${includedir} +-Requires: @LIBTPL_MODULES@ diff --git a/telepathy-logger-0.8.2.tar.bz2 b/telepathy-logger-0.8.2.tar.bz2 new file mode 100644 index 0000000..e6cbbec --- /dev/null +++ b/telepathy-logger-0.8.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fcad534d653b1b365132c5b158adae947810ffbae9843f72dd1797966415dae +size 562670 diff --git a/telepathy-logger-tests-Rename-function.patch b/telepathy-logger-tests-Rename-function.patch new file mode 100644 index 0000000..b6622cf --- /dev/null +++ b/telepathy-logger-tests-Rename-function.patch @@ -0,0 +1,114 @@ +From 3755aa0f4cd32e25742069a1a92f08dba6f1dec9 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Thu, 21 Jul 2016 18:23:29 -0500 +Subject: tests: Rename function to avoid conflict with stdio.h + +I guess stdio.h is being included somewhere it previously wasn't by +some header file somewhere. + +https://bugs.freedesktop.org/show_bug.cgi?id=97034 + +diff --git a/tests/dbus/test-tpl-log-walker.c b/tests/dbus/test-tpl-log-walker.c +index d8b5b9f..3b1baf9 100644 +--- a/tests/dbus/test-tpl-log-walker.c ++++ b/tests/dbus/test-tpl-log-walker.c +@@ -169,7 +169,7 @@ rewind_cb (GObject *source, + + + static void +-rewind (WalkerTestCaseFixture *fixture, ++rewind_sync (WalkerTestCaseFixture *fixture, + TplLogWalker *walker, + guint num_events) + { +@@ -350,37 +350,37 @@ test_rewind (WalkerTestCaseFixture *fixture, + NULL, + NULL); + +- rewind (fixture, walker, 8); ++ rewind_sync (fixture, walker, 8); + get_events (fixture, walker, 0); +- rewind (fixture, walker, 8); ++ rewind_sync (fixture, walker, 8); + get_events (fixture, walker, 2); +- rewind (fixture, walker, 8); ++ rewind_sync (fixture, walker, 8); + test_get_events_text (fixture, walker, 8, 1263427261, "I'''"); +- rewind (fixture, walker, 3); ++ rewind_sync (fixture, walker, 3); + test_get_events_text (fixture, walker, 5, 1263427261, "I'"); +- rewind (fixture, walker, 1); ++ rewind_sync (fixture, walker, 1); + test_get_events_text (fixture, walker, 7, 1263427202, "11"); +- rewind (fixture, walker, 2); ++ rewind_sync (fixture, walker, 2); + test_get_events_call (fixture, walker, 5, 1263404881, 1); +- rewind (fixture, walker, 2); ++ rewind_sync (fixture, walker, 2); + get_events (fixture, walker, 0); + test_get_events_text (fixture, walker, 1, 1263404950, "9"); +- rewind (fixture, walker, 0); ++ rewind_sync (fixture, walker, 0); + test_get_events_text (fixture, walker, 5, 1263254401, "5''"); +- rewind (fixture, walker, 1); ++ rewind_sync (fixture, walker, 1); + test_get_events_text (fixture, walker, 8, 1263168065, "G'''"); +- rewind (fixture, walker, 7); ++ rewind_sync (fixture, walker, 7); + test_get_events_text (fixture, walker, 7, 1263168065, "G'''"); + test_get_events_text (fixture, walker, 7, 1263168063, "E"); +- rewind (fixture, walker, 2); ++ rewind_sync (fixture, walker, 2); + test_get_events_text (fixture, walker, 6, 1263168061, "C"); +- rewind (fixture, walker, 10); +- rewind (fixture, walker, 0); +- rewind (fixture, walker, 5); ++ rewind_sync (fixture, walker, 10); ++ rewind_sync (fixture, walker, 0); ++ rewind_sync (fixture, walker, 5); + test_get_events_text (fixture, walker, 16, 1263168005, "4''"); +- rewind (fixture, walker, 3); ++ rewind_sync (fixture, walker, 3); + test_get_events_text (fixture, walker, 6, 1263168004, "3"); +- rewind (fixture, walker, 1); ++ rewind_sync (fixture, walker, 1); + test_get_events_text (fixture, walker, 6, 1263081661, "A"); + + tpl_log_walker_get_events_async (walker, 2, get_events_cb, fixture); +@@ -397,24 +397,24 @@ test_rewind (WalkerTestCaseFixture *fixture, + filter_events, + NULL); + +- rewind (fixture, walker, 8); ++ rewind_sync (fixture, walker, 8); + get_events (fixture, walker, 0); +- rewind (fixture, walker, 8); ++ rewind_sync (fixture, walker, 8); + get_events (fixture, walker, 2); +- rewind (fixture, walker, 8); ++ rewind_sync (fixture, walker, 8); + test_get_events_text (fixture, walker, 8, 1263427201, "10"); +- rewind (fixture, walker, 3); ++ rewind_sync (fixture, walker, 3); + test_get_events_text (fixture, walker, 5, 1263254406, "8"); +- rewind (fixture, walker, 1); ++ rewind_sync (fixture, walker, 1); + test_get_events_text (fixture, walker, 7, 1263168064, "F"); +- rewind (fixture, walker, 2); ++ rewind_sync (fixture, walker, 2); + test_get_events_text (fixture, walker, 5, 1263168061, "C"); +- rewind (fixture, walker, 2); ++ rewind_sync (fixture, walker, 2); + get_events (fixture, walker, 0); + test_get_events_text (fixture, walker, 1, 1263168062, "D"); +- rewind (fixture, walker, 0); ++ rewind_sync (fixture, walker, 0); + test_get_events_text (fixture, walker, 5, 1263168002, "1"); +- rewind (fixture, walker, 1); ++ rewind_sync (fixture, walker, 1); + test_get_events_text (fixture, walker, 4, 1263081661, "A"); + + tpl_log_walker_get_events_async (walker, 2, get_events_cb, fixture); +-- +cgit v0.10.2 + diff --git a/telepathy-logger.changes b/telepathy-logger.changes new file mode 100644 index 0000000..efc936f --- /dev/null +++ b/telepathy-logger.changes @@ -0,0 +1,276 @@ +------------------------------------------------------------------- +Tue May 18 08:23:32 UTC 2021 - Dominique Leuenberger + +- Normalize patch tag line. + +------------------------------------------------------------------- +Fri Dec 4 09:37:53 UTC 2020 - Dominique Leuenberger + +- 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. + +------------------------------------------------------------------- +Thu Aug 15 10:28:48 UTC 2019 - Dominique Leuenberger + +- Add libtpl-extensions-dependencies.patch: Fix dependencies of + tpl-extensions.pc: LIBTPL_MODULES have been dropped a while back. + +------------------------------------------------------------------- +Mon Mar 5 15:16:42 UTC 2018 - jengelh@inai.de + +- Update summaries, fix RPM groups. + +------------------------------------------------------------------- +Wed Feb 28 16:40:13 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- +Wed Nov 1 15:54:03 UTC 2017 - mpluskal@suse.com + +- Explicitly require python2-variant of packages: python2-devel and + python2-xml instead of python-devel and python.xml. +- Cleanup with spec-clener. + +------------------------------------------------------------------- +Tue Jul 26 18:30:11 UTC 2016 - zaitor@opensuse.org + +- Add telepathy-logger-tests-Rename-function.patch: Fix build, + patch from upstream git. + +------------------------------------------------------------------- +Fri May 15 07:55:24 UTC 2015 - dimstar@opensuse.org + +- Update to version 0.8.2: + + Ask libxml2 to recover from errors, if possible (fdo#40675). + + Fix crash when logs are corrupted or invalid XML (fdo#89595). + +------------------------------------------------------------------- +Mon Aug 25 15:24:50 UTC 2014 - zaitor@opensuse.org + +- Update to version 0.8.1: + + Fixes: Fix a leak in log-store-xml (fdo#54814). + +------------------------------------------------------------------- +Tue Feb 19 15:05:24 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.8.0: + + GLib 2.28 is now required. + + New TplLogWalker API for iterating over logs (fdo#41772). + + Filter out duplicate dates in get_dates (fdo#53345). + +------------------------------------------------------------------- +Wed Oct 31 19:31:26 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.6.0: + + Multiple introspection problems have been fixed (fdo#50361). + + Streamed Media channel support has been removed. + + telepathy-glib 0.19.2 is now required and deprecated + telepathy-glib usage has been removed. +- Rename libtpl-extensions2 to libtpl-extensions3 and + libtpl-logger2 to libtpl-logger3, following upstreams soname + bumps. + +------------------------------------------------------------------- +Wed Apr 4 07:44:22 UTC 2012 - vuntz@opensuse.org + +- Update to version 0.4.0: + + No changes. +- Changes from version 0.2.13: + + Support Call1. +- Remove --enable-call from configure call: the option is gone. + +------------------------------------------------------------------- +Thu Dec 8 23:20:54 UTC 2011 - dimstar@opensuse.org + +- Split typelib file into typelib-1_0-TelepathyLogger-0_2 + subpackage. +- Add typelib-1_0-TelepathyLogger-0_2 Requires to devel subpackage. + +------------------------------------------------------------------- +Tue Nov 29 21:31:46 UTC 2011 - dimstar@opensuse.org + +- Update to version 0.2.12: + + This bug fix release correct the accidental so-name bump. + Distributions should use this release instead of 0.2.11. +- Changes from version 0.2.11: + + Fixes: + - Fix crash caused by used after free + - Fix crash wen call sender or actor is not set + - Fix missing alias feature when receiving messages + - Remove use of deprecated g_thread_init() + - Improve silent build rules + - Improve introspection annotation +- Pass --enable-call to configure: this is experimental but useful. +- Pass --enable-public-extensions to configure: this is in order to + allow building of 3rd party plugins, which is a feature used in + KDE. + +------------------------------------------------------------------- +Sun Jul 31 21:05:48 CEST 2011 - vuntz@opensuse.org + +- Fix typo that was disabling parallel build (_smp_mflags, and not + _smp_flag). + +------------------------------------------------------------------- +Fri May 27 10:00:03 CEST 2011 - dimstar@opensuse.org + +- Update to version 0.2.10: + + Add support for text message edits + + Fix events ordering and merging speed + + Fix destroy function for get_entities_async + + Fix crash in pidgin log store. + +------------------------------------------------------------------- +Wed May 18 17:35:40 CEST 2011 - dimstar@opensuse.org + +- Update to version 0.2.9: + + Work around GLib TimeZone cache bug [bgo#646435] + + Fix client file to effectively observe Call.DRAFT channels + + Downgraded autotools requirement to 2.65 + + Fix SQL syntax error and pending message order + + Store Calls log in separate file (e.g 20110505.call.log), to + fix performance issues. + + Make Pidgin store robust to empty file + + And more unit tests. + +------------------------------------------------------------------- +Mon Apr 4 16:06:25 UTC 2011 - fcrozat@novell.com + +- Update to version 0.2.8: + + Fix incorrect soname bump introduced in 0.2.7 +- Changes from version 0.2.7: + + Readd AM_PATH_PYTHON back to configure.ac, required for + codegen. + + Add support for call logging (experimental, use --enable-call + to enable). + + Search using GRegex to prevent matching XML tags + + Improve test coverage + + Avoid using g_list_append() for performance reason + + Fixed infinite loop in pending message cache logic +- Add gobject-introspection-devel BuildRequires. +- Fix license tag to be LGPLv2.1+ instead of GPLv2. + +------------------------------------------------------------------- +Wed Mar 23 10:16:51 UTC 2011 - fcrozat@novell.com + +- Update to version 0.2.6: + + Ported all internal time manipulation to GDateTime + + Observers now cache TplEntity object instead of TpContact to + reduce number memory allocations. + + Removed generated log_id + + Removed unused twisted test framework + + Port observer to TpTextChannel + + Reimplemnent pending message cache + + Update Telepathy GLib requirement to 0.14.0. + +------------------------------------------------------------------- +Wed Mar 9 09:51:26 UTC 2011 - fcrozat@novell.com + +- Update to version 0.2.5: + + Fixes: + - Fix another 32 vs 64bits bug +- Changes from version 0.2.4: + - Fixes: + - Add output annotations in TplLogManager + - Make the introspection files be 0.2 instead of 1.0 + - Fix use of uninitialised variable + - Remove reference to Gnome in configure.ac + - Remove GPL warning in README, Logger is now fully LGPL + - Move observer and SQlite tests with dbus enabled tests + - Update valgrind suppressions. + - Fix XML store test crash on 32bit computer. +- Changes from version 0.2.3: + - Fixes: + - Convert timestamp from uint to int64 on sent message + - Set an error if text event body is empty or NULL (fdo#31121) +- Changes from version 0.2.2: + + Fixes: + - Start work on introspection support + - Fix TplEvent::get_target() logic so room event are stored + correctly. + - Fix room check when XML log store reads events + - Free GDate with g_date_free() instead of g_free () + - Fix log_store_xml_get_filtered_events() to return no more + than num_events. + - Add an XML log store test for log_store_xml_add_event(). + +------------------------------------------------------------------- +Fri Feb 25 18:03:05 UTC 2011 - fcrozat@novell.com + +- Update to version 0.2.1: + + This bug fix release fixes memory corruption in GList + manipulation. + + Fixes: + - Use g_list_alloc() instead of g_new0() to allocate list + - Use _async() TplLogManager methods in unit test + - Do not ignore system() return value in unit test +- Changes from version 0.2: + + This version is a large API refactoring that enables + abstraction of the logged event type and clarifies the methods. + Alongside this large refactoring some new features like ability + to clear logs (see D-Bus API) and read-only Pidgin log store + can be found. While it remains compatible on the storage side, + the API is not. +- Rename libtelepathy-logger1 to libtelepathy-logger2, following + library soversion change. + +------------------------------------------------------------------- +Sat Dec 11 11:38:35 CET 2010 - vuntz@opensuse.org + +- Own /usr/share/telepathy and /usr/share/telepathy/clients to fix + the build. + +------------------------------------------------------------------- +Tue Dec 7 11:41:20 CET 2010 - vuntz@opensuse.org + +- Update to version 0.1.7: + + Stop using tp_get_bus(). + + Loads of memory leaks fixed. + + Don't crash by trying to use the sqlite log store after it has + been disposed. + +------------------------------------------------------------------- +Wed Oct 13 22:55:50 CEST 2010 - vuntz@opensuse.org + +- Update to version 0.1.6: + + Fixes: + - Running the test suite no longer accesses your session's + GSettings. + - Out-of-tree builds now work. + - A CM crashing with open text channels no longer causes + conversations not to be logged, and to take 25 seconds to be + displayed. (fdo#30824) + +------------------------------------------------------------------- +Thu Aug 12 09:41:27 CEST 2010 - dimstar@opensuse.org + +- Update to version 0.1.5: + + Enhancements: + - fdo#28602: The logger uses GSettings instead of GConf for + preferences. + - The ignore-accounts key has been removed for now as it was + unused and broken. + + Fix: + - fdo#29058: Make sure that TplLogSearchHit always contains the + account if known. +- Remove pkgconfig(gconf-2.0) BuildRequires and the various gconf + macros +- Add intltool BuildRequires +- Add gsettings macros to post/postun + +------------------------------------------------------------------- +Thu Aug 5 23:23:52 CEST 2010 - vuntz@opensuse.org + +- Cleanup before inclusion in Factory. + +------------------------------------------------------------------- +Fri Jul 9 21:24:54 UTC 2010 - dimstar@opensuse.org + +- Initial package of telepathy-logger, required by recent version + of Empathy. + diff --git a/telepathy-logger.spec b/telepathy-logger.spec new file mode 100644 index 0000000..97c7845 --- /dev/null +++ b/telepathy-logger.spec @@ -0,0 +1,162 @@ +# +# spec file for package telepathy-logger +# +# Copyright (c) 2021 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: telepathy-logger +Version: 0.8.2 +Release: 0 +Summary: Centralized Logging for the Telepathy Framework +License: LGPL-2.1-or-later +Group: System/GUI/GNOME +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 zaitor@opensuse.org -- Fix build +Patch0: telepathy-logger-tests-Rename-function.patch +# PATCH-FIX-UPSTREAM libtpl-extensions-dependencies.patch gh#TelepathyIM/telepathy-logger#2 dimstar@opensuse.org -- Fix dependencies of tpl-extensions +Patch1: libtpl-extensions-dependencies.patch +# PATCH-FIX-UPSTREAM 1.diff dimstar@opensuse.org -- 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: pkgconfig(dbus-1) >= 1.1.0 +BuildRequires: pkgconfig(dbus-glib-1) >= 0.82 +BuildRequires: pkgconfig(glib-2.0) >= 2.28 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(telepathy-glib) >= 0.19.2 +%glib2_gsettings_schema_requires + +%description +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). + +%package devel +Summary: Development files for the Telepathy Framework Centralized Logging +Group: Development/Languages/C and C++ +Requires: libtelepathy-logger3 = %{version} +Requires: libtpl-extensions3 = %{version} +Requires: typelib-1_0-TelepathyLogger-0_2 = %{version} + +%description devel +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). + +%package -n libtelepathy-logger3 +Summary: Centralized Logging for the Telepathy Framework +Group: System/Libraries + +%description -n libtelepathy-logger3 +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). + +%package -n typelib-1_0-TelepathyLogger-0_2 +Summary: Introspection bindings for the Telepathy Framework Centralized Logging +Group: System/Libraries + +%description -n typelib-1_0-TelepathyLogger-0_2 +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). + +This package provides the GObject Introspection bindings for Telepathy Logger. + +%package -n libtpl-extensions3 +Summary: Extensions for the Telepathy Framework Centralized Logging +Group: System/Libraries + +%description -n libtpl-extensions3 +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). + +%prep +%autosetup -p1 + +%build +%configure \ + --disable-static \ + --enable-public-extensions +make %{?_smp_mflags} V=1 + +%install +%make_install +find %{buildroot} -type f -name "*.la" -delete -print + +%post -n libtelepathy-logger3 -p /sbin/ldconfig +%postun -n libtelepathy-logger3 -p /sbin/ldconfig +%post -n libtpl-extensions3 -p /sbin/ldconfig +%postun -n libtpl-extensions3 -p /sbin/ldconfig + +%files +%{_libexecdir}/telepathy-logger +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Logger.service +%{_datadir}/glib-2.0/schemas/org.freedesktop.Telepathy.Logger.gschema.xml +%dir %{_datadir}/telepathy +%dir %{_datadir}/telepathy/clients +%{_datadir}/telepathy/clients/Logger.client + +%files -n libtelepathy-logger3 +%{_libdir}/libtelepathy-logger.so.* + +%files -n typelib-1_0-TelepathyLogger-0_2 +%{_libdir}/girepository-1.0/TelepathyLogger-0.2.typelib + +%files -n libtpl-extensions3 +%{_libdir}/libtpl-extensions.so.* + +%files devel +%{_includedir}/telepathy-logger-0.2/ +%{_includedir}/tpl-extensions/ +%{_libdir}/pkgconfig/telepathy-logger-0.2.pc +%{_libdir}/libtelepathy-logger.so +%{_libdir}/libtpl-extensions.so +%{_libdir}/pkgconfig/tpl-extensions.pc +%{_datadir}/gtk-doc/html/telepathy-logger/ +%{_datadir}/gir-1.0/TelepathyLogger-0.2.gir + +%changelog