- Fix build with gcc 4.2

PR:		117406
Submitted by:	Pietro Cerutti <gahr@gahr.ch> (maintainer)

2 files changed, 17 insertions, 16 deletions

diff --git a/audio/gmixer/files/patch-ab b/audio/gmixer/files/patch-ab
deleted file mode 100644
index 48318174d56b..000000000000
--- a/audio/gmixer/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmixer.c.orig	Mon Feb 22 08:11:10 1999
-+++ gmixer.c	Sat Sep  7 16:53:26 2002
-@@ -4,7 +4,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
--#include <linux/soundcard.h>
-+#include <sys/soundcard.h>
- #include <gtk/gtk.h>
- #include "icons/gmixer.xpm"
- #include "icons/mix_logo.xpm"
diff --git a/audio/gmixer/files/patch-ac b/audio/gmixer/files/patch-gmixer.c
index 1e6e75ec78ca..b1671cd76bc3 100644
--- a/audio/gmixer/files/patch-ac
+++ b/audio/gmixer/files/patch-gmixer.c
@@ -1,7 +1,19 @@
---- patch-ac begins here ---
---- gmixer.c	2002/05/26 05:09:08	1.1
-+++ gmixer.c	2002/05/26 05:21:05
-@@ -378,6 +378,27 @@
+--- gmixer.c.orig	1999-02-22 17:11:10.000000000 +0100
++++ gmixer.c	2007-10-24 13:30:08.000000000 +0200
+@@ -1,10 +1,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <strings.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+-#include <linux/soundcard.h>
++#include <sys/soundcard.h>
+ #include <gtk/gtk.h>
+ #include "icons/gmixer.xpm"
+ #include "icons/mix_logo.xpm"
+@@ -378,6 +379,27 @@
  	exit(0);
  }
  
@@ -29,7 +41,7 @@
  int main (int argc, char *argv[])
  {
  	char *homedir;
-@@ -385,6 +406,7 @@
+@@ -385,6 +407,7 @@
  	char *default_dev = "/dev/mixer";
  	int i;
  	g_print ("gmixer 0.98 (22.2.1999)\nCopyleft (C) 1998,1999 - Sergey Kiselev <sergey@junior.technion.ac.il>\n");