pool/kdiff3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83 Commits 2 Branches 0 Tags 283 KiB
factory
Commit Graph

83 Commits

This Branch
This Branch
All Branches
Author SHA256 Message Date
Ana Guerrero
552c886da2 Accepting request 1229122 from KDE:Extra 
Update to 1.12.0

OBS-URL: https://build.opensuse.org/request/show/1229122
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=55
 2024-12-09 20:11:38 +00:00
Christophe Marin
f7f0ba8d38 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=64 2024-12-08 11:11:39 +00:00
Christophe Marin
f24c8ab6bb OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=63 2024-12-08 11:11:20 +00:00
Christophe Marin
3c2e484ff2 1.12.0 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=62
 2024-12-08 11:08:02 +00:00
Ana Guerrero
f6fd291475 Accepting request 1226906 from KDE:Extra 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1226906
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=54
 2024-11-27 21:15:09 +00:00
Christophe Marin
857fb4a956 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=60 2024-11-20 12:44:27 +00:00
Dominique Leuenberger
e53f5263a3 Accepting request 1222742 from KDE:Extra 
Update to 1.11.5

OBS-URL: https://build.opensuse.org/request/show/1222742
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=53
 2024-11-09 19:54:40 +00:00
Christophe Marin
6b9901f860 Update to 1.11.5 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=58
 2024-11-08 12:44:42 +00:00
Ana Guerrero
ca7dadcf06 Accepting request 1204995 from KDE:Extra 
Update to 1.11.4

OBS-URL: https://build.opensuse.org/request/show/1204995
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=52
 2024-10-02 19:33:30 +00:00
Christophe Marin
ff9a8e0475 1.11.4 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=56
 2024-10-01 21:15:02 +00:00
Ana Guerrero
5e2cc98cd6 Accepting request 1184265 from KDE:Extra 
Update to 1.11.2

OBS-URL: https://build.opensuse.org/request/show/1184265
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=51
 2024-07-02 16:16:57 +00:00
Christophe Marin
5f5d5e03e9 1.11.2 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=54
 2024-07-01 09:26:13 +00:00
Ana Guerrero
9732ab3a3d Accepting request 1175463 from KDE:Extra 
Update to 1.11.1

OBS-URL: https://build.opensuse.org/request/show/1175463
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=50
 2024-05-21 16:36:53 +00:00
Christophe Marin
e05df7461e OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=52 2024-05-21 07:51:04 +00:00
Christophe Marin
2bdb396257 Update to 1.11.1 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=51
 2024-05-21 07:45:54 +00:00
Christophe Marin
aea7cf2f8e Update to 1.11.1 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=50
 2024-05-21 07:45:10 +00:00
Ana Guerrero
a1fa15b8a5 Accepting request 1141460 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/1141460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=49
 2024-01-25 17:41:46 +00:00
Christophe Marin
33163a13ab Accepting request 1141456 from home:wolfi323:branches:KDE:Extra 
- Update to 1.10.7
  * Correctly handle oversized files (kde#475176)

OBS-URL: https://build.opensuse.org/request/show/1141456
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=48
 2024-01-25 09:04:59 +00:00
Ana Guerrero
64abceb621 Accepting request 1115857 from KDE:Extra 
Update to 1.10.6

OBS-URL: https://build.opensuse.org/request/show/1115857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=48
 2023-10-05 18:05:25 +00:00
Christophe Marin
4d26aef46a 1.10.6 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=46
 2023-10-05 08:42:59 +00:00
Ana Guerrero
cd10b179f1 Accepting request 1098397 from KDE:Extra 
Update to 1.10.5

OBS-URL: https://build.opensuse.org/request/show/1098397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=47
 2023-07-13 15:17:49 +00:00
Christophe Marin
5010c2250f 1.10.5 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=44
 2023-07-12 16:13:05 +00:00
Dominique Leuenberger
68492e8c82 Accepting request 1091825 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/1091825
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=46
 2023-06-11 17:54:34 +00:00
Fabian Vogt
8c99564959 Accepting request 1091806 from home:aspiers:branches:KDE:Extra 
- 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.

OBS-URL: https://build.opensuse.org/request/show/1091806
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=42
 2023-06-09 17:34:21 +00:00
Dominique Leuenberger
14fefbbe99 Accepting request 1084460 from KDE:Extra 
Update to 1.10.2

OBS-URL: https://build.opensuse.org/request/show/1084460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=45
 2023-05-04 15:10:45 +00:00
Christophe Marin
25ea3a28dc 1.10.2 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=40
 2023-05-03 16:06:21 +00:00
Dominique Leuenberger
e4355c5233 Accepting request 1058975 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/1058975
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=44
 2023-01-17 16:36:07 +00:00
Christophe Marin
de6364cf14 Accepting request 1058883 from home:wolfi323:branches:KDE:Extra 
- 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

OBS-URL: https://build.opensuse.org/request/show/1058883
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=38
 2023-01-17 13:25:32 +00:00
Dominique Leuenberger
6daa2f68ca Accepting request 1041175 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/1041175
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=43
 2022-12-08 15:50:43 +00:00
Christophe Marin
e5a3b02b6d Accepting request 1041169 from home:dirkmueller:Factory 
- update to 1.9.6:
  * Fix horizontal scroll to be by character not pixels
  * Update window when ending selection mode.

OBS-URL: https://build.opensuse.org/request/show/1041169
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=36
 2022-12-07 16:35:42 +00:00
Dominique Leuenberger
6d1c658bc4 Accepting request 959368 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/959368
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=42
 2022-03-04 19:17:03 +00:00
Christophe Giboudeaux
cdde62c23b Accepting request 959350 from home:wolfi323:branches:KDE:Extra 
- 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

OBS-URL: https://build.opensuse.org/request/show/959350
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=34
 2022-03-04 10:15:58 +00:00
Dominique Leuenberger
f8f4548d86 Accepting request 933231 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/933231
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=41
 2021-11-23 21:10:38 +00:00
Christophe Giboudeaux
bf3bd71356 Accepting request 933220 from home:wolfi323:branches:KDE:Extra 
- 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)

OBS-URL: https://build.opensuse.org/request/show/933220
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=33
 2021-11-23 09:31:58 +00:00
Dominique Leuenberger
343afec89c Accepting request 913377 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/913377
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=40
 2021-08-23 08:08:03 +00:00
Luca Beltrame
539478a16d Accepting request 913375 from home:wolfi323:branches:KDE:Extra 
- 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

OBS-URL: https://build.opensuse.org/request/show/913375
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=32
 2021-08-20 15:31:25 +00:00
Dominique Leuenberger
fac1d0ced2 Accepting request 902933 from KDE:Extra 
OBS-URL: https://build.opensuse.org/request/show/902933
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=39
 2021-06-29 20:43:18 +00:00
Christophe Giboudeaux
df2e03d319 Accepting request 902836 from home:tivo:branches:openSUSE:Factory 
The latest kdiff3 currently shipped with Tumbleweed is unsuitable for everyday use. I, for example, use it as my go-to `git mergetool` and I need that a lot. And it must be reliable and not messing up merge-output. Since the upgrade from 1.8.4 to 1.9.2, many regressions have to be experienced, please see the list of fixed issues below. 

From a distribution point of view, I see two options: Fix-up 1.9.2 like proposed here, or (really!) downgrade to 1.8.5 until a new reliable 1.9 release comes out. I have contributed many fixes to upstream meanwhile.

- 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

OBS-URL: https://build.opensuse.org/request/show/902836
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=31
 2021-06-29 06:37:21 +00:00
Dominique Leuenberger
414805eb95 Accepting request 895983 from KDE:Extra 
- 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.

OBS-URL: https://build.opensuse.org/request/show/895983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=38
 2021-06-01 08:38:17 +00:00
Christophe Giboudeaux
b56c3bbcc3 build fix 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=29
 2021-05-28 12:47:00 +00:00
Dominique Leuenberger
7afde466ce Accepting request 893581 from KDE:Extra 
- Update to 1.9.2
  * Remove erroneous #ifdef (kde#436958) (forwarded request 893578 from wolfi323)

OBS-URL: https://build.opensuse.org/request/show/893581
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=37
 2021-05-17 16:45:09 +00:00
Fabian Vogt
37aa973413 Accepting request 893578 from home:wolfi323:branches:KDE:Extra 
- Update to 1.9.2
  * Remove erroneous #ifdef (kde#436958)

OBS-URL: https://build.opensuse.org/request/show/893578
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=27
 2021-05-17 08:29:44 +00:00
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