diff --git a/Fix-linking-with-boost-1.75.0.patch b/Fix-linking-with-boost-1.75.0.patch new file mode 100644 index 0000000..cf18eb7 --- /dev/null +++ b/Fix-linking-with-boost-1.75.0.patch @@ -0,0 +1,41 @@ +From d1f6385c0838602bce35f02087556f978d7c074b Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +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 + #include + ++#include ++#if BOOST_VERSION == 107500 ++// prevent multiple definitions of literal_string with boost 1.75 ++// see https://github.com/boostorg/safe_numerics/issues/106 ++#include ++namespace boost::safe_numerics { ++ enum class safe_numerics_error : std::uint8_t; ++ inline const char * literal_string(const safe_numerics_error & e); ++} ++#endif + #include + + #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) +-- +2.35.3 + diff --git a/kdiff3-1.10.0.tar.xz b/kdiff3-1.10.0.tar.xz new file mode 100644 index 0000000..9f3ef29 --- /dev/null +++ b/kdiff3-1.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f97e1b3e8117554a7a58d58f8f0f693ff030a42bbcb7308fb44f85958cd52b +size 1073920 diff --git a/kdiff3-1.10.0.tar.xz.sig b/kdiff3-1.10.0.tar.xz.sig new file mode 100644 index 0000000..83a621f --- /dev/null +++ b/kdiff3-1.10.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmO/alwACgkQ9EKzbWFL +BrznKA//eGeKh/NOzlk+WE/lt3w6hzKTJc/e0+I+qcbV/C1bQaUaJ8Dz6DZ7V35Y +zM1csRnMqbh5mVnOWsm5y6Qmgixl9Nwv/d9f+VnSERU71370L099IDx4uG1iaU3D +XY2UFCKdAWnJw+cJT6Tz5sLYJyl1bR9ZN1Q32ogBfdpwAgmFtd7QE4oYLlHxKpuV +U1Vyz81Jo7lNxTCBX5VequCvB2042+OSYGbmXxcF0bEeSEF1qQs7evOsAWFSWpTB +q3YXFVp/1hSbjxdFomzLhIeeFPDgGF/8iV+tAzLe4aGhBV/h1IFVhMYrWuiEXyLw +PJtsa1zN1MgdAo5HwZAaPxa0riaRDe6dzfsmFmp54a0yBviI6dIYnMfxGmTPkKkR +rZ11ojhPuLnNXV94dnNOyJxyFgykYWGP4JoT0mtjIueinSF8DXMnYS8cBRpI2kX8 +FCcxQbFVm0YPKn5oViXkqPyyOZV7erZaiEKQr1/o018ijCGVuB1zbOAfUbiPAL6f +6VIqGUECHFue5AvDd9GirxOg8KZWlUSzqtPmVG45kVJ/6FqTzOokuUqCAX0Y++/K +LiF3LBreiEHLUvfvV7O0fc7jZP4MMp3NwtY+6Pk7Vw3k1J03WXFBmrkfdFIuM2CW +k8aGRN+kZFHrD+W+GCF1cgoqrsBFXTD1lKY3829SCnw1GZijQ2s= +=VZY8 +-----END PGP SIGNATURE----- diff --git a/kdiff3-1.9.6.tar.xz b/kdiff3-1.9.6.tar.xz deleted file mode 100644 index e43beaa..0000000 --- a/kdiff3-1.9.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac922476f850613a739284e3faf477c98ac349ad15a737a2b72ded8451f6b2bc -size 1059880 diff --git a/kdiff3-1.9.6.tar.xz.sig b/kdiff3-1.9.6.tar.xz.sig deleted file mode 100644 index 2ad78e5..0000000 --- a/kdiff3-1.9.6.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmK4upsACgkQ9EKzbWFL -BryFtg/+L0W545J62Sgq+aekwKJBs6jArDh/rtqPg9qlCqbc3Zu/PYPB0qLZHbTJ -pMl3/j6YjyYRHYagw6MnekYZWEQSRc9BgPunAs1lOlVBTs2VPu7UMpPLwmXRlmv0 -bWY9zlkpfpRekfGuQhiKoKUhd00+V/Wr4MW5GRVKY1mcSTMEhgVxrDYA7P9TdDVm -FOSwFOEGz8/6+s3XvFa04yUpHkR+4OjJmk4qQJ1RwQbDvj42bYfgZ4iVaeDVRNcV -2006gdHTZilAtxRX8KxDKCQUJ291PgxCJZAMB1yhCpkRUmtyY5oONiGcyhdGr6Kc -3e+EchDjWgDnKTxIsgjNmR7q3efTRvyZVxmOCQzvjqYPPV8ORLQtghE5bjcDmPFf -+uNx99/UI4ZPwrv2Xot8Zq+voh1ng44LPAFmSR46K0xe061b63KTfB4KjsZgnGEx -v0MGCvvtlTGyr/z2VA9KOT1JPHa6QWKV1IlOSzr4evDhcc42cIRas/NosB1tEXlf -oiZEa2XF6ewkIErKjFEo38b/DqpAXQZWMlNxELOuxUpkYPwJHAYQ7yd5eu7YFJC0 -D856J7u03jM68fmUkQSZ6OWOrx/CqSpt0AHrn/mEPghBqmLHxCR1Rma1lBilyO1u -YdF7nUb9DRwTlis95toOpcm61SsTQ1xZe0xwJv+9zXRzU6Ze9JQ= -=wPc3 ------END PGP SIGNATURE----- diff --git a/kdiff3.changes b/kdiff3.changes index 30fa8a4..a32fbbd 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 17 10:37:52 UTC 2023 - Wolfgang Bauer + +- 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 + ------------------------------------------------------------------- Wed Dec 7 16:25:32 UTC 2022 - Dirk Müller diff --git a/kdiff3.spec b/kdiff3.spec index aec73a6..2974906 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -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 @@ KDiff3 is a program that: %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 @@ KDiff3 is a program that: %{_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