Commit Graph

41 Commits

Author SHA256 Message Date
Dominique Leuenberger
4fe4e2be17 Accepting request 893302 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/893302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=36
2021-05-15 21:16:19 +00:00
Luca Beltrame
11d8f46594 Accepting request 893301 from home:wolfi323:branches:KDE:Extra
- 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

OBS-URL: https://build.opensuse.org/request/show/893301
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=25
2021-05-15 12:00:57 +00:00
Christophe Giboudeaux
b1feb2780c OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=24 2021-05-05 06:11:27 +00:00
Dominique Leuenberger
7f2c4cb344 Accepting request 889927 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/889927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=35
2021-05-03 20:08:12 +00:00
Wolfgang Bauer
cb31a7c640 Accepting request 889922 from home:cgiboudeaux:branches:KDE:Extra
- 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

OBS-URL: https://build.opensuse.org/request/show/889922
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=22
2021-05-03 07:39:18 +00:00
Richard Brown
e1e672d57e Accepting request 876932 from KDE:Extra
- Use a _service file to exclude the windows_installer folder.

- 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

OBS-URL: https://build.opensuse.org/request/show/876932
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=34
2021-03-05 12:45:07 +00:00
Christophe Giboudeaux
70679aa947 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=20 2021-03-05 09:10:19 +00:00
Christophe Giboudeaux
bb6cb0c920 Exclude files
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=19
2021-03-05 09:05:36 +00:00
Luca Beltrame
1859836aa6 Accepting request 865654 from home:wolfi323:branches:KDE:Extra
- 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

OBS-URL: https://build.opensuse.org/request/show/865654
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=18
2021-01-22 07:45:47 +00:00
Dominique Leuenberger
e7739c6750 Accepting request 831684 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/831684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=33
2020-09-04 09:12:01 +00:00
Luca Beltrame
c99bdbc17a Accepting request 831678 from home:wolfi323:branches:KDE:Extra
- 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

OBS-URL: https://build.opensuse.org/request/show/831678
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=16
2020-09-03 13:02:47 +00:00
Christophe Giboudeaux
03bbefed75 cleanup
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=15
2020-08-27 09:31:13 +00:00
Dominique Leuenberger
a36f6ae3b6 Accepting request 817200 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/817200
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=32
2020-06-26 19:48:39 +00:00
Christophe Giboudeaux
b9b51c8d39 Accepting request 817051 from home:wolfi323:branches:KDE:Extra
- 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)

OBS-URL: https://build.opensuse.org/request/show/817051
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=13
2020-06-26 07:35:09 +00:00
Dominique Leuenberger
6909661b9e Accepting request 789753 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/789753
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=31
2020-03-30 21:05:24 +00:00
Christophe Giboudeaux
2c072357eb 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
2020-03-30 12:07:33 +00:00
Dominique Leuenberger
e6b6ce4979 Accepting request 704043 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/704043
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=30
2019-06-18 12:55:51 +00:00
Luca Beltrame
bcbb0cfb1e Accepting request 704041 from home:wolfi323:branches:KDE:Extra
- Update to 1.8.1:
  * Fix enabling of delta movement (kde#407562)

OBS-URL: https://build.opensuse.org/request/show/704041
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=9
2019-05-19 11:42:38 +00:00
Christophe Giboudeaux
d2e26c0a60 Accepting request 702848 from home:wolfi323:branches:KDE:Extra
- 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

OBS-URL: https://build.opensuse.org/request/show/702848
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=8
2019-05-14 12:49:21 +00:00
61c0089b8b Revert kde4_runtime_requires changes
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=7
2016-12-08 20:02:30 +00:00
Dominique Leuenberger
9efdbfd0af Accepting request 442648 from KDE:Extra
1

OBS-URL: https://build.opensuse.org/request/show/442648
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=29
2016-12-01 09:27:39 +00:00
c57d40789c Accepting request 442595 from home:olh:branches:KDE:Extra
Expand macro kde4_runtime_requires only when its available to fix quilt setup

OBS-URL: https://build.opensuse.org/request/show/442595
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=5
2016-11-29 09:24:55 +00:00
Dominique Leuenberger
5a3d44f4cc Accepting request 313555 from KDE:Extra
1

OBS-URL: https://build.opensuse.org/request/show/313555
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=28
2015-06-24 19:06:30 +00:00
Raymond Wooninck
9882aad002 Accepting request 313387 from home:wolfi323:branches:KDE:Extra
- 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)

OBS-URL: https://build.opensuse.org/request/show/313387
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=3
2015-06-24 13:12:54 +00:00
Tomáš Chvátal
dead9b9fdb Accepting request 204948 from KDE:Extra
BuildRequire only libkde4-devel, instead of kdebase4-workspace-devel

OBS-URL: https://build.opensuse.org/request/show/204948
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=26
2013-10-30 14:38:51 +00:00
Stephan Kulow
9c1c59eed1 Accepting request 174783 from KDE:Distro:Factory
- Add kdiff3-fix-save-relative-path.patch: fix saving merged
  files.  Patch is from: https://bugs.archlinux.org/task/31813
  and is already upstream. (forwarded request 174711 from aspiers)

OBS-URL: https://build.opensuse.org/request/show/174783
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=24
2013-05-16 14:50:14 +00:00
Stephan Kulow
e42bd66e8e Accepting request 143294 from KDE:Distro:Factory
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/143294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=22
2012-12-03 08:42:35 +00:00
Stephan Kulow
05104a980b replace license with spdx.org variant
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=20
2011-12-06 17:21:33 +00:00
Lars Vogdt
1075bf13a0 Accepting request 87458 from KDE:Distro:Factory
- 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

OBS-URL: https://build.opensuse.org/request/show/87458
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=18
2011-10-12 14:12:37 +00:00
Ruediger Oertel
f26578dd79 Accepting request 86795 from KDE:Distro:Factory
forward to factory

OBS-URL: https://build.opensuse.org/request/show/86795
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=17
2011-10-06 14:36:35 +00:00
OBS User autobuild
9c70b59108 Accepting request 45277 from KDE:Distro:Factory
Copy from KDE:Distro:Factory/kdiff3 based on submit request 45277 from user Beineri

OBS-URL: https://build.opensuse.org/request/show/45277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=15
2010-08-10 10:50:05 +00:00
OBS User autobuild
88e81841e1 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=12 2010-03-18 14:56:54 +00:00
OBS User autobuild
ee5fa1dd2d Accepting request 34300 from KDE:KDE4:Factory:Desktop
Copy from KDE:KDE4:Factory:Desktop/kdiff3 based on submit request 34300 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34300
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=11
2010-03-08 17:17:47 +00:00
OBS User unknown
4b805410c3 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=9 2009-05-20 10:59:47 +00:00
OBS User unknown
0c1ef330e5 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=8 2009-03-08 23:20:22 +00:00
OBS User unknown
2598bc592f OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=7 2009-02-26 16:10:42 +00:00
OBS User unknown
4bb3a8459a OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=6 2009-02-16 00:23:13 +00:00
OBS User unknown
9875e02a19 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=5 2008-11-17 16:09:01 +00:00
OBS User unknown
fc8890616a OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=3 2007-06-13 22:38:14 +00:00
OBS User unknown
4c7a077e58 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=2 2007-04-16 07:06:02 +00:00
OBS User unknown
81780c6c77 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=1 2007-01-15 23:19:58 +00:00