MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tkdiff: 5.6 -> 5.7

Browse source 
https://sourceforge.net/projects/tkdiff/files/tkdiff/5.7/
This commit is contained in:
annalee 2024-05-12 04:58:53 +00:00
parent 25e9a6d07d
commit 04b48666f2
No known key found for this signature in database
3 changed files with 2 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
pkgs/by-name/tk/tkdiff/189.patch
View file

@ -1,71 +0,0 @@
Index: tkdiff
===================================================================
diff --git a/tkdiff b/tkdiff
--- a/tkdiff (revision 188)
+++ b/tkdiff (revision 189)
@@ -111,7 +111,7 @@
}
# Determine the name of the temporary directory, the rc file name,
-# and possible VPATH EnvVar, all of which are platform dependent.
+# NULLdev, and possible VPATH EnvVar, all of which are platform dependent.
#
# Much MAY likely be overridden by a preference in .tkdiffrc,
# EXCEPT (obviously) when no such file actually exists yet
@@ -126,6 +126,9 @@
set opts(tmpdir) C:/temp
}
+ # Reserved filename which is actually a NULL device
+ set opts(NULLdev) "nul"
+
# Split up and store a VPATH if it exists
if {[info exists ::env(VPATH)]} {
set finfo(Vpath) [split $::env(VPATH) ";"]
@@ -145,6 +148,9 @@
set opts(tmpdir) $::env(TMPDIR)
} {set opts(tmpdir) /tmp }
+ # Reserved filename which is actually a NULL device (Unix-like platforms)
+ set opts(NULLdev) "/dev/null"
+
# Split up and store a VPATH if it exists
if {[info exists ::env(VPATH)]} {
set finfo(Vpath) [split $::env(VPATH) ":"]
@@ -2106,7 +2112,7 @@
# 1 Failed (PLUS a 'pushed' HARD-error message to the caller)
###############################################################################
proc get-file {fn ndx {probe 0}} {
- global g finfo
+ global g opts finfo
# Ancestor files are stored into a slightly adjusted array element name
# N.B> 'ndx' AS PASSED *can* be an EXPRESSION (not just a number): resolve!
@@ -2121,7 +2127,7 @@
} elseif {!$tildechk} {
# DO NOT REPORT non-existence if this attempt was ONLY a probe
if {$probe} { return 1 } { set MSG "File '$fn' does not exist" }
- } elseif {[file isfile $fn]} {
+ } elseif {[file isfile $fn] || $fn == $opts(NULLdev)} {
set finfo(${A}lbl,$ndx) [shortNm [set finfo(${A}pth,$ndx) "$fn"]]
} else { set MSG "'$fn' exists, but is not a file" }
@@ -2857,7 +2863,7 @@
# Align various label decorations to the CURRENT input file pairing
###############################################################################
proc alignDecor {pairnum} {
- global g w finfo
+ global g w opts finfo
# Establish if 3way mode is NOW active and what file indices are in use
set g(is3way) [info exists finfo(albl,$pairnum)]
@@ -2874,7 +2880,8 @@
set finfo(lbl,$LR) $finfo(ulbl,$ndx($n)) ;# Override lbl display
} else {set finfo(lbl,$LR) $finfo(lbl,$ndx($n))}
- if {![info exists finfo(tmp,$ndx($n))]} {
+ if {![info exists finfo(tmp,$ndx($n))] \
+ && $finfo(pth,$ndx($n)) != $opts(NULLdev)} {
# (N.B> Tip data will ALSO be used by report generation heading)
set g(tooltip,${LR}Label) "{$finfo(pth,$ndx($n))\n"
append g(tooltip,${LR}Label) \

15
pkgs/by-name/tk/tkdiff/194.patch
View file

@ -1,15 +0,0 @@
Index: tkdiff
===================================================================
diff --git a/tkdiff b/tkdiff
--- a/tkdiff (revision 193)
+++ b/tkdiff (revision 194)
@@ -4557,7 +4557,8 @@
}
}
}
- }
+ # But KICK scroll to *LOOK* for Ratcliff (when ON); otherwise is a NOOP
+ } { $w(acTxWdg) SEE @1,1 }
}
###############################################################################

15
pkgs/by-name/tk/tkdiff/package.nix
View file

@ -2,24 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tkdiff";
version = "5.6";
version = "5.7";
src = fetchzip {
url = "mirror://sourceforge/tkdiff/tkdiff-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}.zip";
hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";
hash = "sha256-ZndpolvaXoCAzR4KF+Bu7DJrXyB/C2H2lWp5FyzOc4M=";
};
patches = [
# fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
# svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
./189.patch
# fix regression: trigger redraw when inline recursive diff requested
# svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \
# sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d'
./194.patch
];
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''