Ticket #50400: git-color-lime.diff

File git-color-lime.diff, 3.6 KB (added by raimue (Rainer Müller), 9 years ago)

  • Portfile

     
    66
    77name                git
    88version             2.7.0
    9 revision            1
     9revision            2
    1010description         A fast version control system
    1111long_description    Git is a fast, scalable, distributed open source version \
    1212                    control system focusing on speed and efficiency.
    … …  
    4646                    port:p${perl5.major}-cgi \
    4747                    port:rsync
    4848
    49 patchfiles          patch-Makefile.diff git-subtree.1.diff
     49patchfiles          patch-Makefile.diff \
     50                    git-subtree.1.diff \
     51                    patch-gitk-color-lime.diff
    5052patch.pre_args      -p1
    5153
    5254extract.only        git-${version}${extract.suffix} \

  • files/patch-gitk-color-lime.diff

     
     1Fix color name "lime", which is unsupported on Tcl/Tk as shipped with OS X.
     2
     3$ /usr/bin/wish /opt/local/bin/gitk
     4Error in startup script: unknown color name "lime"
     5    (processing "-fore" option)
     6    invoked from within
     7"$ctext tag conf m2 -fore [lindex $mergecolors 2]"
     8    (procedure "makewindow" line 347)
     9    invoked from within
     10"makewindow"
     11    (file "/opt/local/bin/gitk" line 12434)
     12--- a/gitk-git/gitk.orig        2016-01-21 18:18:32.000000000 +0100
     13+++ b/gitk-git/gitk     2016-01-21 18:24:22.000000000 +0100
     14@@ -2265,7 +2265,7 @@
     15        set h [expr {[font metrics uifont -linespace] + 2}]
     16        set progresscanv .tf.bar.progress
     17        canvas $progresscanv -relief sunken -height $h -borderwidth 2
     18-       set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
     19+       set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00FF00"]
     20        set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
     21        set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
     22     }
     23@@ -3397,7 +3397,7 @@
     24        0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
     25        0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
     26 }
     27-image create bitmap reficon-H -background black -foreground lime \
     28+image create bitmap reficon-H -background black -foreground "#00FF00" \
     29     -data $rectdata -maskdata $rectmask
     30 image create bitmap reficon-o -background black -foreground "#ddddff" \
     31     -data $rectdata -maskdata $rectmask
     32@@ -12188,7 +12188,7 @@
     33     set extdifftool "meld"
     34 }
     35 
     36-set colors {lime red blue magenta darkgrey brown orange}
     37+set colors {"#00FF00" red blue magenta darkgrey brown orange}
     38 if {[tk windowingsystem] eq "win32"} {
     39     set uicolor SystemButtonFace
     40     set uifgcolor SystemButtonText
     41@@ -12206,12 +12206,12 @@
     42 }
     43 set diffcolors {red "#00a000" blue}
     44 set diffcontext 3
     45-set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
     46+set mergecolors {red blue "#00FF00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
     47 set ignorespace 0
     48 set worddiff ""
     49 set markbgcolor "#e0e0ff"
     50 
     51-set headbgcolor lime
     52+set headbgcolor "#00FF00"
     53 set headfgcolor black
     54 set headoutlinecolor black
     55 set remotebgcolor #ffddaa
     56@@ -12226,7 +12226,7 @@
     57 set linehoveroutlinecolor black
     58 set mainheadcirclecolor yellow
     59 set workingfilescirclecolor red
     60-set indexcirclecolor lime
     61+set indexcirclecolor "#00FF00"
     62 set circlecolors {white blue gray blue blue}
     63 set linkfgcolor blue
     64 set circleoutlinecolor $fgcolor