FreeBSD ports you maintain which are out of date
Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/k...@freebsd.org.html Port| Current version | New version +-+ devel/kf5-kfilemetadata | 5.82.0 | 5.83.0 +-+ graphics/kf5-kimageformats | 5.82.0 | 5.83.0 +-+ x11-toolkits/kf5-kirigami2 | 5.82.0 | 5.83.0 +-+ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt Reported by:portscout!
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 Bug ID: 256606 Summary: textproc/kdiff3: missing/extra newlines when merging Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: Individual Port(s) Assignee: k...@freebsd.org Reporter: ema...@freebsd.org Flags: maintainer-feedback?(k...@freebsd.org) Assignee: k...@freebsd.org kdiff3 1.9.2 on FreeBSD 13.0 + some minor kernel changes Using kdiff3 for resolving git merge conflicts I noticed that output files sometimes have extra whitespace, and are missing a newline at EOF. I encountered this within the last month or two. Reproduction steps - create test files: printf 'line 1\nline 2-base\nline 3-base\nline 4\n' > base printf 'line 1\nline 2-theirs\nline 4\n' > theirs printf 'line 1\nline 2-mine\nline 4\n' > mine Invoke kdiff3: kdiff3 -o out base theirs mine Resolve the conflict choosing 'mine', save output Observe that the output file has a blank 3rd line, and has no \x0a at EOF. By default I have LANG=en_CA.UTF-8 but observed also with LANG unset. -- You are receiving this mail because: You are the assignee for the bug.
maintainer-feedback requested: [Bug 256606] textproc/kdiff3: missing/extra newlines when merging
Bugzilla Automation has asked freebsd-kde (Team) for maintainer-feedback: Bug 256606: textproc/kdiff3: missing/extra newlines when merging https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 --- Description --- kdiff3 1.9.2 on FreeBSD 13.0 + some minor kernel changes Using kdiff3 for resolving git merge conflicts I noticed that output files sometimes have extra whitespace, and are missing a newline at EOF. I encountered this within the last month or two. Reproduction steps - create test files: printf 'line 1\nline 2-base\nline 3-base\nline 4\n' > base printf 'line 1\nline 2-theirs\nline 4\n' > theirs printf 'line 1\nline 2-mine\nline 4\n' > mine Invoke kdiff3: kdiff3 -o out base theirs mine Resolve the conflict choosing 'mine', save output Observe that the output file has a blank 3rd line, and has no \x0a at EOF. By default I have LANG=en_CA.UTF-8 but observed also with LANG unset.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 Tobias C. Berner changed: What|Removed |Added URL||https://bugs.kde.org/show_b ||ug.cgi?id=437570 CC||tcber...@freebsd.org -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 --- Comment #1 from Ed Maste --- Could we perhaps revert to the old version, until this is fixed? -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 --- Comment #2 from Ed Maste --- Created attachment 225807 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=225807&action=edit revert to 1.8.5 Patch applied locally to revert to 1.8.5, which fixes the problem for me. I set PORTEPOCH to 1 to handle the now-lower version number, but need a ports committer to check. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 Adriaan de Groot changed: What|Removed |Added CC||adr...@freebsd.org Status|New |Open --- Comment #3 from Adriaan de Groot --- For those not conversant with kdiff3: - invoke kdiff3 as Ed says, `kdiff3 -o out base theirs mine` - it comes up with a "Conflicts" dialog, saying Total 2, auto-solved 1, 1 unsolved; click *ok* - the lower half of the window shows the *output* part, with each line displayed ``` line 1 line 4 ``` There's a kind of highlight on the first conflict line. Press ctrl-3 **or** right-mouse-click on that line and select *C* (with the files in the order given in the command, *base* is *A*, *theirs* is *B*, and *mine* is *C*). The conflict marker is replaced by the content of the line from file *C*. Now the number at the bottom says "0 unresolved", and you can hit ctrl-S to save and ctrl-Q to quit. Output of `od -c` on the result: ``` 000l i n e 1 \n l i n e 2 - m i 020n e \n \n l i n e 4 ``` -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 Adriaan de Groot changed: What|Removed |Added Status|Open|In Progress --- Comment #4 from Adriaan de Groot --- I'm going to apply https://invent.kde.org/sdk/kdiff3/-/merge_requests/31 to packaging instead, since that fixes the problem in 1.9.2 and we don't need to mess with PORTEPOCH. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 --- Comment #5 from commit-h...@freebsd.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=efda9660cc81115e5b149426287b09e44a25f388 commit efda9660cc81115e5b149426287b09e44a25f388 Author: Adriaan de Groot AuthorDate: 2021-06-14 23:00:52 + Commit: Adriaan de Groot CommitDate: 2021-06-14 23:03:16 + textproc/kdiff3: fix output of merged file Fix spurious newlines and missing newline at the end of file. Upstream report:https://bugs.kde.org/show_bug.cgi?id=437570 Upstream merge request: https://invent.kde.org/sdk/kdiff3/-/merge_requests/31 PR: 256606 Reported by:emaste textproc/kdiff3/Makefile | 1 + .../files/patch-src_mergeresultwindow.cpp (new)| 50 ++ 2 files changed, 51 insertions(+) -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 Adriaan de Groot changed: What|Removed |Added Status|In Progress |Closed Resolution|--- |FIXED --- Comment #6 from Adriaan de Groot --- I've checked that this fixes at least the example Ed gave and some other weirdness. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 256606] textproc/kdiff3: missing/extra newlines when merging
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606 --- Comment #7 from Ed Maste --- Most excellent, thank you! -- You are receiving this mail because: You are the assignee for the bug.
