Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sablot for openSUSE:Factory checked in at 2026-09-11 18:01:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sablot (Old) and /work/SRC/openSUSE:Factory/.sablot.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sablot" Fri Sep 11 18:01:56 2026 rev:19 rq:1376956 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/sablot/sablot.changes 2024-02-26 19:50:49.813707152 +0100 +++ /work/SRC/openSUSE:Factory/.sablot.new.1265/sablot.changes 2026-09-11 18:05:16.925742816 +0200 @@ -1,0 +2,12 @@ +Thu Sep 10 14:22:34 UTC 2026 - Martin Pluskal <[email protected]> + +- Fix C++20 build failure (rewritten != requires operator== + returning bool, Str::operator== returns Bool): + * spell the comparison in DefaultedStr::set as !(a == b) + * new patch sablot-1.0.3-cxx20.diff +- Spec cleanup: SPDX license, drop Group/BuildRoot/%defattr and + the sablotd rename shim from 2000, explicit devel headers, + %make_build/%make_install, %ldconfig_scriptlets, + pkgconfig(expat), explicit autoconf and automake BuildRequires. + +------------------------------------------------------------------- New: ---- sablot-1.0.3-cxx20.diff ----------(New B)---------- New: * spell the comparison in DefaultedStr::set as !(a == b) * new patch sablot-1.0.3-cxx20.diff - Spec cleanup: SPDX license, drop Group/BuildRoot/%defattr and ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sablot.spec ++++++ --- /var/tmp/diff_new_pack.7eQDkS/_old 2026-09-11 18:05:17.638772624 +0200 +++ /var/tmp/diff_new_pack.7eQDkS/_new 2026-09-11 18:05:17.640772708 +0200 @@ -1,7 +1,7 @@ # # spec file for package sablot # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -20,18 +20,20 @@ Version: 1.0.3 Release: 0 Summary: XSL Processor -License: GPL-2.0+ -Group: Productivity/Publishing/XML -Url: http://www.gingerall.com/charlie/ga/xml/p_sab.xml +License: GPL-2.0-or-later +URL: http://www.gingerall.com/charlie/ga/xml/p_sab.xml Source: http://sourceforge.net/projects/sablotron/files/sablotron-%{version}/Sablot-%{version}.tar.gz Patch0: %{name}-%{version}-newautoconf.diff Patch1: %{name}-%{version}-gcc3.diff Patch2: %{name}-%{version}-delete.diff +Patch3: %{name}-%{version}-cxx20.diff +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: libexpat-devel BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(expat) Provides: sablotron -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Sablotron is an XSL processor fully implemented in C++. The excellent @@ -39,11 +41,8 @@ %package devel Summary: Header Files and Libraries for Sablot Development -Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: glibc-devel -Provides: sablotd -Obsoletes: sablotd %description devel Header files and libraries needed for sablot development. @@ -56,26 +55,27 @@ touch COPYING NEWS AUTHORS ChangeLog autoreconf -fiv %configure --disable-static --with-pic -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} -rm -f %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root) %doc README %{_bindir}/sabcmd %{_libdir}/*.so.* %{_mandir}/man1/* %files devel -%defattr(-,root,root) -%attr(644,root,root) %{_includedir}/* +%{_includedir}/sabcfg.h +%{_includedir}/sabdbg.h +%{_includedir}/sablot.h +%{_includedir}/sdom.h +%{_includedir}/shandler.h +%{_includedir}/sxpath.h %{_libdir}/*.so %{_bindir}/sablot-config ++++++ sablot-1.0.3-cxx20.diff ++++++ --- src/engine/decimal.cpp +++ src/engine/decimal.cpp @@ -472,7 +472,9 @@ eFlag DefaultedStr::set(Sit S, const Str& value) { - if (specified && value != specifiedValue) + // C++20 rewritten != needs operator== returning bool, but + // Str::operator== returns Bool (int); spell out the negation. + if (specified && !(value == specifiedValue)) Err1(S, E1_FORMAT_DUPLICIT_OPTION, ownName()); if (singleChar && utf8StrLength(value) != 1) Err1(S, E1_FORMAT_OPTION_CHAR, ownName());
