Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libxmlb for openSUSE:Factory checked in at 2023-10-11 23:53:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxmlb (Old) and /work/SRC/openSUSE:Factory/.libxmlb.new.1807 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxmlb" Wed Oct 11 23:53:56 2023 rev:13 rq:1116625 version:0.3.14 Changes: -------- --- /work/SRC/openSUSE:Factory/libxmlb/libxmlb.changes 2023-08-21 11:42:47.347367824 +0200 +++ /work/SRC/openSUSE:Factory/.libxmlb.new.1807/libxmlb.changes 2023-10-12 11:45:46.224943067 +0200 @@ -1,0 +2,16 @@ +Tue Oct 10 08:03:30 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org> + +- baselibs.conf: don't build libxmlb2-32bit; baselibs.conf was + added for the x86-64-v3 flavor; the -32bit was an unintended side + effect. + +------------------------------------------------------------------- +Tue Oct 3 22:31:17 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 0.3.14 + * Fix comparing indexed text with integer values +- Enable libstemmer-devel BuildRequires and pass stemmer=true to + meson setup, libstemmer now available in Tumbleweed. +- Use ldconfig_scriptlets macro for post(un) handling. + +------------------------------------------------------------------- Old: ---- libxmlb-0.3.13.tar.gz New: ---- libxmlb-0.3.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxmlb.spec ++++++ --- /var/tmp/diff_new_pack.We3udC/_old 2023-10-12 11:45:46.892967239 +0200 +++ /var/tmp/diff_new_pack.We3udC/_new 2023-10-12 11:45:46.892967239 +0200 @@ -19,7 +19,7 @@ %define sover 2 Name: libxmlb -Version: 0.3.13 +Version: 0.3.14 Release: 0 Summary: Library for querying compressed XML metadata License: LGPL-2.1-or-later @@ -27,9 +27,8 @@ URL: https://github.com/hughsie/libxmlb Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source9: baselibs.conf -# Enable when/if libstemmer becomes available in openSUSE (+ in meson call) -#BuildRequires: libstemmer-devel BuildRequires: %{python_module setuptools} +BuildRequires: libstemmer-devel BuildRequires: meson >= 0.47.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) >= 2.45.8 @@ -93,7 +92,7 @@ -Dgtkdoc=true \ -Dintrospection=true \ -Dtests=true \ -# -Dstemmer=true \ + -Dstemmer=true \ %{nil} %meson_build @@ -103,8 +102,7 @@ %install %meson_install -%post -n %{name}%{sover} -p /sbin/ldconfig -%postun -n %{name}%{sover} -p /sbin/ldconfig +%ldconfig_scriptlets -n %{name}%{sover} %files -n %{name}%{sover} %license LICENSE ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.We3udC/_old 2023-10-12 11:45:46.948969266 +0200 +++ /var/tmp/diff_new_pack.We3udC/_new 2023-10-12 11:45:46.956969555 +0200 @@ -1,2 +1,3 @@ libxmlb2 + targettype 32bit block! ++++++ libxmlb-0.3.13.tar.gz -> libxmlb-0.3.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/NEWS new/libxmlb-0.3.14/NEWS --- old/libxmlb-0.3.13/NEWS 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/NEWS 2023-08-24 17:49:33.000000000 +0200 @@ -1,3 +1,10 @@ +Version 0.3.14 +~~~~~~~~~~~~~~ +Released: 2023-10-24 + +Bugfixes: + - Fix comparing indexed text with integer values (Richard Hughes) + Version 0.3.13 ~~~~~~~~~~~~~~ Released: 2023-10-17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/RELEASE new/libxmlb-0.3.14/RELEASE --- old/libxmlb-0.3.13/RELEASE 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/RELEASE 2023-08-24 17:49:33.000000000 +0200 @@ -2,9 +2,9 @@ 1. Write NEWS entries for libxmlb in the same format as usual. -git shortlog 0.3.12.. | grep -i -v trivial | grep -v Merge > NEWS.new +git shortlog 0.3.13.. | grep -i -v trivial | grep -v Merge > NEWS.new -Version 0.3.13 +Version 0.3.14 ~~~~~~~~~~~~~~ Released: 2023-xx-xx @@ -15,7 +15,7 @@ Commit changes to git: # MAKE SURE THESE ARE CORRECT -export release_ver="0.3.13" +export release_ver="0.3.14" git commit -a -m "Release libxmlb ${release_ver}" --no-verify git tag -s -f -m "Release libxmlb ${release_ver}" "${release_ver}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/meson.build new/libxmlb-0.3.14/meson.build --- old/libxmlb-0.3.13/meson.build 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/meson.build 2023-08-24 17:49:33.000000000 +0200 @@ -1,5 +1,5 @@ project('libxmlb', 'c', - version : '0.3.13', + version : '0.3.14', license : 'LGPL-2.1+', meson_version : '>=0.47.0', default_options : ['warning_level=2', 'c_std=c99'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/src/xb-machine.c new/libxmlb-0.3.14/src/xb-machine.c --- old/libxmlb-0.3.13/src/xb-machine.c 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/src/xb-machine.c 2023-08-24 17:49:33.000000000 +0200 @@ -1475,7 +1475,7 @@ static gboolean _xb_opcode_cmp_val_or_str(XbOpcode *op) { - return xb_opcode_cmp_str(op) || _xb_opcode_cmp_val(op); + return xb_opcode_cmp_str(op) || _xb_opcode_cmp_int(op) || _xb_opcode_cmp_itx(op); } static gboolean @@ -1538,7 +1538,7 @@ g_auto(XbOpcode) op1 = XB_OPCODE_INIT(); g_auto(XbOpcode) op2 = XB_OPCODE_INIT(); - if (!xb_machine_check_two_args(stack, _xb_opcode_cmp_val, _xb_opcode_cmp_val, error)) + if (!xb_machine_check_two_args(stack, _xb_opcode_cmp_int, _xb_opcode_cmp_int, error)) return FALSE; if (!xb_machine_stack_pop_two(self, stack, &op1, &op2, error)) return FALSE; @@ -1558,7 +1558,7 @@ g_auto(XbOpcode) op1 = XB_OPCODE_INIT(); g_auto(XbOpcode) op2 = XB_OPCODE_INIT(); - if (!xb_machine_check_two_args(stack, _xb_opcode_cmp_val, _xb_opcode_cmp_val, error)) + if (!xb_machine_check_two_args(stack, _xb_opcode_cmp_int, _xb_opcode_cmp_int, error)) return FALSE; if (!xb_machine_stack_pop_two(self, stack, &op1, &op2, error)) return FALSE; @@ -1588,7 +1588,8 @@ return FALSE; /* INTE:INTE */ - if (_xb_opcode_cmp_val(&op1) && _xb_opcode_cmp_val(&op2)) + if ((_xb_opcode_cmp_int(&op1) && _xb_opcode_cmp_int(&op2)) || + (_xb_opcode_cmp_itx(&op1) && _xb_opcode_cmp_itx(&op2))) return xb_stack_push_bool(stack, _xb_opcode_get_val(&op1) == _xb_opcode_get_val(&op2), error); @@ -1607,7 +1608,7 @@ } /* INTE:TEXT */ - if (_xb_opcode_cmp_val(&op1) && xb_opcode_cmp_str(&op2)) { + if (_xb_opcode_cmp_int(&op1) && xb_opcode_cmp_str(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op2) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1628,7 +1629,7 @@ } /* TEXT:INTE */ - if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_val(&op2)) { + if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_int(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op1) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1680,7 +1681,8 @@ return FALSE; /* INTE:INTE */ - if (_xb_opcode_cmp_val(&op1) && _xb_opcode_cmp_val(&op2)) { + if ((_xb_opcode_cmp_int(&op1) && _xb_opcode_cmp_int(&op2)) || + (_xb_opcode_cmp_itx(&op1) && _xb_opcode_cmp_itx(&op2))) { return xb_stack_push_bool(stack, _xb_opcode_get_val(&op1) != _xb_opcode_get_val(&op2), error); @@ -1695,7 +1697,7 @@ } /* INTE:TEXT */ - if (_xb_opcode_cmp_val(&op1) && xb_opcode_cmp_str(&op2)) { + if (_xb_opcode_cmp_int(&op1) && xb_opcode_cmp_str(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op2) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1711,7 +1713,7 @@ } /* TEXT:INTE */ - if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_val(&op2)) { + if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_int(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op1) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1758,7 +1760,7 @@ return FALSE; /* INTE:INTE */ - if (_xb_opcode_cmp_val(&op1) && _xb_opcode_cmp_val(&op2)) { + if (_xb_opcode_cmp_int(&op1) && _xb_opcode_cmp_int(&op2)) { return xb_stack_push_bool(stack, _xb_opcode_get_val(&op2) < _xb_opcode_get_val(&op1), error); @@ -1773,7 +1775,7 @@ } /* INTE:TEXT */ - if (_xb_opcode_cmp_val(&op1) && xb_opcode_cmp_str(&op2)) { + if (_xb_opcode_cmp_int(&op1) && xb_opcode_cmp_str(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op2) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1789,7 +1791,7 @@ } /* TEXT:INTE */ - if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_val(&op2)) { + if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_int(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op1) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1836,7 +1838,7 @@ return FALSE; /* INTE:INTE */ - if (_xb_opcode_cmp_val(&op1) && _xb_opcode_cmp_val(&op2)) { + if (_xb_opcode_cmp_int(&op1) && _xb_opcode_cmp_int(&op2)) { return xb_stack_push_bool(stack, _xb_opcode_get_val(&op2) > _xb_opcode_get_val(&op1), error); @@ -1851,7 +1853,7 @@ } /* INTE:TEXT */ - if (_xb_opcode_cmp_val(&op1) && xb_opcode_cmp_str(&op2)) { + if (_xb_opcode_cmp_int(&op1) && xb_opcode_cmp_str(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op2) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1867,7 +1869,7 @@ } /* TEXT:INTE */ - if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_val(&op2)) { + if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_int(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op1) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1914,7 +1916,7 @@ return FALSE; /* INTE:INTE */ - if (_xb_opcode_cmp_val(&op1) && _xb_opcode_cmp_val(&op2)) { + if (_xb_opcode_cmp_int(&op1) && _xb_opcode_cmp_int(&op2)) { return xb_stack_push_bool(stack, _xb_opcode_get_val(&op2) <= _xb_opcode_get_val(&op1), error); @@ -1930,7 +1932,7 @@ } /* INTE:TEXT */ - if (_xb_opcode_cmp_val(&op1) && xb_opcode_cmp_str(&op2)) { + if (_xb_opcode_cmp_int(&op1) && xb_opcode_cmp_str(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op2) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -1946,7 +1948,7 @@ } /* TEXT:INTE */ - if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_val(&op2)) { + if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_int(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op1) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -2037,7 +2039,7 @@ return xb_stack_push_bool(stack, _xb_opcode_get_str(&op) == NULL, error); /* INTE */ - if (_xb_opcode_cmp_val(&op)) + if (_xb_opcode_cmp_int(&op)) return xb_stack_push_bool(stack, _xb_opcode_get_val(&op) == 0, error); /* should have been checked above */ @@ -2079,14 +2081,14 @@ } /* INTE:INTE */ - if (_xb_opcode_cmp_val(&op1) && _xb_opcode_cmp_val(&op2)) { + if (_xb_opcode_cmp_int(&op1) && _xb_opcode_cmp_int(&op2)) { return xb_stack_push_bool(stack, _xb_opcode_get_val(&op2) >= _xb_opcode_get_val(&op1), error); } /* INTE:TEXT */ - if (_xb_opcode_cmp_val(&op1) && xb_opcode_cmp_str(&op2)) { + if (_xb_opcode_cmp_int(&op1) && xb_opcode_cmp_str(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op2) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -2102,7 +2104,7 @@ } /* TEXT:INTE */ - if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_val(&op2)) { + if (xb_opcode_cmp_str(&op1) && _xb_opcode_cmp_int(&op2)) { guint64 val = 0; if (_xb_opcode_get_str(&op1) == NULL) return xb_stack_push_bool(stack, FALSE, error); @@ -2255,7 +2257,7 @@ gchar *tmp; g_auto(XbOpcode) op = XB_OPCODE_INIT(); - if (!xb_machine_check_one_arg(stack, _xb_opcode_cmp_val, error)) + if (!xb_machine_check_one_arg(stack, _xb_opcode_cmp_int, error)) return FALSE; if (!xb_machine_stack_pop(self, stack, &op, error)) return FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/src/xb-opcode-private.h new/libxmlb-0.3.14/src/xb-opcode-private.h --- old/libxmlb-0.3.13/src/xb-opcode-private.h 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/src/xb-opcode-private.h 2023-08-24 17:49:33.000000000 +0200 @@ -120,14 +120,19 @@ } static inline gboolean -_xb_opcode_cmp_val(XbOpcode *self) +_xb_opcode_cmp_int(XbOpcode *self) { return self->kind == XB_OPCODE_KIND_INTEGER || self->kind == XB_OPCODE_KIND_BOOLEAN || - self->kind == XB_OPCODE_KIND_INDEXED_TEXT || - self->kind == XB_OPCODE_KIND_BOUND_INDEXED_TEXT || self->kind == XB_OPCODE_KIND_BOUND_INTEGER; } +static inline gboolean +_xb_opcode_cmp_itx(XbOpcode *self) +{ + return self->kind == XB_OPCODE_KIND_INDEXED_TEXT || + self->kind == XB_OPCODE_KIND_BOUND_INDEXED_TEXT; +} + G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(XbOpcode, xb_opcode_clear) G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/src/xb-opcode.c new/libxmlb-0.3.14/src/xb-opcode.c --- old/libxmlb-0.3.13/src/xb-opcode.c 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/src/xb-opcode.c 2023-08-24 17:49:33.000000000 +0200 @@ -223,7 +223,7 @@ inline gboolean xb_opcode_cmp_val(XbOpcode *self) { - return _xb_opcode_cmp_val(self); + return _xb_opcode_cmp_int(self) || _xb_opcode_cmp_itx(self); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxmlb-0.3.13/src/xb-self-test.c new/libxmlb-0.3.14/src/xb-self-test.c --- old/libxmlb-0.3.13/src/xb-self-test.c 2023-08-17 20:49:51.000000000 +0200 +++ new/libxmlb-0.3.14/src/xb-self-test.c 2023-08-24 17:49:33.000000000 +0200 @@ -1285,7 +1285,7 @@ g_autoptr(XbNode) n = NULL; g_autoptr(XbSilo) silo = NULL; const gchar *xml = "<components>\n" - " <component>\n" + " <component timestamp=\"1631923200\">\n" " <id>n/a</id>\n" " </component>\n" "</components>\n"; @@ -1316,6 +1316,13 @@ g_assert_cmpstr(xb_node_get_text(n), ==, "n/a"); g_clear_object(&n); + /* query using an integer */ + n = xb_silo_query_first(silo, "components/component[@timestamp=1631923200]", &error); + g_assert_no_error(error); + g_assert_nonnull(n); + g_assert_cmpstr(xb_node_get_attr(n, "timestamp"), ==, "1631923200"); + g_clear_object(&n); + /* query with an OR, all sections contains an unknown element */ n = xb_silo_query_first(silo, "components/dave|components/mike", &error); g_assert_error(error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND);
