Hello community, here is the log from the commit of package xcb-util-xrm for openSUSE:Factory checked in at 2020-08-28 21:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcb-util-xrm (Old) and /work/SRC/openSUSE:Factory/.xcb-util-xrm.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xcb-util-xrm" Fri Aug 28 21:21:11 2020 rev:4 rq:829059 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xcb-util-xrm/xcb-util-xrm.changes 2017-03-12 20:03:10.192804773 +0100 +++ /work/SRC/openSUSE:Factory/.xcb-util-xrm.new.3399/xcb-util-xrm.changes 2020-08-28 21:22:21.192353093 +0200 @@ -1,0 +2,6 @@ +Sat Aug 15 16:27:35 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 1.3: + * Correctly collapse multiple consecutive bindings + +------------------------------------------------------------------- Old: ---- xcb-util-xrm-1.2.tar.bz2 New: ---- xcb-util-xrm-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcb-util-xrm.spec ++++++ --- /var/tmp/diff_new_pack.QHaBXz/_old 2020-08-28 21:22:21.772353374 +0200 +++ /var/tmp/diff_new_pack.QHaBXz/_new 2020-08-28 21:22:21.776353376 +0200 @@ -1,7 +1,7 @@ # # spec file for package xcb-util-xrm # -# Copyright (c) 2016 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 @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define clib libxcb-xrm0 Name: xcb-util-xrm -Version: 1.2 +Version: 1.3 Release: 0 Summary: XCB utility module for the X Resource Manager License: MIT Group: Development/Libraries/C and C++ -Url: https://github.com/Airblader/%{name} +URL: https://github.com/Airblader/%{name} Source: https://github.com/Airblader/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 BuildRequires: m4 BuildRequires: pkgconfig ++++++ xcb-util-xrm-1.2.tar.bz2 -> xcb-util-xrm-1.3.tar.bz2 ++++++ ++++ 2151 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-util-xrm-1.2/ChangeLog new/xcb-util-xrm-1.3/ChangeLog --- old/xcb-util-xrm-1.2/ChangeLog 2016-11-24 08:52:33.000000000 +0100 +++ new/xcb-util-xrm-1.3/ChangeLog 2018-03-28 15:45:13.000000000 +0200 @@ -1,3 +1,31 @@ +commit a485748ec1a1d2125ce25c7cca0ef6062bff8c88 +Author: Ingo Bürk <[email protected]> +Date: Sat Mar 24 18:33:55 2018 +0100 + + Update version + +commit 0d73c101022f13264605693788e06e75d5900314 +Merge: a45b3d0 64ee910 +Author: Ingo Bürk <[email protected]> +Date: Sat Mar 24 18:31:57 2018 +0100 + + Merge pull request #80 from Airblader/issue-79 + + Correctly collapse multiple consecutive bindings. + +commit 64ee910c5bcee0413e465df404af5a4b1674cfd4 +Author: Ingo Bürk <[email protected]> +Date: Sat Mar 24 18:30:08 2018 +0100 + + Correctly collapse multiple consecutive bindings. + + As per the specification, if several bindings (".", "*") are following + each other, they are treated as if there was only a single binding, + wherein it is treated as "." if and only if all of the consecutive bindings + were tight ("."); otherwise, it is treated as a single loose ("*") binding. + + fixes #79 + commit a45b3d0bbaa94bf8a68405ab8c5c61404da464ce Author: Ingo Bürk <[email protected]> Date: Thu Nov 24 08:50:26 2016 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-util-xrm-1.2/configure.ac new/xcb-util-xrm-1.3/configure.ac --- old/xcb-util-xrm-1.2/configure.ac 2016-11-24 08:49:04.000000000 +0100 +++ new/xcb-util-xrm-1.3/configure.ac 2018-03-28 15:44:10.000000000 +0200 @@ -1,6 +1,6 @@ dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62 AC_PREREQ(2.62) -AC_INIT([xcb-util-xrm],1.2,[[email protected]]) +AC_INIT([xcb-util-xrm],1.3,[[email protected]]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-util-xrm-1.2/m4/ltversion.m4 new/xcb-util-xrm-1.3/m4/ltversion.m4 --- old/xcb-util-xrm-1.2/m4/ltversion.m4 2016-03-30 13:55:41.000000000 +0200 +++ new/xcb-util-xrm-1.3/m4/ltversion.m4 2018-03-28 15:44:55.000000000 +0200 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2017 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4219 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.6.40-6ca5-dirty]) +m4_define([LT_PACKAGE_REVISION], [2.4.6.40]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.6.40-6ca5-dirty' +macro_revision='2.4.6.40' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-util-xrm-1.2/src/entry.c new/xcb-util-xrm-1.3/src/entry.c --- old/xcb-util-xrm-1.2/src/entry.c 2016-11-24 08:44:20.000000000 +0100 +++ new/xcb-util-xrm-1.3/src/entry.c 2018-03-28 15:44:10.000000000 +0200 @@ -121,6 +121,7 @@ xcb_xrm_component_t *last; char *value; char *value_walk; + xcb_xrm_binding_type_t binding_type; xcb_xrm_entry_parser_state_t state = { .chunk = CS_INITIAL, @@ -166,8 +167,19 @@ goto done_error; } + /* Subsequent bindings must be collapsed into a loose binding if at + * least one was a loose binding and a tight binding otherwise. */ + binding_type = (*walk == '*') ? BT_LOOSE : BT_TIGHT; + while (*(walk + 1) == '.' || *(walk + 1) == '*') { + walk++; + + if (*walk == '*') { + binding_type = BT_LOOSE; + } + } + xcb_xrm_finalize_component(entry, &state); - state.current_binding_type = (*walk == '.') ? BT_TIGHT : BT_LOOSE; + state.current_binding_type = binding_type; break; case '?': state.chunk = MAX(state.chunk, CS_COMPONENTS); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcb-util-xrm-1.2/tests/tests_match.c new/xcb-util-xrm-1.3/tests/tests_match.c --- old/xcb-util-xrm-1.2/tests/tests_match.c 2016-11-24 08:44:20.000000000 +0100 +++ new/xcb-util-xrm-1.3/tests/tests_match.c 2018-03-28 15:44:10.000000000 +0200 @@ -95,6 +95,7 @@ err |= check_get_resource("First.?.third: 1", "First.second.third", "", "1", false); err |= check_get_resource("First.?.?.fourth: 1", "First.second.third.fourth", "", "1", false); err |= check_get_resource("*second: 1", "First.second", "", "1", false); + err |= check_get_resource(".second: 1", "First.second", "", NULL, false); err |= check_get_resource("*third: 1", "First.second.third", "", "1", false); err |= check_get_resource("First*second: 1", "First.second", "", "1", false); err |= check_get_resource("First*third: 1", "First.second.third", "", "1", false); @@ -110,6 +111,17 @@ err |= check_get_resource("First:", "First", "", "", false); err |= check_get_resource("First: ", "First", "", "", false); err |= check_get_resource("First: \t ", "First", "", "", false); + /* Consecutive bindings */ + err |= check_get_resource("*.bar: 1", "foo.foo.bar", "", "1", false); + err |= check_get_resource("...bar: 1", "foo.bar", "", NULL, false); + err |= check_get_resource("...bar: 1", "foo.foo.foo.bar", "", NULL, false); + err |= check_get_resource("***bar: 1", "foo.bar", "", "1", false); + err |= check_get_resource(".*.bar: 1", "foo.bar", "", "1", false); + err |= check_get_resource(".*.bar: 1", "foo.foo.bar", "", "1", false); + err |= check_get_resource("..*bar: 1", "foo.foo.foo.foo.bar", "", "1", false); + err |= check_get_resource("a.*.z: 1", "a.b.c.d.e.f.z", "", "1", false); + err |= check_get_resource("a...z: 1", "a.z", "", "1", false); + err |= check_get_resource("a...z: 1", "a.b.z", "", NULL, false); /* Matching among multiple entries */ err |= check_get_resource( "First: 1\n"
