pool/kdiff3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1229122 from KDE:Extra

Browse Source 
Update to 1.12.0

OBS-URL: https://build.opensuse.org/request/show/1229122
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=55
This commit is contained in:
Ana Guerrero 2024-12-09 20:11:38 +00:00 committed by Git OBS Bridge
commit 552c886da2
6 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kdiff3-1.11.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:420f18b3b9689698a05e102f8a41719049074da68f96c94be18d1b8297eeb545
size 1142840

16
kdiff3-1.11.5.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmcs2v8ACgkQ9EKzbWFL
BrxLLg//bhaMWjI5UUtp4fBXvjTuuvSh8rraM/G3b/g8i48JYYEH0J9vURdQQFNZ
V4mshH937VhCvJNTdfythRebFwTOlgyTtZrK10A3qo77CHHbTWpdwPngbTINX5qx
9Oot8L9B4N5+6k4Usn513rkZl3BO3U79a5/HSjyubXjamLjgkCWPQcQKO52OUhkt
MoycoEYquPyWk2q0elciqK5bpysWYh9BowMsqvmaumuP7CY9biXAk6+rW8lD2F83
ZSQnqWZ27yrvQSmTgCas9x96dCwEtX0p6gkxm6G9gGcRzQghIt9lzEs62mPjSSS3
WqKshJyZTJhpMu0ffkDQhk54z9P9+OW+pz75mnyAvrSDz+u3ZNcpbJ8sLEag8sQS
VdvXTMLk2o3d0Pcf+X+IthebVTlHR7p+MrR3BsSnBmZJczNDZIi+aNWtWPPGzdDf
eK3VByPGGSdWyoLPeFArFCABRNAjDZFqdifnQwbBlMa59NzK1of/QCK6JIG0wnyH
tkWQx5zgleq2nMyZ1NNCxSJ7/hgqWkylLusW4x/FOnqGIvXrbtoJDlsvwo1irvpn
lTkYs8FEgOndGWpZcN/0BnXe7DzL3PMkiUf1jL8TWqXWFOoJFezriXdL1TlPS933
Woq9ZNEO4yrknZ29oadczc/SeC9jjNx81xU5cq2rJ7zqd7mpFvo=
=Cp/I
-----END PGP SIGNATURE-----

3
kdiff3-1.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f93a065df8b2d70f22eb473c2dbfaad975c70341f37a918eb6ebb452771bacd6
size 1204256

16
kdiff3-1.12.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmdUZdwACgkQ9EKzbWFL
Brz3ShAAqAsV0nWxgryD9nQCVzsj7K65ezm3/W6ZMWxC+jGMUQZbSYZUgvCHsl2G
Y8gdYHYodPBKD+t3kmFBCqyJ3rIV8CR4A739rATgld33AVdy0IkQU5UleiDdHCd9
bEtEp13A+sQ+JCYdGFELJnucGJCH1pmGjCBQ5vVAgFQ5FrcflYt5TKu+FVE4CyzC
MS6/WCRuDHYNJus9FOiUGnro5kPFzRzgykB1N9NdRSN+4DTBDrp+26KVhihEHPfh
PHeqUZdJ5hRtSLsO+ZneBP5oGl+3VDWKXhrAhJMhbAkLgxUAn+lcDec4LItN0O6Y
7QzxnzRt1iKs9kcVks8PjyXafv3MtvGEZmIXOl9fDg8U8Nwqz7H+x++B4mUuEw7N
ZPYUFql2ZFzyHmd033NaSGKoG1OD16ebC+rTqNCjJe6ZZhc2lFbbeoeXKF64j03r
d4+9QGD+RU1M/w+Hsuw58XlmejlfPoiG5mlooWnnPVvv9T+lxPRve4Io8MBECxm7
rOql3KrhOrGyvSDgEwnlb+VuFDEUvPuxKcCZForuIRouKKkrNdMLslo7hHe+j2PB
HL/b8z9XzATpbtODJRBQzNtN+WNAmhred/CnRIoMElJcPKDPMHvw2p4673htHNlU
iFPqHZsStD97qeU0RbcLQWQD3e6KhLSZEGU9Ct9cet2mlTKYN+Q=
=rc+N
-----END PGP SIGNATURE-----

11
kdiff3.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Dec 8 11:05:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 1.12.0
* Completed port away from Qt5, 6.6 now required version due
to delayed ICU support in Qt
* Fixed UTF-8-BOM output encoding issues mustly seen on windows.
* horizontal scroll correctly comptuted for diff windows
* False errors on first launch with files selected should be fixed.
(kde#497102, boo#1234260)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 20 12:44:08 UTC 2024 - Christophe Marin <christophe@krop.fr> Wed Nov 20 12:44:08 UTC 2024 - Christophe Marin <christophe@krop.fr>

10
kdiff3.spec
View File

@ -21,7 +21,7 @@
%bcond_without released %bcond_without released
Name: kdiff3 Name: kdiff3
Version: 1.11.5 Version: 1.12.0
Release: 0 Release: 0
Summary: Code Comparison Utility Summary: Code Comparison Utility
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -31,9 +31,11 @@ Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x
Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
Source2: kdiff3.keyring Source2: kdiff3.keyring
%endif %endif
BuildRequires: boost-devel >= 1.71 BuildRequires: cmake >= 3.22
BuildRequires: boost-devel >= 1.82
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: pkgconfig
BuildRequires: cmake(KF6Config) >= %{kf6_version} BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
BuildRequires: cmake(KF6Crash) >= %{kf6_version} BuildRequires: cmake(KF6Crash) >= %{kf6_version}
@ -48,6 +50,8 @@ BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version}
BuildRequires: cmake(Qt6Test) >= %{qt6_version} BuildRequires: cmake(Qt6Test) >= %{qt6_version}
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
BuildRequires: pkgconfig(icu-i18n) >= 70.0
BuildRequires: pkgconfig(icu-uc) >= 70.0
%description %description
KDiff3 is a program that: KDiff3 is a program that:
@ -64,7 +68,7 @@ KDiff3 is a program that:
%autosetup -p1 %autosetup -p1
%build %build
%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE %cmake_kf6
%kf6_build %kf6_build