From 745b1ce04a09176ebcfcf81257b7f23c5ec55a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 14 Apr 2015 17:25:34 +0200
Subject: [PATCH] Updating gdb to 7.9.

I can remove the patch of edit-signals. It seems to work without it.

I tested the change over release-14.12.
---
 pkgs/development/tools/misc/gdb/default.nix   |  8 +++---
 .../tools/misc/gdb/edit-signals.patch         | 25 -------------------
 2 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gdb/edit-signals.patch

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index b24b46aec3d7..16ab1f8e5dc4 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.8.2";
+  basename = "gdb-7.9";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "11a4fj1vpsny71kz7xqqbqk3kgzbs5cfjj3z9gm0hpvxfkam8nb0";
+    sha256 = "14l3hhsy7fmpn2dk7ivc67gnbjdhkxlq90kxijpzfa35l58mcccv";
   };
 
-  patches = [ ./edit-signals.patch ];
+  # patches = [ ./edit-signals.patch ];
 
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
-       rm -v $out/share/info/{standards,configure,bfd}.info
+       rm -v $out/share/info/bfd.info
     '';
 
   # TODO: Investigate & fix the test failures.
diff --git a/pkgs/development/tools/misc/gdb/edit-signals.patch b/pkgs/development/tools/misc/gdb/edit-signals.patch
deleted file mode 100644
index e9da8035ef5b..000000000000
--- a/pkgs/development/tools/misc/gdb/edit-signals.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch adapted from
-https://www.sourceware.org/ml/gdb-patches/2012-08/msg00439.html
-
-Without it, spawning a terminal 'vim' from gdb 'edit' cmd, makes
-all gdb grazy.
-
-diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
-index 7ea0fec..be5455c 100644
---- a/gdb/tui/tui-win.c
-+++ b/gdb/tui/tui-win.c
-@@ -831,11 +831,12 @@ void
- tui_initialize_win (void)
- {
- #ifdef SIGWINCH
--#ifdef HAVE_SIGACTION
-+#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
-   struct sigaction old_winch;
- 
--  memset (&old_winch, 0, sizeof (old_winch));
-+  sigemptyset (&old_winch.sa_mask);
-   old_winch.sa_handler = &tui_sigwinch_handler;
-+  old_winch.sa_flags = SA_RESTART;
-   sigaction (SIGWINCH, &old_winch, NULL);
- #else
-   signal (SIGWINCH, &tui_sigwinch_handler);