Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2023-01-17 17:36:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdiff3" Tue Jan 17 17:36:07 2023 rev:44 rq:1058975 version:1.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2022-12-08 16:51:08.163467810 +0100 +++ /work/SRC/openSUSE:Factory/.kdiff3.new.32243/kdiff3.changes 2023-01-17 17:36:24.585555977 +0100 @@ -1,0 +2,11 @@ +Tue Jan 17 10:37:52 UTC 2023 - Wolfgang Bauer <wba...@tmo.at> + +- Update to 1.10.0 + * Make DirectoryMergeWindow and DirectoryMergeInfo QDockWidgets + * Use Qt native saveState/restoreState +- Build with boost 1.75.0 on Leap as the standard version is too + old (kdiff3 requires at least 1.71 now) +- Add Fix-linking-with-boost-1.75.0.patch to workaround a bug in + boost 1.75.0 that breaks the linking stage + +------------------------------------------------------------------- Old: ---- kdiff3-1.9.6.tar.xz kdiff3-1.9.6.tar.xz.sig New: ---- Fix-linking-with-boost-1.75.0.patch kdiff3-1.10.0.tar.xz kdiff3-1.10.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.BowcNO/_old 2023-01-17 17:36:25.257559766 +0100 +++ /var/tmp/diff_new_pack.BowcNO/_new 2023-01-17 17:36:25.261559789 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,32 @@ # -%bcond_without lang +%bcond_without released Name: kdiff3 -Version: 1.9.6 +Version: 1.10.0 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later Group: Development/Tools/Version Control URL: https://apps.kde.org/kdiff3 Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz +%if %{with released} Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig Source2: kdiff3.keyring -BuildRequires: boost-devel +%endif +# PATCH-FIX-OPENSUSE +Patch: Fix-linking-with-boost-1.75.0.patch +%if 0%{?suse_version} <= 1500 +BuildRequires: libboost_headers1_75_0-devel +%else +BuildRequires: boost-devel >= 1.71 +%endif BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem BuildRequires: update-desktop-files +BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DocTools) @@ -60,19 +69,18 @@ %autosetup -p1 %build -%cmake_kf5 -d build +%cmake_kf5 -d build -- -DBUILD_autotests=FALSE %cmake_build %install %kf5_makeinstall -C build %suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File -%if %{with lang} - %find_lang %{name} %{name}.lang --with-man - %find_lang diff_ext %{name}.lang - %find_lang kdiff3fileitemactionplugin %{name}.lang - %{kf5_find_htmldocs} -%endif +%find_lang %{name} %{name}.lang --with-man +%find_lang diff_ext %{name}.lang +%find_lang kdiff3fileitemactionplugin %{name}.lang +%{kf5_find_htmldocs} + %fdupes %{buildroot} %files @@ -90,9 +98,8 @@ %{_kf5_kxmlguidir}/kdiff3part/ %{_kf5_plugindir}/kf5/kfileitemaction/kdiff3fileitemaction.so %{_kf5_plugindir}/kf5/parts/kdiff3part.so +%{_kf5_servicesdir}/kdiff3part.desktop -%if %{with lang} %files lang -f %{name}.lang -%endif %changelog ++++++ Fix-linking-with-boost-1.75.0.patch ++++++ >From d1f6385c0838602bce35f02087556f978d7c074b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Tue, 17 Jan 2023 11:33:47 +0100 Subject: [PATCH] Fix linking with boost 1.75.0 Boost 1.75.0 has a bug that causes "multiple definitions" errors in the linking stage. This was fixed in later versions by declaring some functions as inline. See https://github.com/boostorg/safe_numerics/issues/106 . As a (ugly) workaround, override the function that breaks kdiff3's build to be inline before including the boost headers (when using 1.75.0). --- src/TypeUtils.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/TypeUtils.h b/src/TypeUtils.h index de2265f0..459a5777 100644 --- a/src/TypeUtils.h +++ b/src/TypeUtils.h @@ -14,6 +14,16 @@ #include <type_traits> #include <limits> +#include <boost/version.hpp> +#if BOOST_VERSION == 107500 +// prevent multiple definitions of literal_string with boost 1.75 +// see https://github.com/boostorg/safe_numerics/issues/106 +#include <cstdint> +namespace boost::safe_numerics { + enum class safe_numerics_error : std::uint8_t; + inline const char * literal_string(const safe_numerics_error & e); +} +#endif #include <boost/safe_numerics/safe_integer.hpp> #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) -- 2.35.3 ++++++ kdiff3-1.9.6.tar.xz -> kdiff3-1.10.0.tar.xz ++++++ ++++ 234149 lines of diff (skipped)
