summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-08-08 13:04:39 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-08-08 13:04:39 +0000
commit60fae34d5921bf8aa4078729cb41e71e56bc767f (patch)
tree3bc133594ce914037b8e6645b965446054e16ce2 /media-libs/libgii
parentStable on hppa. (Manifest recommit) (diff)
downloadgentoo-2-60fae34d5921bf8aa4078729cb41e71e56bc767f.tar.gz
gentoo-2-60fae34d5921bf8aa4078729cb41e71e56bc767f.tar.bz2
gentoo-2-60fae34d5921bf8aa4078729cb41e71e56bc767f.zip
Compile fix for bug #57946.
Diffstat (limited to 'media-libs/libgii')
-rw-r--r--media-libs/libgii/ChangeLog5
-rw-r--r--media-libs/libgii/files/libgii-linux-headers-2.6.patch14
2 files changed, 18 insertions, 1 deletions
diff --git a/media-libs/libgii/ChangeLog b/media-libs/libgii/ChangeLog
index ae2c29653b1c..c130879add36 100644
--- a/media-libs/libgii/ChangeLog
+++ b/media-libs/libgii/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libgii
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.12 2004/07/29 03:25:22 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.13 2004/08/08 13:04:39 plasmaroo Exp $
+
+ 08 Aug 2004; <plasmaroo@gentoo.org> files/libgii-linux-headers-2.6.patch:
+ Compile fix for bug #57946.
28 Jul 2004; Tom Gall <tgall@gentoo.org> libgii-0.8.1.ebuild:
stable on ppc64, bug #55076
diff --git a/media-libs/libgii/files/libgii-linux-headers-2.6.patch b/media-libs/libgii/files/libgii-linux-headers-2.6.patch
index 043cba8669e7..8e1ddc032704 100644
--- a/media-libs/libgii/files/libgii-linux-headers-2.6.patch
+++ b/media-libs/libgii/files/libgii-linux-headers-2.6.patch
@@ -11,6 +11,7 @@ diff -ur libgii-0.8.1~old/input/linux_evdev/eventparse.c libgii-0.8.1/input/linu
static gii_event_mask
dispatch_pmove(struct gii_input *inp, struct input_event *event,
+diff -ur libgii-0.8.1/input/linux_evdev/key.c libgii-0.8.1/input/linux_evdev/key.c.plasmaroo
--- libgii-0.8.1/input/linux_evdev/key.c 2001-08-26 16:57:18.000000000 +0100
+++ libgii-0.8.1/input/linux_evdev/key.c.plasmaroo 2004-03-07 23:09:16.651515960 +0000
@@ -286,12 +286,6 @@
@@ -26,3 +27,16 @@ diff -ur libgii-0.8.1~old/input/linux_evdev/eventparse.c libgii-0.8.1/input/linu
case KEY_F13:
label = GIIK_F13;
break;
+diff -ur libgii-0.8.1/input/linux_kbd/linkey.c libgii-0.8.1/input/linux_kbd/linkey.c.plasmaroo
+--- libgii-0.8.1/input/linux_kbd/linkey.c 2004-08-08 13:59:27.319401128 +0100
++++ libgii-0.8.1/input/linux_kbd/linkey.c.plasmaroo 2004-08-08 13:59:40.313425736 +0100
+@@ -25,8 +25,8 @@
+ ******************************************************************************
+ */
+
+-#include "linkey.h"
+ #include <ctype.h>
++#include "linkey.h"
+
+ static uint32 basic_trans(int sym, int islabel, uint32 *modifiers,
+ uint32 label, int keycode)