diff options
| author | Alexander Tsamutali <astsmtl@yandex.ru> | 2011-06-13 14:08:04 +0000 |
|---|---|---|
| committer | Alexander Tsamutali <astsmtl@yandex.ru> | 2011-06-13 14:08:04 +0000 |
| commit | ff910beca6baa42900bb945ae6aae08a6a112d6a (patch) | |
| tree | 6674e9a9e21560b0cdde3218ec6d25e439a4a609 /pkgs | |
| parent | a208b2f85fad7d461162abd2951a3a6bc8fbefe9 (diff) | |
desktops/gnome-2.28/desktop/vte: Updated to 0.28.0.
svn path=/nixpkgs/trunk/; revision=27430
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch | 33 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/desktop/vte/default.nix | 8 |
2 files changed, 3 insertions, 38 deletions
diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch b/pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch deleted file mode 100644 index c152f6b656a06..0000000000000 --- a/pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix invisible cursor in xfce's terminal. - -http://bugzilla.xfce.org/show_bug.cgi?id=6423 -http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/vte/current/SOURCES/vte-0.25.1-cursor.patch?view=markup&pathrev=565638 - -diff -p -up vte-0.25.1/src/vte.c.cursor vte-0.25.1/src/vte.c ---- vte-0.25.1/src/vte.c.cursor 2010-05-03 05:28:46.000000000 -0300 -+++ vte-0.25.1/src/vte.c 2010-08-03 14:06:29.000000000 -0300 -@@ -8752,6 +8752,10 @@ vte_terminal_determine_colors(VteTermina - if (highlight && !cursor && terminal->pvt->highlight_color_set) { - *fore = cell ? cell->attr.fore : VTE_DEF_FG; - *back = VTE_DEF_HL; -+ } else -+ if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) { -+ *fore = cell ? cell->attr.back : VTE_DEF_BG; -+ *back = cell ? cell->attr.fore : VTE_DEF_FG; - } else { - *fore = cell ? cell->attr.fore : VTE_DEF_FG; - *back = cell ? cell->attr.back : VTE_DEF_BG; -@@ -8782,13 +8786,6 @@ vte_terminal_determine_colors(VteTermina - } - } - -- if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) { -- int tmp; -- tmp = *fore; -- *fore = *back; -- *back = tmp; -- } -- - if (!cursor && cell && cell->attr.invisible) { - *fore = *back; - } diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix b/pkgs/desktops/gnome-2.28/desktop/vte/default.nix index b7d93622c7d6a..c061a26847922 100644 --- a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/vte/default.nix @@ -2,15 +2,13 @@ , pythonSupport ? false, python}: stdenv.mkDerivation rec { - name = "vte-0.25.1"; + name = "vte-0.28.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.25/${name}.tar.bz2"; - sha256 = "105f5ifyg09nh5p6fw2w7c0n9wd8vw9cvwlh6zg49ibsar893qi5"; + url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.28/${name}.tar.bz2"; + sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql"; }; - patches = [ ./cursor.patch ]; - buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++ stdenv.lib.optional pythonSupport python; |