| 1 |
jlec 13/02/01 15:31:07 |
| 2 |
|
| 3 |
Added: dirdiff-2.1-vcs.patch dirdiff-2.1-funky-chars.patch |
| 4 |
dirdiff-2.1-build.patch dirdiff-2.1-tcl8.6.patch |
| 5 |
Log: |
| 6 |
dev-util/dirdiff: Add fix for tcl-8.6, #455032; get some fixes from debian |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/dirdiff/files/dirdiff-2.1-vcs.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: dirdiff-2.1-vcs.patch |
| 17 |
=================================================================== |
| 18 |
dirdiff | 2 +- |
| 19 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/dirdiff b/dirdiff |
| 22 |
index c5522b6..f470348 100755 |
| 23 |
--- a/dirdiff |
| 24 |
+++ b/dirdiff |
| 25 |
@@ -37,7 +37,7 @@ set nxdirmode 0 |
| 26 |
set docvsignore 0 |
| 27 |
|
| 28 |
set defaultcvsignore { |
| 29 |
- RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS |
| 30 |
+ RCS SCCS CVS CVS.adm RCSLOG cvslog.* .svn .git tags TAGS |
| 31 |
.make.state .nse_depinfo *~ \#* .\#* ,* _$* *$ |
| 32 |
*.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb |
| 33 |
*.o *.obj *.so *.exe *.Z *.elc *.ln core |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.1 dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch?rev=1.1&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch?rev=1.1&content-type=text/plain |
| 41 |
|
| 42 |
Index: dirdiff-2.1-funky-chars.patch |
| 43 |
=================================================================== |
| 44 |
--- cvs-local.orig/dirdiff |
| 45 |
+++ cvs-local/dirdiff |
| 46 |
@@ -563,7 +563,7 @@ |
| 47 |
if {$d1 == $d2} continue |
| 48 |
set any 1 |
| 49 |
$base.p.$sub1 add command -label "$d2" \ |
| 50 |
- -command "makepatch \"$d1\" \"$d2\"" |
| 51 |
+ -command [list makepatch $d1 $d2] |
| 52 |
} |
| 53 |
if {$any} { |
| 54 |
$base.p add cascade -label "$d1 ->" -menu $base.p.$sub1 |
| 55 |
@@ -579,7 +579,7 @@ |
| 56 |
set i 0 |
| 57 |
foreach d $dirs { |
| 58 |
if {!$dirreadonly($i)} { |
| 59 |
- $base.t add command -label $d -command "touchfiles \"$d\"" |
| 60 |
+ $base.t add command -label $d -command [list touchfiles $d] |
| 61 |
} |
| 62 |
incr i |
| 63 |
} |
| 64 |
@@ -677,7 +677,7 @@ |
| 65 |
set i 0 |
| 66 |
foreach d $dirs { |
| 67 |
.bar.options add checkbutton -label "Read-only $d" \ |
| 68 |
- -variable dirreadonly($i) -command "readonlychange $i" |
| 69 |
+ -variable dirreadonly($i) -command [list readonlychange $i] |
| 70 |
incr i |
| 71 |
} |
| 72 |
|
| 73 |
@@ -1153,7 +1153,7 @@ |
| 74 |
if {$xi != ""} { |
| 75 |
set x [lindex $dirs $xi] |
| 76 |
$diffbut add command -label "Show $x" \ |
| 77 |
- -command "showfile \"$x\" \"$selfile\"" |
| 78 |
+ -command [list showfile $x $selfile] |
| 79 |
} |
| 80 |
} elseif {$numgroups > 1} { |
| 81 |
if {$numgroups > 2} { |
| 82 |
@@ -1163,7 +1163,7 @@ |
| 83 |
lappend x [lindex $dirs $i] |
| 84 |
} |
| 85 |
$diffbut add command -label "$numgroups-way diff" \ |
| 86 |
- -command "diffn {$x} {$selfile}" |
| 87 |
+ -command [list diffn $x $selfile] |
| 88 |
} |
| 89 |
for {set gn 1} {$gn < $numgroups} {incr gn} { |
| 90 |
set yi [lindex $groupelts($gn) 0] |
| 91 |
@@ -1184,7 +1184,7 @@ |
| 92 |
set xi [lindex $groupelts($go) 0] |
| 93 |
if {$xi == ""} continue |
| 94 |
set x [lindex $dirs $xi] |
| 95 |
- set cmd "diff2 \"$x\" \"$y\" \"$selfile\"" |
| 96 |
+ set cmd [list diff2 $x $y $selfile] |
| 97 |
if {$numgroups <= 3} { |
| 98 |
if {$compound_ok} { |
| 99 |
$diffbut add command -label "$x vs. $y" \ |
| 100 |
@@ -1283,7 +1283,7 @@ |
| 101 |
set cl2 [lindex $bgcolors($ng) $age] |
| 102 |
if {$im2 == "ex"} {set im2 ""} |
| 103 |
set y [lindex $dirs $dst] |
| 104 |
- set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 0" |
| 105 |
+ set cmd [list copyselfile $src $dst $selfile 0] |
| 106 |
if {$any == 1} { |
| 107 |
if {$compound_ok} { |
| 108 |
$copybut add command -label "$x -> $y" \ |
| 109 |
@@ -1346,7 +1346,7 @@ |
| 110 |
set im2 [lindex $agecolors($ng) $age] |
| 111 |
set cl2 [lindex $bgcolors($ng) $age] |
| 112 |
set y [lindex $dirs $dst] |
| 113 |
- set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 1" |
| 114 |
+ set cmd [list copyselfile $src $dst $selfile 1] |
| 115 |
if {$any == 1} { |
| 116 |
if {$compound_ok} { |
| 117 |
$copybut add command -label "$x -> $y" \ |
| 118 |
@@ -1392,10 +1392,10 @@ |
| 119 |
if {$compound_ok} { |
| 120 |
$copybut add command -label "Remove from $x" \ |
| 121 |
-image ex -compound left \ |
| 122 |
- -command "removeselfile \"$dst\" \"$selfile\"" |
| 123 |
+ -command [list removeselfile $dst $selfile] |
| 124 |
} else { |
| 125 |
$copybut add command -label "Remove from $x" \ |
| 126 |
- -command "removeselfile \"$dst\" \"$selfile\"" |
| 127 |
+ -command [list removeselfile $dst $selfile] |
| 128 |
} |
| 129 |
} |
| 130 |
} |
| 131 |
@@ -1415,7 +1415,7 @@ |
| 132 |
if {$dirreadonly($d)} continue |
| 133 |
set y [lindex $dirs $d] |
| 134 |
$copybut add command -label "$x -> $y" \ |
| 135 |
- -command "copyselfile \"$s\" \"$d\" \"$selfile\" 0" |
| 136 |
+ -command [list copyselfile $s $d $selfile 0] |
| 137 |
} |
| 138 |
} |
| 139 |
set needsep 1 |
| 140 |
@@ -1429,10 +1429,10 @@ |
| 141 |
if {$compound_ok} { |
| 142 |
$copybut add command -label "Remove from $x" \ |
| 143 |
-image ex -compound left \ |
| 144 |
- -command "removeselfile \"$s\" \"$selfile\"" |
| 145 |
+ -command [list removeselfile $s $selfile] |
| 146 |
} else { |
| 147 |
$copybut add command -label "Remove from $x" \ |
| 148 |
- -command "removeselfile \"$s\" \"$selfile\"" |
| 149 |
+ -command [list removeselfile $s $selfile] |
| 150 |
} |
| 151 |
} |
| 152 |
} |
| 153 |
@@ -1469,7 +1469,7 @@ |
| 154 |
|
| 155 |
# Show the file in an external viewer |
| 156 |
if { [llength $showprogram] > 0} { |
| 157 |
- eval "exec $showprogram \"$fn\" &" |
| 158 |
+ exec $showprogram $fn & |
| 159 |
return |
| 160 |
} |
| 161 |
# Or make our own viewer |
| 162 |
@@ -1569,7 +1569,7 @@ |
| 163 |
set diffopts "-U $ctxlines $diffiflag $diffwflag $diffbflag $diffBflag $diffdflag" |
| 164 |
|
| 165 |
if { [llength $diffprogram] > 0} { |
| 166 |
- eval "exec $diffprogram \"$path1\" \"$path2\" &" |
| 167 |
+ exec $diffprogram $path1 $path2 & |
| 168 |
return |
| 169 |
} |
| 170 |
# If we used an external diff program, its options are used. If we didn't, |
| 171 |
@@ -1750,7 +1750,7 @@ |
| 172 |
if {$gx == $g && !$dirreadonly($k)} { |
| 173 |
set f [lindex $dirs $k] |
| 174 |
$mergebut.m add command -label "update $f" \ |
| 175 |
- -command "diffmerge $i \"$f\"" |
| 176 |
+ -command [list diffmerge $i $f] |
| 177 |
set path [joinname $f $difffile] |
| 178 |
set diffmtime($path) [file mtime $path] |
| 179 |
} |
| 180 |
@@ -1770,7 +1770,7 @@ |
| 181 |
if {$gx == $g && !$dirreadonly($k)} { |
| 182 |
set f [lindex $dirs $k] |
| 183 |
$mpatchbut.m add command -label "for $f" \ |
| 184 |
- -command "diffmpatch $i \"$f\"" |
| 185 |
+ -command [list diffmpatch $i $f] |
| 186 |
} |
| 187 |
incr k |
| 188 |
} |
| 189 |
@@ -3424,7 +3424,7 @@ |
| 190 |
$w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t" |
| 191 |
$w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t" |
| 192 |
$w.bar.edit.m add command -label Find \ |
| 193 |
- -command "difffind :merge:$di:$fi $w.t" |
| 194 |
+ -command [list difffind :merge:$di:$fi $w.t] |
| 195 |
pack $w.bar.edit -side left |
| 196 |
frame $w.f -relief sunk -border 2 |
| 197 |
entry $w.f.filename |
| 198 |
@@ -3533,7 +3533,7 @@ |
| 199 |
$w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t" |
| 200 |
$w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t" |
| 201 |
$w.bar.edit.m add command -label Find \ |
| 202 |
- -command "difffind :mpatch:$fi $w.t" |
| 203 |
+ -command [list difffind :mpatch:$fi $w.t] |
| 204 |
pack $w.bar.edit -side left |
| 205 |
frame $w.f -relief sunk -border 2 |
| 206 |
entry $w.f.filename |
| 207 |
@@ -3993,7 +3993,7 @@ |
| 208 |
$w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t" |
| 209 |
$w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t" |
| 210 |
$w.bar.edit.m add command -label Find \ |
| 211 |
- -command "difffind :patch:$patchnum $w.t" |
| 212 |
+ -command [list difffind :patch:$patchnum $w.t] |
| 213 |
pack $w.bar.edit -side left |
| 214 |
frame $w.f -relief sunk -border 2 |
| 215 |
label $w.f.l -text "Filename: " |
| 216 |
@@ -4032,23 +4032,23 @@ |
| 217 |
set p1 [joinname $d1 $f] |
| 218 |
set p2 [joinname $d2 $f] |
| 219 |
if {[file exists $p1] && [file exists $p2]} { |
| 220 |
- set fh [open "|diff $contextopt $p1 $p2" r] |
| 221 |
+ set fh [open [list |diff $contextopt $p1 $p2] r] |
| 222 |
} elseif {[file exists $p1] && ! [file exists $p2]} { |
| 223 |
- set fh [open "|diff $contextopt $p1 $nullfile" r] |
| 224 |
+ set fh [open [list |diff $contextopt $p1 $nullfile] r] |
| 225 |
} elseif {! [file exists $p1] && [file exists $p2]} { |
| 226 |
- set fh [open "|diff $contextopt $nullfile $p2" r] |
| 227 |
+ set fh [open [list |diff $contextopt $nullfile $p2] r] |
| 228 |
} else { |
| 229 |
continue |
| 230 |
} |
| 231 |
fconfigure $fh -blocking 0 |
| 232 |
- fileevent $fh readable "readpatch $fh $pnum $w $d1 $d2 $i \"$f\"" |
| 233 |
+ fileevent $fh readable [list readpatch $fh $pnum $w $d1 $d2 $i $f] |
| 234 |
return |
| 235 |
} |
| 236 |
if {[string match ".*" $w]} { |
| 237 |
$w.t delete "end - 1c" end |
| 238 |
} else { |
| 239 |
close $w |
| 240 |
- eval "exec $showprogram \"$patch_outfile\" &" |
| 241 |
+ exec $showprogram $patch_outfile & |
| 242 |
# Should we remove the tempfile here? We don't have it if we used |
| 243 |
# the internal viewer |
| 244 |
} |
| 245 |
|
| 246 |
|
| 247 |
|
| 248 |
1.1 dev-util/dirdiff/files/dirdiff-2.1-build.patch |
| 249 |
|
| 250 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-build.patch?rev=1.1&view=markup |
| 251 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-build.patch?rev=1.1&content-type=text/plain |
| 252 |
|
| 253 |
Index: dirdiff-2.1-build.patch |
| 254 |
=================================================================== |
| 255 |
Makefile | 11 ++++++++--- |
| 256 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 257 |
|
| 258 |
diff --git a/Makefile b/Makefile |
| 259 |
index b4a49f8..410e018 100644 |
| 260 |
--- a/Makefile |
| 261 |
+++ b/Makefile |
| 262 |
@@ -7,12 +7,17 @@ LIBDIR=$(DESTDIR)/usr/lib |
| 263 |
INSTALL=install |
| 264 |
|
| 265 |
# You may need to change the -I arguments depending on your system |
| 266 |
-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl |
| 267 |
+#CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl |
| 268 |
+ |
| 269 |
+LIBS = -ltcl |
| 270 |
|
| 271 |
all: libfilecmp.so.0.0 |
| 272 |
|
| 273 |
-libfilecmp.so.0.0: filecmp.c |
| 274 |
- $(CC) $(CFLAGS) -shared -o $@ filecmp.c |
| 275 |
+.c.o: |
| 276 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@ |
| 277 |
+ |
| 278 |
+libfilecmp.so.0.0: filecmp.o |
| 279 |
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libfilecmp.so.0 -o $@ filecmp.o $(LIBS) |
| 280 |
|
| 281 |
install: dirdiff libfilecmp.so.0.0 |
| 282 |
$(INSTALL) -c dirdiff $(BINDIR) |
| 283 |
|
| 284 |
|
| 285 |
|
| 286 |
1.1 dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch |
| 287 |
|
| 288 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch?rev=1.1&view=markup |
| 289 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch?rev=1.1&content-type=text/plain |
| 290 |
|
| 291 |
Index: dirdiff-2.1-tcl8.6.patch |
| 292 |
=================================================================== |
| 293 |
filecmp.c | 2 +- |
| 294 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 295 |
|
| 296 |
diff --git a/filecmp.c b/filecmp.c |
| 297 |
index 673c1a8..fd4c6e5 100644 |
| 298 |
--- a/filecmp.c |
| 299 |
+++ b/filecmp.c |
| 300 |
@@ -341,7 +341,7 @@ FileCmpCmd(clientData, interp, argc, argv) |
| 301 |
if (n1 < 0 || n2 < 0) |
| 302 |
return TCL_ERROR; |
| 303 |
|
| 304 |
- sprintf(interp->result, "%d", same); |
| 305 |
+ sprintf(Tcl_GetStringResult(interp), "%d", same); |
| 306 |
return TCL_OK; |
| 307 |
} |
Archives