From 2c072357ebb97ad9a7a90cb783b2706bf82a8572abd819018229fa7f289bfe47 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 30 Mar 2020 12:07:33 +0000 Subject: [PATCH] Accepting request 789696 from home:wolfi323:branches:KDE:Extra - 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) OBS-URL: https://build.opensuse.org/request/show/789696 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=11 --- kdiff3-1.8.1.tar.xz | 3 --- kdiff3-1.8.2.tar.xz | 3 +++ kdiff3.changes | 46 +++++++++++++++++++++++++++++++++++++++++++++ kdiff3.spec | 4 ++-- 4 files changed, 51 insertions(+), 5 deletions(-) delete mode 100644 kdiff3-1.8.1.tar.xz create mode 100644 kdiff3-1.8.2.tar.xz diff --git a/kdiff3-1.8.1.tar.xz b/kdiff3-1.8.1.tar.xz deleted file mode 100644 index b79627c..0000000 --- a/kdiff3-1.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7877c0f38d24f35edc6c61353fe6e12790aaa285663fe403133e4fc00bcf436e -size 897692 diff --git a/kdiff3-1.8.2.tar.xz b/kdiff3-1.8.2.tar.xz new file mode 100644 index 0000000..97e7788 --- /dev/null +++ b/kdiff3-1.8.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb7154778491dc11b9bd38465164ce1a7c2d1810f70a57cd4268ffad42d5bb68 +size 1039304 diff --git a/kdiff3.changes b/kdiff3.changes index b0dbec8..d3d5a86 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +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 diff --git a/kdiff3.spec b/kdiff3.spec index 0a5ab81..11cb5df 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_without lang Name: kdiff3 -Version: 1.8.1 +Version: 1.8.2 Release: 0 Summary: Code Comparison Utility License: GPL-2.0-or-later