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

Update to 1.11.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=50
This commit is contained in:
Christophe Marin 2024-05-21 07:45:10 +00:00 committed by Git OBS Bridge
parent 33163a13ab
commit aea7cf2f8e
6 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kdiff3-1.10.7.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmWQpWAACgkQ9EKzbWFL
BrzLFhAAqPqGaXo/1humB7jxygjepZFMU+0Su95jn7wCQ58BVx8HRyZHusm9f8jA
iNnZhq2oQC1Ia8c4IvzgIKWwgUe26krJ+dlKl2csLDCi9/VuMNQFB+ors1qUhb3f
zVMEStsC7Zj70ek3CsAow6NJBgyHTV1LGH9GDDIXmfapZHOuyY3BK0SqEbJqrHMG
WmohWFrb+6K31HDEUW1HC+CjtvL5y3cy3VZlhfgA8y5UKQQzGBC0+S7zy/mcgK4N
PKuclKrVAHAUs7NOOc74a/ysa+gl/PsD6I4U/EUl4e6zXhXd1N+cOdls4G9QkDPp
DSPPwDylMdkmPCfWUNd8eqw1sfEDuyKd5LwVQeBco8T3c5tWpCnMXbhjlo3C6ndh
wxFBnJ1qDAlLFNhDrNspwwz1jKiN6vNLNo0LlFp70MrTIsIQ9Ul8c38u5YqSRiNb
xlzKQJsfENS/Mmt9Z5zTMIg6GrB7IgbvrB6RW/9wm3YktQEaVDpk1WEZKBI/Gk1z
GSDEMlZEBa3b+xArCVo1zP5stWBm9cTeu9+aE3dNsxqWsSzrDlcx4N98TFDNI8OW
JkMqM0f7JFFMQS3ImPvBnxECVC+M2cO4ZJ3gQds/kkEx8KSbcdhPJfoYO3Nva61I
BVVoNaiF26n5do6U+uYkC+01nTMrCNigVyFhs/sAAJMWMweWi2s=
=0IFD
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmZKuXUACgkQ9EKzbWFL
Brw4VQ/+KnP+dY3UUCvqF7Zp2l3iPAswyHZlhLtMFf/0iaJvFrqqD0zcffwoVFLS
saK++Jj52SR2+TxrbeVT4GMwAbGVMZNJetmL+GqKAvKTavgcTjkShByHne/Aff95
TGYWF/UDnsFGquaMNq15En2Stkl64qteCDcAToM1E2P2T3L48VhJl9KQNI0dDMPA
VEXOERgh+2R1cQ7fMxhaxlcVPioLW05lJa0cpWtNCpjticMGfzyTnXLsPLCR4L1v
kh5GuR5vn1WSFAAvzKFNVs4chzRJbu+Apm37srFU5MfzUvVL0abkmvTjcAxC6w2N
YRqkD59iNvMDj5ldRPeXEG+MYc/2xMcBODfN1Uf0ARkd56cCknFm0vztHqBcMB74
uRrVMB/xnSWBXKaquyyjhtBEAH4Ljg6NZ9hyA4EAKjXpYVm6wGrS1PuYLus5LFDn
t70QejHAjWuVahJ40sfJLh/CF74aJpW4M7XxsaAAAY3OO2fanWHFofFn2V7Qhd42
M0VWIWmdexzGN8BRpkcdmwSfEmHaKa26/mVGYWUFBeGkCC1LAa2CE2rAINmRjgpD
aaHgMe15eK4Wh/YnlsfEPcCucLzf6uQQinqUyI8cJ8ASDiltduADh4i7NbPiVwRg
oUqVcrSWFBjzQhQ3vqZ9ORIlcVeyrRa1r71YCMUg+N8QrnfIoFs=
=fkFi
-----END PGP SIGNATURE-----

13
kdiff3.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue May 21 07:39:29 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 1.11.1.
* kparts is no longer needed
* Don't set invalid first line if line < visableLines
* Actually wait for event loop to exit in
ProgressDialog::enterEventLoop
* Don't kill KJob on hide
* Cleanup resize code
* Limit new line computation to 0
* Fix broken getBestFirstLine calcucation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 25 08:35:20 UTC 2024 - Wolfgang Bauer <wbauer1@a1.net> Thu Jan 25 08:35:20 UTC 2024 - Wolfgang Bauer <wbauer1@a1.net>

80
kdiff3.spec
View File

@ -16,9 +16,12 @@
# #
%define kf6_version 6.0.0
%define qt6_version 6.6.0
%bcond_without released %bcond_without released
Name: kdiff3 Name: kdiff3
Version: 1.10.7 Version: 1.11.1
Release: 0 Release: 0
Summary: Code Comparison Utility Summary: Code Comparison Utility
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -28,30 +31,24 @@ 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
# PATCH-FIX-OPENSUSE BuildRequires: boost-devel >= 1.80.0
Patch0: Fix-linking-with-boost-1.75.0.patch BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
%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: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: kf5-filesystem
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF6Crash) >= %{kf6_version}
BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF6I18n) >= %{kf6_version}
BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF6KIO) >= %{kf6_version}
BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version}
BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version}
BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version}
BuildRequires: cmake(Qt6Test) >= %{qt6_version}
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
%description %description
KDiff3 is a program that: KDiff3 is a program that:
@ -68,37 +65,32 @@ KDiff3 is a program that:
%autosetup -p1 %autosetup -p1
%build %build
%cmake_kf5 -d build -- -DBUILD_autotests=FALSE %cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
%cmake_build
%kf6_build
%install %install
%kf5_makeinstall -C build %kf6_install
%suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File %suse_update_desktop_file -r org.kde.kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
%find_lang %{name} %{name}.lang --with-man %find_lang %{name} --all-name --with-man --with-html
%find_lang diff_ext %{name}.lang
%find_lang kdiff3fileitemactionplugin %{name}.lang
%{kf5_find_htmldocs}
%fdupes %{buildroot} %fdupes %{buildroot}
%files %files
%license LICENSES/* %license LICENSES/*
%doc %lang(en) %{_kf5_htmldir}/en/kdiff3 %doc %lang(en) %{_kf6_htmldir}/en/kdiff3/
%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man} %doc %lang(en) %{_kf6_mandir}/man1/kdiff3.1%{?ext_man}
%dir %{_kf5_plugindir}/kf5/kfileitemaction %{_kf6_applicationsdir}/org.kde.kdiff3.desktop
%dir %{_kf5_plugindir}/kf5/parts %{_kf6_appstreamdir}/org.kde.kdiff3.appdata.xml
%{_kf5_applicationsdir}/org.kde.kdiff3.desktop %{_kf6_bindir}/kdiff3
%{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml %{_kf6_iconsdir}/hicolor/*/apps/kdiff3.png
%{_kf5_bindir}/kdiff3 %{_kf6_iconsdir}/hicolor/scalable/apps/kdiff3.svgz
%{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png %dir %{_kf6_plugindir}/kf6/kfileitemaction
%{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz %{_kf6_plugindir}/kf6/kfileitemaction/kdiff3fileitemaction.so
%{_kf5_kxmlguidir}/kdiff3/
%{_kf5_kxmlguidir}/kdiff3part/
%{_kf5_plugindir}/kf5/kfileitemaction/kdiff3fileitemaction.so
%{_kf5_plugindir}/kf5/parts/kdiff3part.so
%{_kf5_servicesdir}/kdiff3part.desktop
%files lang -f %{name}.lang %files lang -f %{name}.lang
%exclude %{_kf6_htmldir}/en/kdiff3
%changelog %changelog