Author: alexander
Date: 2007-09-12 07:20:13 -0600 (Wed, 12 Sep 2007)
New Revision: 2056
Added:
trunk/packages/gpm/gpm-1.20.1-default_client-1.patch
Modified:
trunk/packages/gpm/Makefile
Log:
Added a patch to GPM that, according to the maintainer of brltty, should
fix the "Inappropriate ioctl for device" error reported by Georgina Joyce.
Note, however, that I was not able to reproduce the error.
Modified: trunk/packages/gpm/Makefile
===================================================================
--- trunk/packages/gpm/Makefile 2007-09-05 05:08:33 UTC (rev 2055)
+++ trunk/packages/gpm/Makefile 2007-09-12 13:20:13 UTC (rev 2056)
@@ -16,6 +16,8 @@
URL-$(PATCH2)= $(HTTPBLFS)/$(NM)/$(PATCH2)
SHA-$(PATCH2)= 8899a212eadfbda201d8da3e44590bd05b97f9f6
+PATCH3= $(DIR)-default_client-1.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -30,6 +32,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
+ patch -Np1 -i ../$(PATCH3)
./configure --prefix=/usr --sysconfdir=/etc --without-curses
LDFLAGS="-lm" make
make install
Added: trunk/packages/gpm/gpm-1.20.1-default_client-1.patch
===================================================================
--- trunk/packages/gpm/gpm-1.20.1-default_client-1.patch
(rev 0)
+++ trunk/packages/gpm/gpm-1.20.1-default_client-1.patch 2007-09-12
13:20:13 UTC (rev 2056)
@@ -0,0 +1,29 @@
+Submitted By: Alexander E. Patrakov
+Date: 2007-09-07
+Initial Package Version: 1.20.1
+Origin: Upstream
+Upstream status: will be part of 1.20.2
+Description: Restores support for "default client" in the API.
+Should fix the "Inappropriate ioctl for device" error when running brltty.
+
+--- gpm-1.20.1/src/lib/liblow.c 2002-12-25 03:57:16.000000000 +0500
++++ gpm-1.20.1/src/lib/liblow.c 2007-09-07 15:31:43.000000000 +0600
+@@ -249,7 +249,7 @@
+ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
+ memcpy(tty,option.consolename,strlen(option.consolename)-1);
+ sprintf(&tty[strlen(option.consolename)-1],"%i",flag);
+- } else { /* use your current vc */
++ } else if (flag==0) { /* use your current vc */
+ if (isatty(0)) tty = ttyname(0); /* stdin */
+ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */
+ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */
+@@ -265,7 +265,8 @@
+ }
+
+ conn->vc=atoi(&tty[strlen(option.consolename)-1]);
+- }
++ } else /* a default handler -- use console */
++ tty = strdup(option.consolename);
+
+ if (gpm_consolefd == -1)
+ if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) {
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
