From 3c2e484ff2d870d11855dd871d986ffa674c8438c9eaa3f4c04a2745212986ff Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 8 Dec 2024 11:08:02 +0000 Subject: [PATCH 1/3] 1.12.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=62 --- .gitattributes | 23 ++ .gitignore | 1 + kdiff3-1.11.2.tar.xz | 3 + kdiff3-1.11.2.tar.xz.sig | 16 ++ kdiff3-1.11.4.tar.xz | 3 + kdiff3-1.11.4.tar.xz.sig | 16 ++ kdiff3-1.11.5.tar.xz | 3 + kdiff3-1.11.5.tar.xz.sig | 16 ++ kdiff3-1.12.0.tar.xz | 3 + kdiff3-1.12.0.tar.xz.sig | 16 ++ kdiff3.changes | 512 +++++++++++++++++++++++++++++++++++++++ kdiff3.keyring | Bin 0 -> 12045 bytes kdiff3.spec | 93 +++++++ 13 files changed, 705 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 kdiff3-1.11.2.tar.xz create mode 100644 kdiff3-1.11.2.tar.xz.sig create mode 100644 kdiff3-1.11.4.tar.xz create mode 100644 kdiff3-1.11.4.tar.xz.sig create mode 100644 kdiff3-1.11.5.tar.xz create mode 100644 kdiff3-1.11.5.tar.xz.sig create mode 100644 kdiff3-1.12.0.tar.xz create mode 100644 kdiff3-1.12.0.tar.xz.sig create mode 100644 kdiff3.changes create mode 100644 kdiff3.keyring create mode 100644 kdiff3.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/kdiff3-1.11.2.tar.xz b/kdiff3-1.11.2.tar.xz new file mode 100644 index 0000000..d5edba9 --- /dev/null +++ b/kdiff3-1.11.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91853775c3faa9522468ec123cd6de74662acb6d5116475996aca4dc2c3befc8 +size 1141676 diff --git a/kdiff3-1.11.2.tar.xz.sig b/kdiff3-1.11.2.tar.xz.sig new file mode 100644 index 0000000..fe0ff61 --- /dev/null +++ b/kdiff3-1.11.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmZ/E8QACgkQ9EKzbWFL +BrwypQ//U2cjRvx1ygtZmRxGYAYz66V9BY+eXkPmonGMCpquIMof6adUXNSimOdv +DTO+NW3pXc42SDQalXx5u4xweboCRtaIaN/5huqbjXlBFKUDXkgOJoqrTlIYZ0j9 +rj80DphcFuFTlHaaLI/ZC+CKk/SabyATEsf3w/n/sCvzSlTcY2TpLYVrtv6WbTfz +9y04cRxFcDwEg2dvZ0EAbQAj2fqJaDKR412seM9+O5U6xXD35Z0lNesAzUmh2s3G +VZ59BKxjL6CNTtv+zWpVrohO3GFm5M2YUMYf0Xq/biVUqBwS2l243dlfJxHf5RDB +hi0SoURJePjfc9e5BuSWVRVgf5l82XaGIvUmKn82sJ4Xq1eSvUwl7dhsWvGg5tCn +1CRV7dkjBn/DdDY6vnDvv4PkxKaZuS6B7DzeLilkZfzd3xpDK/GjT+6gsQfZMl1h +3Q9jUyM3kJM/1/7vTeFOncHhyVq5esoq5DXPJz7/HFewssY9Aje5t9trCVZXySPN +IziuneKvPr1VTNAOHe9KbBck1NMYvY5oC0cYCjX+RaBThPVsr+rWqCTrH3iDGfl7 +pw3wrbAKd3p3uT0tUzfL96iIyXxJ0FL38js8GM/n6/Ge0ypmUfnRGIwyWABNrfpk +AIF4RGUuu3nZ2+cRQ5Pj3D+SjdfNoqQudMSBwBRTyM28ZbYxxvk= +=6RVB +-----END PGP SIGNATURE----- diff --git a/kdiff3-1.11.4.tar.xz b/kdiff3-1.11.4.tar.xz new file mode 100644 index 0000000..39725ab --- /dev/null +++ b/kdiff3-1.11.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aede7bdc9aa9675aee90fd2a3527052ed31b30918d42e6907a592cba7ce6a7c3 +size 1142276 diff --git a/kdiff3-1.11.4.tar.xz.sig b/kdiff3-1.11.4.tar.xz.sig new file mode 100644 index 0000000..14f8571 --- /dev/null +++ b/kdiff3-1.11.4.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmbgwToACgkQ9EKzbWFL +BrzuYw//bUBbRiwfdzQvmXuVC7y34DThoPXLWiTYRo5KzDctw1/efYEP36JQDqJ5 +DWwuvRDY5QzBpBfe7LOqQCk1TCxtI4csHc25rk0VnDZtxjiKdLgNssvwwKAdLqty +CtuuhkjwVtwd/Ihju6w/Q/bvF4InBoxkj51bYYYVBkNhYmooAYOXzDvlXZLn92rZ +5wa8bTAK9eV1R51zS2HvWCxN1EqKNcTzNGdc+0+vNsS2Llfu9tk5hRrt3kMqDDkY +lluEbMb/rskAOgFICZE6Pw3oI5xa7njecsaQy0HlaJFeOk6yKQJOOLxxQa3DoT6Z +bGkiY/8A0YaICfJg8khhIiPRQkHEpqkfJSMgDG3kmUHoFhlTnGMbDvfjqAoYFwbU +YQK/N4zeW5HzZ03VSFNPgbLrjErC/TaeSuagFVFXejrtZdzTaumxOtilsJ1DhJss +6lnCQaLMuqxlhDe2P/ZYiYaDdOLUXFd7AQrNdV1vpOKRXbN88trh3LKQo3tEDTPD +3MP+ptpXVe2YOmBlTtIxe1Bnisda2wnhCkKJ0wlG32MUcKiK2tzuXrTWJzJfCSKi +ah/rC28hFU7QQokHgu/WqbfXwaR9lz9SMvJHYzdc5imbA52mhiI6ruAfbpr09CnF +g0HIyAjkyYfBnei8aCka7ByZlzk/VFoYJ14cvBfNUWnbYJgI/n0= +=daOY +-----END PGP SIGNATURE----- diff --git a/kdiff3-1.11.5.tar.xz b/kdiff3-1.11.5.tar.xz new file mode 100644 index 0000000..fb57364 --- /dev/null +++ b/kdiff3-1.11.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:420f18b3b9689698a05e102f8a41719049074da68f96c94be18d1b8297eeb545 +size 1142840 diff --git a/kdiff3-1.11.5.tar.xz.sig b/kdiff3-1.11.5.tar.xz.sig new file mode 100644 index 0000000..638c8aa --- /dev/null +++ b/kdiff3-1.11.5.tar.xz.sig @@ -0,0 +1,16 @@ +-----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----- diff --git a/kdiff3-1.12.0.tar.xz b/kdiff3-1.12.0.tar.xz new file mode 100644 index 0000000..da98f1d --- /dev/null +++ b/kdiff3-1.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f93a065df8b2d70f22eb473c2dbfaad975c70341f37a918eb6ebb452771bacd6 +size 1204256 diff --git a/kdiff3-1.12.0.tar.xz.sig b/kdiff3-1.12.0.tar.xz.sig new file mode 100644 index 0000000..094ab78 --- /dev/null +++ b/kdiff3-1.12.0.tar.xz.sig @@ -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----- diff --git a/kdiff3.changes b/kdiff3.changes new file mode 100644 index 0000000..24764bf --- /dev/null +++ b/kdiff3.changes @@ -0,0 +1,512 @@ +------------------------------------------------------------------- +Sun Dec 8 11:05:37 UTC 2024 - Christophe Marin + +- 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 + +- Stop using the %suse_update_desktop_file macro + +------------------------------------------------------------------- +Fri Nov 8 12:43:47 UTC 2024 - Christophe Marin + +- Update to 1.11.5 + * Fix false memory error when using "admin://" protocol + * Cleanup BOM handling lock detection to only known UTF-* + encodings that use it. + * Fix bugged connection to non-existent signal (This is why + we now use new style connections only.) + * fix regression in diff margin color. + * fix crash on deleting first line in diff block + * fix merge encoding detection. + +------------------------------------------------------------------- +Tue Oct 1 21:09:52 UTC 2024 - Christophe Marin + +- Update to 1.11.4 + * Adapt Diff3Line::getLineData to handle being called on + non-existant lines + * Suppress clang warning for quirky QT "enum" use + * Pass over diff code completely if no data is loaded + * Do full clearing of all diff related lists when one is cleared + +------------------------------------------------------------------- +Mon Jul 1 09:25:11 UTC 2024 - Christophe Marin + +- Update to 1.11.2 + * Fixed encoding handling for non-UTF encodings + * Fixed encoding detection for lower case 'HTML' and 'XML' tags + +------------------------------------------------------------------- +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 +- Drop obsolete patch: + * Fix-linking-with-boost-1.75.0.patch + +------------------------------------------------------------------- +Thu Jan 25 08:35:20 UTC 2024 - Wolfgang Bauer + +- Update to 1.10.7 + * Correctly handle oversized files (kde#475176) + +------------------------------------------------------------------- +Thu Oct 5 08:25:35 UTC 2023 - Christophe Marin + +- Update to 1.10.6 + * Fix crash on exit + +------------------------------------------------------------------- +Wed Jul 12 16:11:42 UTC 2023 - Christophe Marin + +- Update to 1.10.5: + * Resolve thread safety issues in word wrap runner + +------------------------------------------------------------------- +Fri Jun 9 14:03:17 BST 2023 - Adam Spiers + +- Update to 1.10.4 + * Fixed no UI shown for failed auto-merge. +- Update to 1.10.3 + * Fix 469817 no text if word wrap is on. + +------------------------------------------------------------------- +Wed May 3 13:42:10 UTC 2023 - Christophe Marin + +- 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 + +- 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 + +- update to 1.9.6: + * Fix horizontal scroll to be by character not pixels + * Update window when ending selection mode. + +------------------------------------------------------------------- +Fri Mar 4 08:49:54 UTC 2022 - Wolfgang Bauer + +- Update to 1.9.5 + * Attempt encoding detection for non-BOM UTF-8 + * Rewrite EOL detection (kde#448353,kde#450225) + + fixes speed regression + + Better EOL detection decoding handled by Qt +- Drop redundant recommendation of the -lang package + +------------------------------------------------------------------- +Tue Nov 23 08:16:03 UTC 2021 - Wolfgang Bauer + +- Update to 1.9.4 + * Fix windows style cr/lf line ending handling (kde#442199) + * Fix race on exit if qt sends QApplication::focusChanged during + teardown (kde#444654) + +------------------------------------------------------------------- +Fri Aug 20 12:58:46 UTC 2021 - Wolfgang Bauer + +- Update to 1.9.3 + * Fix multiple regressions in file comparison + * Fix trailing EOL stripped (kde#437570) + * Fix arbitrary line insertion during merge (kde#437570) +- Drop 0001-Collected-fixes-from-master.patch, the relevant fixes + are included in this release + +------------------------------------------------------------------- +Mon Jun 28 13:10:55 UTC 2021 - Tilman Vogel + +- Remove GCC 11 build fix: + * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch + now contained in squashed patch +- Add collected fixes from upstream master: + * 0001-Collected-fixes-from-master.patch + contains the original and many more fixes: + + misalignment and wrong conflict resolutions when using manual + alignment markers + + uninitialized variables causing crashes + + hangs and crashes due to wrong loop conditions + + wrong handling of new-line at end-of-file + + spurious insertion of empty lines in merge result + + access of uninitialized iterators causing crashes + + wrong buffer length calculations causing out-of-bounds access + + wrong bit-logic causing comments to always be treated as white-space + + crashes when hitting a key on empty merge results + + technical details allowing fixes to be cherry-picked + +------------------------------------------------------------------- +Fri May 28 12:37:13 UTC 2021 - Christophe Giboudeaux + +- Add GCC 11 build fix: + * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch +- Drop the _service file. Upstream release doesn't contain + precompiled code anymore. + +------------------------------------------------------------------- +Mon May 17 08:14:30 UTC 2021 - Wolfgang Bauer + +- Update to 1.9.2 + * Remove erroneous #ifdef (kde#436958) + +------------------------------------------------------------------- +Sat May 15 11:24:25 UTC 2021 - Wolfgang Bauer + +- Update to 1.9.1 + * Hotfix for possible display problems (kde#436958) + * Add default shortcut for "Go to [Previous/Next] Unsolved + Conflict" (kde#436003) + * Port away from KIconThemes + +------------------------------------------------------------------- +Wed May 5 06:11:10 UTC 2021 - Christophe Giboudeaux + +- Update URL. + +------------------------------------------------------------------- +Mon May 3 06:37:18 UTC 2021 - Christophe Giboudeaux + +- Update to 1.9.0 + * Rewrite of SourceData::FileData::preprocess now only loops + through file contents once. + * Major rework of event handling + * Take advantage of Qt and boost signal/slot pattern to avoid + needless nullptr checks. + * Introduce LineRef wrapper class + * Add enum types and use existing ones. + * Split out doDirectoryCompare from improveFilenames + * Stop mis-using c style [] pointer access + +------------------------------------------------------------------- +Fri Mar 5 09:03:31 UTC 2021 - Christophe Giboudeaux + +- Use a _service file to exclude the windows_installer folder. + +------------------------------------------------------------------- +Fri Jan 22 06:40:24 UTC 2021 - wbauer@tmo.at + +- Update to 1.8.5: + * Fix url handling for drag and drop (kde#417189) + * Fix regression in handling paste from clipboard to blank diff + window (kde#426823) + * Fix link detection via KIO + * Drop custom event filter in OpenDialog. We now use + FileNameLineEdit instead as in the main window. + * Fix url/path handling bugs for remote files + * Don't ignore stat errors unless it tells us the file was not + found + +------------------------------------------------------------------- +Thu Sep 3 11:53:51 UTC 2020 - wbauer@tmo.at + +- Update to 1.8.4: + * Fix typos in man page (kde#424177) + * Fix compare over network with KIO (kde#408119) + * Restore contextmenu for Windows Explorer + +------------------------------------------------------------------- +Thu Aug 27 09:31:04 UTC 2020 - Christophe Giboudeaux + +- Spec cleanup + +------------------------------------------------------------------- +Thu Jun 25 11:49:33 UTC 2020 - wbauer@tmo.at + +- Update to 1.8.3: + * Fixed reload on Windows (kde#423001) + * Fixed error handling during directory compare + * Only give one error message per directory compare operation + * Fix crash when clipboard is not available (kde#419722) + * Rework initial window display and full screen toggling + * Treat /dev/null as non-existant as git expects (kde#421048) + +------------------------------------------------------------------- +Mon Mar 30 09:57:57 UTC 2020 - wbauer@tmo.at + +- Update to 1.8.2: + * Allowing editing of blank lines and don't mark newly inserted + lines as a conflict (kde#411472) + * Remove broken attempt to optimize drawing on horizontal scroll + * Fix line numbers not shown. Use QString::number directly not + through a format string. (kde#418813) + * Correctly support "Print Current Page" + * Don't attempt to free nullptr in SourceData::FileData::reset() + * Make Preference dialog panes scroll-able if too large to fit on + screen + * Fix dialog filter on windows + * Switch to QElapsedTime for timing avoids explicitly undefined + behavior inside qt if time is changed + * Fix sync mode + * Make matching in CvsIngnoreList always honor bCaseSensitive + setting + * Don't use temporary with QLatin1String constructor, strange + things will happen + * ignore oversized cvsignore files + * Fix '-L' parameter handling (kde#410962) + * Restore accidentally deleted --auto option + * Fixing missing menu items (kde#411602), also resolves a + potential crash in MergeResultWindow::slotUpdateAvailabilities + (kde#407745) + * Prevent intermittent crash during reload/refresh + * Show diff for empty/missing files (kde#410008) + * Don't give false error when comparing empty folders + * Close files when not in use - Fixes "Too many open files" bug + (kde#408991) + * Avoid crash when receiving mouse or key events during early + startup (kde#407829) + * Don't try to manually build url if parent is not set + * Fix crash when canceling by using only one event loop in + ProgressDialog + * Don't append to already complete url + * Fix manual url building in FileAccess::setFromUdsEntry - + scheme should not change now + * Fix craft install instructions for windows (kde#405918) + * Fix crash in OptionDialog::slotApply() (kde#411586) + * Fix crash in MergeResultWindow::slotUpdateAvailabilities + (kde#407745) + * Fixed redraw for horizontal scrolling (kde#407894, kde#399070) + +------------------------------------------------------------------- +Sun May 19 10:48:23 UTC 2019 - wbauer@tmo.at + +- Update to 1.8.1: + * Fix enabling of delta movement (kde#407562) + +------------------------------------------------------------------- +Tue May 14 10:22:41 UTC 2019 - wbauer@tmo.at + +- Update to 1.8: + * Ported to Qt5/KDE Frameworks 5 + * Bugfix: Show Identical files setting not applied after rescan + * Change parameter errors to use dialog on Linux as well as + console output + * Don't sort twice when sorting in reverse order + * Fix memory leak introduced in 0.9.91 + * Implement Cut/Paste + * Don't enable "Choose C for Everything" on two way merge + * Cleanup code +- Update package summary and description +- Run spec-cleaner + +------------------------------------------------------------------- +Thu Dec 8 19:58:01 UTC 2016 - fabian@ritter-vogt.de + +- Revert kde4_runtime_requires change + +------------------------------------------------------------------- +Tue Nov 29 07:20:36 UTC 2016 - olaf@aepfle.de + +- Expand macro kde4_runtime_requires only when its available + to fix quilt setup + +------------------------------------------------------------------- +Wed Jun 24 08:08:27 UTC 2015 - wbauer@tmo.at + +- update to 0.9.98: + * Text rendering now with QTextLayout fixes the following issues + + Correct handling for variable width fonts. + + Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac. + + Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts). + + Improved handling of Chinese and Japanese. + + Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences. + * Bugfixes. +- removed kdiff3-fix-save-relative-path.patch (included upstream) + +------------------------------------------------------------------- +Fri Jul 26 01:08:57 UTC 2013 - hrvoje.senjan@gmail.com + +- BuildRequire only libkde4-devel, instead of kdebase4-workspace-devel + +------------------------------------------------------------------- +Thu May 2 12:47:34 BST 2013 - aspiers@suse.com + +- Add kdiff3-fix-save-relative-path.patch: fix saving merged + files. Patch is from: https://bugs.archlinux.org/task/31813 + and is already upstream. + +------------------------------------------------------------------- +Tue Nov 20 16:10:19 UTC 2012 - nico.kruber@gmail.com + +- Fix the SLES build (%make_install is not expanded on SLES) + +------------------------------------------------------------------- +Tue Nov 20 16:08:20 UTC 2012 - nico.kruber@gmail.com + +- update to 0.9.97: + * Memory usage optimized for comparison of large directories. + * In overview for two way diff show if only one side contains text. + * If text is selected in either input or output window use that in Find dialog. + * Command line option --cs doesn't change the config value permanently anymore. + * Windows 64 bit specific installer. + * Bugfixes. +- removed libkdiff3part.so (not build anymore) + +------------------------------------------------------------------- +Wed Oct 12 00:28:44 CEST 2011 - dmueller@suse.de + +- update to 0.9.96: + * KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4 + * Parser for preprocessor commands. (Allows single apostrophs ') + * Fix crash on A/B-overview (infinite recursion) + * Fix clearcase temp files not deleted problem on windows + * KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore + * String corrections (Frederik Schwarzer) + * Fixed writing to KIO. + * Fixed white space merge default options + +------------------------------------------------------------------- +Sat Sep 17 21:04:19 UTC 2011 - toddrme2178@gmail.com + +- Removed checks for obsolete openSUSE versions (fix for RPMLINT warnings) +- Added check for duplicate files (fix for RPMLINT warning) +- Cleaned up spec file formatting + +------------------------------------------------------------------- +Tue Aug 10 09:34:13 UTC 2010 - beineri@opensuse.org + +- updated tarball to fix build + +------------------------------------------------------------------- +Mon Mar 8 10:10:17 UTC 2010 - coolo@novell.com + +- do not package docs in both subpackages + +------------------------------------------------------------------- +Wed May 20 12:08:02 CEST 2009 - beineri@opensuse.org + +- require kdiff3-lang + +------------------------------------------------------------------- +Fri Mar 6 12:15:12 CET 2009 - wstephenson@suse.de + +- update to 0.9.95: + * Show line end style for each file + * Translation update + * Bugfixes + +------------------------------------------------------------------- +Fri Feb 20 18:29:46 CET 2009 - dmueller@suse.de + +- update to 0.9.94: + * ported to KDE4 + * various smaller fixes + +------------------------------------------------------------------- +Sat Feb 14 12:34:47 CET 2009 - coolo@suse.de + +- call kde_post_install + +------------------------------------------------------------------- +Mon Nov 17 09:58:09 CET 2008 - stbinner@suse.de + +- install translations for kdiff3 menu plugin (bnc#442527) + +------------------------------------------------------------------- +Wed Jun 13 23:36:35 CEST 2007 - stbinner@suse.de + +- running fdupes makes kdiff3.rpm 348KB smaller + +------------------------------------------------------------------- +Sun Apr 15 22:51:34 CEST 2007 - stbinner@suse.de + +- update to version 0.9.92: + * KDE-Konqueror plugin: Launch KDiff3 from Konqueror. + * Temp file names use process id in file name for several instances. + * New File comparison mode: Trust the size and date, but use + binary comparison if date doesn't match (unsafe) + * Open dialog also shows current dirs in directory comparison mode. + * New option for history merge: Max number of history entries + * New option "Auto save and quit on merge without conflicts" + * Several Bugfixes + +------------------------------------------------------------------- +Sun Nov 5 10:20:48 CET 2006 - stbinner@suse.de + +- update to version 0.9.91: + * Unicode autodetection based on byte-order-mark. + * Fix for crash after double click below last line + * Saving of maximized window-state (Patch by Robert Vock) + * Separated Merge-options in own tab + * When pasting multiple lines into openfile dialog only first + line is kept + * Drawing in directory view fixed. + * When specifying a separate output dir then for equal files a + copy operation will also be offered. + +------------------------------------------------------------------- +Wed May 24 18:57:23 CEST 2006 - adrian@suse.de + +- fix build for < 10.1 + +------------------------------------------------------------------- +Tue May 16 09:22:18 CEST 2006 - stbinner@suse.de + +- update to version 0.9.90 + * Fixed KIO-problems of type "File exists" with tempfiles. + * Fix for manual alignment with 3 files which caused crash. + * Preserve executable bit when overwriting an existing file. + * Documentation and translations updated. + +------------------------------------------------------------------- +Mon Apr 10 11:00:58 CEST 2006 - stbinner@suse.de + +- update to version 0.9.89 + +------------------------------------------------------------------- +Wed Jan 25 21:28:12 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Oct 25 18:29:02 CEST 2005 - stbinner@suse.de + +- update to version 0.9.88 (unicode support) + +------------------------------------------------------------------- +Thu Feb 17 13:36:38 CET 2005 - adrian@suse.de + +- menu entry moved to xdg dir + +------------------------------------------------------------------- +Sat Sep 4 11:44:47 CEST 2004 - coolo@suse.de + +- fixing Makefile problems + +------------------------------------------------------------------- +Sat Aug 28 18:15:11 CEST 2004 - adrian@suse.de + +- initial package of version 0.9.86 + diff --git a/kdiff3.keyring b/kdiff3.keyring new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..db669ef40691a0f24a67f669102a7bd4a18f65008b487a7c14ef52c8fe6d1593 GIT binary patch literal 12045 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 1.71 +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: fdupes +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: + +* Compares or merges two or three text input files or directories +* Shows the differences line-by-line and character-by-character +* Provides an automatic merge facility and an integrated editor for + solving merge conflicts +* Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.) + +%lang_package + +%prep +%autosetup -p1 + +%build +%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE + +%kf6_build + +%install +%kf6_install + +%find_lang %{name} --all-name --with-man --with-html + +%fdupes %{buildroot} + +%files +%license LICENSES/* +%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 f24c8ab6bbbdcbc0de561a9133ff2eb2f40c1db0ff24c3b14d71297754677a15 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 8 Dec 2024 11:11:20 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=63 --- kdiff3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kdiff3.spec b/kdiff3.spec index f56480a..1d4fd46 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -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 Source2: kdiff3.keyring %endif -BuildRequires: boost-devel >= 1.71 +BuildRequires: cmake >= 3.22 +BuildRequires: boost-devel >= 1.82 BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes +BuildRequires: pkgconfig BuildRequires: cmake(KF6Config) >= %{kf6_version} BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} BuildRequires: cmake(KF6Crash) >= %{kf6_version} @@ -48,6 +50,8 @@ BuildRequires: cmake(Qt6Gui) >= %{qt6_version} BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} BuildRequires: cmake(Qt6Test) >= %{qt6_version} BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: pkgconfig(icu-i18n) >= 70.0 +BuildRequires: pkgconfig(icu-uc) >= 70.0 %description KDiff3 is a program that: From f7f0ba8d3802be0c6af33f30d5205d343f6f1947dad374b7981f55bb0f916592 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Sun, 8 Dec 2024 11:11:39 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=64 --- kdiff3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdiff3.spec b/kdiff3.spec index 1d4fd46..450f42f 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -68,7 +68,7 @@ KDiff3 is a program that: %autosetup -p1 %build -%cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE +%cmake_kf6 %kf6_build