1.10.2
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=40
This commit is contained in:
Christophe Marin
Git OBS Bridge
parent
de6364cf14
commit
25ea3a28dc
@ -1,4 +1,4 @@
|
||||
From d1f6385c0838602bce35f02087556f978d7c074b Mon Sep 17 00:00:00 2001
|
||||
From e446ad2f7fd795d7d2afa654262c77cdbc45ea4a Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||
Date: Tue, 17 Jan 2023 11:33:47 +0100
|
||||
Subject: [PATCH] Fix linking with boost 1.75.0
|
||||
@ -12,14 +12,14 @@ 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(+)
|
||||
src/TypeUtils.h | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/src/TypeUtils.h b/src/TypeUtils.h
|
||||
index de2265f0..459a5777 100644
|
||||
index a9c3ba2..ab735ba 100644
|
||||
--- a/src/TypeUtils.h
|
||||
+++ b/src/TypeUtils.h
|
||||
@@ -14,6 +14,16 @@
|
||||
@@ -14,6 +14,17 @@
|
||||
#include <type_traits>
|
||||
#include <limits>
|
||||
|
||||
@ -33,9 +33,10 @@ index de2265f0..459a5777 100644
|
||||
+ inline const char * literal_string(const safe_numerics_error & e);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#include <boost/safe_numerics/automatic.hpp>
|
||||
#include <boost/safe_numerics/safe_integer.hpp>
|
||||
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||
--
|
||||
2.35.3
|
||||
2.40.1
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b3f97e1b3e8117554a7a58d58f8f0f693ff030a42bbcb7308fb44f85958cd52b
|
||||
size 1073920
|
||||
@ -1,16 +0,0 @@
|
||||
-----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-----
|
||||
3
kdiff3-1.10.2.tar.xz
Normal file
3
kdiff3-1.10.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bddc7c1ef4e70960b3f4d9894f137041345b75ed09ca86bde001649ba3ef44b3
|
||||
size 1112600
|
||||
16
kdiff3-1.10.2.tar.xz.sig
Normal file
16
kdiff3-1.10.2.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmRRkKsACgkQ9EKzbWFL
|
||||
BrxZsA/+IdQTUM8nKE/z9FHadpwYDuoEYhPHncUR+6aeYrzIYFmyhI82+XkiuYmd
|
||||
w9137Z7Sf6Pa/mRkwhOiU2fxC9yydtld/nNudA0uNxjuH+gzUFWjYgy5qeFUOCiW
|
||||
x6olG5nHxhO8r8fYBurwKiTQwFUqpzpqXT+4tmZiK6hvZFbQjo0Z2vUgoTNKkrl2
|
||||
lVm5+HoU0Ev+ymAEQpv6vW93rPOqYs0jQ1zDGa1J6RhdhqAih1SY5ZCIYaPgEvxy
|
||||
as84CFeVZXuL1FlTmJZk6tMDh5MDysftaZNVCmbmmz2VIw34D547oN+UTmwXBwtx
|
||||
c1cpv11kGlkoRZQ+0JnRYRCZSCAYvSGDvC3KdkDTuslDHfN9HY2xNLN+Xhcl0P64
|
||||
qNx8eKZj6gNb1xYFiHMFk9IwuaCqsW9gkVaPZ+H9jZNJfvs9mhHZ0TQpEavOfmE8
|
||||
Q0Z9YYmysoAHyVYrc29LRmoaRNVW6IbhqrL7H9tm5c+CR9yI3VrLjtVoJ/Y+bxv+
|
||||
fbTysoxmALgwNcw5MgkaGCjQdBrMewHkdcLK8Oviz+drL5yb6gJ9V7FsNP/O6yyy
|
||||
sjTIDKHzASuw0A6hewr/hDeGiXNkpLNh12jEiO6GHYXGbC4SVAkzLMLmwwvY5mnU
|
||||
35eqvbMhYKMoyjVnFZZ/CxLN4t4yyyXGsE7GQZb4IM/yKyCf9yI=
|
||||
=hwRL
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 3 13:42:10 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 1.10.2
|
||||
* Prevent false error due to faulty check when
|
||||
m_pOptions->m_bDiff3AlignBC = true
|
||||
* fix crash when word wrap enabled (kde#468492)
|
||||
* Rework KDiff3App::completeInit to avoid crash on exit in auto
|
||||
mode
|
||||
* "Escape" shortcut ignored if merge output in focus (kde#467652)
|
||||
* save and restore dock states (kde#466522)
|
||||
* Show UI before comparison start (kde#439148)
|
||||
* Don't crash on broken links (kde#466241)
|
||||
* Fix memory safety issues during reload. (kde#466524)
|
||||
* Fix mishandling line count for files containing '0x0b'
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 17 10:37:52 UTC 2023 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
|
||||
@ -18,11 +18,10 @@
|
||||
|
||||
%bcond_without released
|
||||
Name: kdiff3
|
||||
Version: 1.10.0
|
||||
Version: 1.10.2
|
||||
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}
|
||||
@ -30,7 +29,7 @@ Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x
|
||||
Source2: kdiff3.keyring
|
||||
%endif
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch: Fix-linking-with-boost-1.75.0.patch
|
||||
Patch0: Fix-linking-with-boost-1.75.0.patch
|
||||
%if 0%{?suse_version} <= 1500
|
||||
BuildRequires: libboost_headers1_75_0-devel
|
||||
%else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user