diff --git a/Revert-tests-Add-a-test-for-log-iter-xml-get-events.patch b/Revert-tests-Add-a-test-for-log-iter-xml-get-events.patch new file mode 100644 index 0000000000000000000000000000000000000000..215fb3c19f21df9e2790b03d8ee003f3216d6383 --- /dev/null +++ b/Revert-tests-Add-a-test-for-log-iter-xml-get-events.patch @@ -0,0 +1,99 @@ +From: =?utf-8?q?Jeremy_B=C3=ADcha?= +Date: Tue, 21 Oct 2025 19:11:39 -0400 +Subject: Revert "tests: Add a test for log-iter-xml/get-events" + +This reverts commit cecd26b25755b2611d0d454ae92103d4ef7c059e. + +This test fails in 2025, possibly because of changes in libxml2 +--- + telepathy-logger/log-store-xml.c | 3 +-- + tests/dbus/test-tpl-log-iter-xml.c | 46 +------------------------------------- + 2 files changed, 2 insertions(+), 47 deletions(-) + +diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c +index 1e3b4e2..3951c93 100644 +--- a/telepathy-logger/log-store-xml.c ++++ b/telepathy-logger/log-store-xml.c +@@ -1373,8 +1373,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self, + doc = xmlCtxtReadFile (ctxt, filename, NULL, XML_PARSE_RECOVER); + if (!doc) + { +- if (!self->priv->test_mode) +- g_warning ("Failed to parse file:'%s'", filename); ++ g_warning ("Failed to parse file:'%s'", filename); + xmlFreeParserCtxt (ctxt); + g_free (self_id); + return; +diff --git a/tests/dbus/test-tpl-log-iter-xml.c b/tests/dbus/test-tpl-log-iter-xml.c +index 121607f..044bf47 100644 +--- a/tests/dbus/test-tpl-log-iter-xml.c ++++ b/tests/dbus/test-tpl-log-iter-xml.c +@@ -71,7 +71,7 @@ static void + test_get_events (XmlTestCaseFixture *fixture, + gconstpointer user_data) + { +- TplEntity *user2, *user4, *user6; ++ TplEntity *user2, *user4; + TplLogIter *iter; + GList *events; + GError *error = NULL; +@@ -85,9 +85,6 @@ test_get_events (XmlTestCaseFixture *fixture, + user4 = tpl_entity_new ("user4@collabora.co.uk", TPL_ENTITY_CONTACT, + "User4", ""); + +- user6 = tpl_entity_new ("user6@collabora.co.uk", TPL_ENTITY_CONTACT, +- "User6", ""); +- + /* Text events spanning multiple days */ + iter = tpl_log_iter_xml_new (fixture->store, fixture->account, user2, + TPL_EVENT_MASK_ANY); +@@ -218,49 +215,8 @@ test_get_events (XmlTestCaseFixture *fixture, + + g_object_unref (iter); + +- /* Files with invalid XML */ +- iter = tpl_log_iter_xml_new (fixture->store, fixture->account, user6, +- TPL_EVENT_MASK_ANY); +- +- events = tpl_log_iter_get_events (iter, 2, &error); +- g_assert_no_error (error); +- g_assert (events != NULL); +- g_assert_cmpint (g_list_length (events), ==, 2); +- timestamp = tpl_event_get_timestamp (TPL_EVENT (events->data)); +- g_assert_cmpint (timestamp, ==, 1388680071); +- message = tpl_text_event_get_message (TPL_TEXT_EVENT (events->data)); +- g_assert_cmpstr (message, ==, "34"); +- g_list_free_full (events, g_object_unref); +- +- events = tpl_log_iter_get_events (iter, 1, &error); +- g_assert_no_error (error); +- g_assert (events != NULL); +- g_assert_cmpint (g_list_length (events), ==, 1); +- timestamp = tpl_event_get_timestamp (TPL_EVENT (events->data)); +- g_assert_cmpint (timestamp, ==, 1388680070); +- message = tpl_text_event_get_message (TPL_TEXT_EVENT (events->data)); +- g_assert_cmpstr (message, ==, ""); +- g_list_free_full (events, g_object_unref); +- +- events = tpl_log_iter_get_events (iter, 2, &error); +- g_assert_no_error (error); +- g_assert (events != NULL); +- g_assert_cmpint (g_list_length (events), ==, 2); +- timestamp = tpl_event_get_timestamp (TPL_EVENT (events->data)); +- g_assert_cmpint (timestamp, ==, 1388568367); +- message = tpl_text_event_get_message (TPL_TEXT_EVENT (events->data)); +- g_assert_cmpstr (message, ==, "1"); +- g_list_free_full (events, g_object_unref); +- +- events = tpl_log_iter_get_events (iter, 2, &error); +- g_assert_no_error (error); +- g_assert (events == NULL); +- +- g_object_unref (iter); +- + g_object_unref (user2); + g_object_unref (user4); +- g_object_unref (user6); + } + + diff --git a/telepathy-logger.spec b/telepathy-logger.spec index e5f5424df7b7e6f37cc3e3511b0d1fb594029cfc..6d955c21a9f5bc9b045b6fd892c3f150e2e84f5a 100644 --- a/telepathy-logger.spec +++ b/telepathy-logger.spec @@ -1,6 +1,6 @@ Name: telepathy-logger Version: 0.8.2 -Release: 15 +Release: 16 Summary: Centralized Logging for the Telepathy Framework License: LGPL-2.1-or-later @@ -8,6 +8,7 @@ URL: https://telepathy.freedesktop.org/components/telepathy-logger/ Source0: https://telepathy.freedesktop.org/releases/telepathy-logger/%{name}-%{version}.tar.bz2 Patch0: 0001-tools-Fix-the-build-with-Python-3.patch +Patch1: Revert-tests-Add-a-test-for-log-iter-xml-get-events.patch BuildRequires: pkgconfig(dbus-1) >= 1.1.0 BuildRequires: pkgconfig(dbus-glib-1) >= 0.82 @@ -82,6 +83,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %doc %{_datadir}/gtk-doc/html/telepathy-logger %changelog +* Sun Dec 14 2025 Funda Wang - 0.8.2-16 +- Add patch to disable a test that fails with modern libxml2 + (Patch from debian) + * Wed Nov 05 2025 Funda Wang - 0.8.2-15 - move glib schemas into main package - drop static lib as it was not used by any other packages