pool/kdiff3
SHA256
17
0
Fork 1
Code Issues Pull Requests Activity
93 Commits 3 Branches 0 Tags
factory
Commit Graph

93 Commits

This Branch
This Branch
All Branches
Author SHA256 Message Date
Ana Guerrero
ec36575537 Accepting request 1294194 from KDE:Extra 
- Add backported m_bWordWrap-wrong-condition-hang.patch
  * fixes mergetool hang (kde#507065)

OBS-URL: https://build.opensuse.org/request/show/1294194
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=59
 2025-07-18 13:58:52 +00:00
Fabian Vogt
577b519b3e Use # PATCH-FIX-UPSTREAM 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=74
 2025-07-17 15:03:27 +00:00
Fabian Vogt
70b22002db OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=73 2025-07-17 15:02:36 +00:00
Fabian Vogt
47d59ecff1 Accepting request 1294150 from home:dziobian 
- Add backported m_bWordWrap-wrong-condition-hang.patch
  * fixes mergetool hang (kde#507065)

OBS-URL: https://build.opensuse.org/request/show/1294150
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=72
 2025-07-17 15:02:18 +00:00
Ana Guerrero
fc852a1518 Accepting request 1289093 from KDE:Extra 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1289093
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=58
 2025-06-30 11:06:01 +00:00
Christophe Marin
6de5ce1cd8 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=70 2025-06-22 15:26:22 +00:00
Ana Guerrero
028dea7f5b Accepting request 1255747 from KDE:Extra 
Update to 1.12.2

OBS-URL: https://build.opensuse.org/request/show/1255747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=57
 2025-03-25 21:11:12 +00:00
Christophe Marin
04810832f8 1.12.2 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=68
 2025-03-24 21:45:48 +00:00
Dominique Leuenberger
4674eb337f Accepting request 1247822 from KDE:Extra 
Update to 1.12.1

OBS-URL: https://build.opensuse.org/request/show/1247822
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=56
 2025-02-22 18:05:52 +00:00
Christophe Marin
468cde6a95 1.12.1 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=66
 2025-02-22 13:18:28 +00:00
Ana Guerrero
c799e66f7d 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
81d45dae8c 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
9ddf32cf8f 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
aa92a50ee2 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
66cccd23e6 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
266c3a1c5c 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
498d935d9c 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
e37f4cb696 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
b880dbb9fb 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
5d86c617d6 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
bf2c5ff60c 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
64c1dad488 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
eb5455e6ba 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
998cece652 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
81080d9235 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
1ce50edfb1 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
6d453fc8f7 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
b8be5121df 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
775cfcedf2 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
da968e30b6 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
ae55b28f31 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
3d37a9aa1a 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
f571b287ce 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
5aa42f89a5 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
08d9a18da2 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
1c98e4509d 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
56ecc0da0b 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
d793f07233 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
78c5e2ea97 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
5186bf3ec5 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
c47f059317 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
8c89d62255 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
378e7eab1b 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
a289a6de0b 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
887b4634a5 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
24d43718b2 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
4161643eee 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
d9a61f63fa 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
53f8bf5256 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
afc4b3f536 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