From aea7cf2f8e4a27836b3eef9b825d6f888a4153f764055f7b87d9faaac0eb11d3 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 21 May 2024 07:45:10 +0000 Subject: [PATCH 1/3] Update to 1.11.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=50 --- kdiff3-1.10.7.tar.xz | 3 -- kdiff3-1.10.7.tar.xz.sig | 16 -------- kdiff3-1.11.1.tar.xz | 3 ++ kdiff3-1.11.1.tar.xz.sig | 16 ++++++++ kdiff3.changes | 13 +++++++ kdiff3.spec | 80 ++++++++++++++++++---------------------- 6 files changed, 68 insertions(+), 63 deletions(-) delete mode 100644 kdiff3-1.10.7.tar.xz delete mode 100644 kdiff3-1.10.7.tar.xz.sig create mode 100644 kdiff3-1.11.1.tar.xz create mode 100644 kdiff3-1.11.1.tar.xz.sig diff --git a/kdiff3-1.10.7.tar.xz b/kdiff3-1.10.7.tar.xz deleted file mode 100644 index 723d1d5..0000000 --- a/kdiff3-1.10.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba3f4acbf4ac748aebefc85f59caf653d45fe859a48c34af89918224a767c5e3 -size 1131212 diff --git a/kdiff3-1.10.7.tar.xz.sig b/kdiff3-1.10.7.tar.xz.sig deleted file mode 100644 index e49bef7..0000000 --- a/kdiff3-1.10.7.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/kdiff3-1.11.1.tar.xz b/kdiff3-1.11.1.tar.xz new file mode 100644 index 0000000..828f6b8 --- /dev/null +++ b/kdiff3-1.11.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30f14a5ab6e0d55116829178d827654c30e8421c04fe9700d3ce67a530846298 +size 1140680 diff --git a/kdiff3-1.11.1.tar.xz.sig b/kdiff3-1.11.1.tar.xz.sig new file mode 100644 index 0000000..a1fd341 --- /dev/null +++ b/kdiff3-1.11.1.tar.xz.sig @@ -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----- diff --git a/kdiff3.changes b/kdiff3.changes index 03dceed..acef2cf 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue May 21 07:39:29 UTC 2024 - Christophe Marin + +- 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 diff --git a/kdiff3.spec b/kdiff3.spec index 6113107..9cc8b04 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -16,9 +16,12 @@ # +%define kf6_version 6.0.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kdiff3 -Version: 1.10.7 +Version: 1.11.1 Release: 0 Summary: Code Comparison Utility 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 Source2: kdiff3.keyring %endif -# PATCH-FIX-OPENSUSE -Patch0: 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: boost-devel >= 1.80.0 +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} 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) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} %description KDiff3 is a program that: @@ -68,37 +65,32 @@ KDiff3 is a program that: %autosetup -p1 %build -%cmake_kf5 -d build -- -DBUILD_autotests=FALSE -%cmake_build +%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install + %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 diff_ext %{name}.lang -%find_lang kdiff3fileitemactionplugin %{name}.lang -%{kf5_find_htmldocs} +%find_lang %{name} --all-name --with-man --with-html %fdupes %{buildroot} %files %license LICENSES/* -%doc %lang(en) %{_kf5_htmldir}/en/kdiff3 -%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man} -%dir %{_kf5_plugindir}/kf5/kfileitemaction -%dir %{_kf5_plugindir}/kf5/parts -%{_kf5_applicationsdir}/org.kde.kdiff3.desktop -%{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml -%{_kf5_bindir}/kdiff3 -%{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png -%{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz -%{_kf5_kxmlguidir}/kdiff3/ -%{_kf5_kxmlguidir}/kdiff3part/ -%{_kf5_plugindir}/kf5/kfileitemaction/kdiff3fileitemaction.so -%{_kf5_plugindir}/kf5/parts/kdiff3part.so -%{_kf5_servicesdir}/kdiff3part.desktop +%doc %lang(en) %{_kf6_htmldir}/en/kdiff3/ +%doc %lang(en) %{_kf6_mandir}/man1/kdiff3.1%{?ext_man} +%{_kf6_applicationsdir}/org.kde.kdiff3.desktop +%{_kf6_appstreamdir}/org.kde.kdiff3.appdata.xml +%{_kf6_bindir}/kdiff3 +%{_kf6_iconsdir}/hicolor/*/apps/kdiff3.png +%{_kf6_iconsdir}/hicolor/scalable/apps/kdiff3.svgz +%dir %{_kf6_plugindir}/kf6/kfileitemaction +%{_kf6_plugindir}/kf6/kfileitemaction/kdiff3fileitemaction.so %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kdiff3 %changelog From 2bdb39625725cc860229d104245494c83588f6f77b1e850ed64a2166ff9f7917 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 21 May 2024 07:45:54 +0000 Subject: [PATCH 2/3] Update to 1.11.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=51 --- kdiff3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdiff3.spec b/kdiff3.spec index 9cc8b04..f254a8d 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -31,7 +31,7 @@ Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x Source1: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig Source2: kdiff3.keyring %endif -BuildRequires: boost-devel >= 1.80.0 +BuildRequires: boost-devel >= 1.71 BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes BuildRequires: update-desktop-files From e05df7461e3223c5caba62a81e90d075465a085c71d0a9a74cd6d86359a7a403 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 21 May 2024 07:51:04 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=52 --- Fix-linking-with-boost-1.75.0.patch | 42 ----------------------------- kdiff3.changes | 2 ++ 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 Fix-linking-with-boost-1.75.0.patch diff --git a/Fix-linking-with-boost-1.75.0.patch b/Fix-linking-with-boost-1.75.0.patch deleted file mode 100644 index b450da1..0000000 --- a/Fix-linking-with-boost-1.75.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e446ad2f7fd795d7d2afa654262c77cdbc45ea4a 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 | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/TypeUtils.h b/src/TypeUtils.h -index a9c3ba2..ab735ba 100644 ---- a/src/TypeUtils.h -+++ b/src/TypeUtils.h -@@ -14,6 +14,17 @@ - #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 - #include - --- -2.40.1 - diff --git a/kdiff3.changes b/kdiff3.changes index acef2cf..a9cff3d 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -10,6 +10,8 @@ Tue May 21 07:39:29 UTC 2024 - Christophe Marin * Cleanup resize code * Limit new line computation to 0 * Fix broken getBestFirstLine calcucation +- Drop obsolete patch: + * Fix-linking-with-boost-1.75.0.patch ------------------------------------------------------------------- Thu Jan 25 08:35:20 UTC 2024 - Wolfgang Bauer