Date: Wed, 14 Feb 2007 18:51:19 -0600 (CST) From: Stephen Montgomery-Smith <stephen@cauchy.math.missouri.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109184: Recent upgrade of accessx accidently deleted some patches Message-ID: <200702150051.l1F0pJWV019880@cauchy.math.missouri.edu> Resent-Message-ID: <200702150100.l1F10Dq2077763@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109184
>Category: ports
>Synopsis: Recent upgrade of accessx accidently deleted some patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 15 01:00:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Stephen Montgomery-Smith
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD cauchy 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Feb 9 19:34:31 CST 2007 stephen@cauchy:/usr/obj/usr/src/sys/cauchy i386
>Description:
The x11/accessx port was just upgraded to 0.951.
But patch-Access.C and patch-Access.h were accidently deleted, and they
shouldn't have been.
>How-To-Repeat:
>Fix:
Put this into /usr/ports/x11/accessx/files
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# patch-Access.C
# patch-Access.h
#
echo x - patch-Access.C
sed 's/^X//' >patch-Access.C << 'END-of-patch-Access.C'
X--- Access.C.orig Tue Mar 13 23:39:55 2001
X+++ Access.C Tue Jan 30 22:18:00 2007
X@@ -21,6 +21,8 @@
X #include <X11/XKBlib.h>
X #include "Access.h"
X
X+using namespace std;
X+
X //
X // Access()
X //
X@@ -152,7 +154,7 @@
X //Get the state of the keyboard.
X
X XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
X- if ((int)xkb == BadAlloc || xkb == NULL)
X+ if (xkb == NULL)
X {
X return 5; /*AccessKeyboardQueryFailure;*/
X }
X@@ -261,7 +263,7 @@
X //Get the state of the keyboard.
X
X XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
X- if ((int)xkb == BadAlloc || xkb == NULL)
X+ if (xkb == NULL)
X {
X return 5; /*AccessKeyboardQueryFailure;*/
X }
END-of-patch-Access.C
echo x - patch-Access.h
sed 's/^X//' >patch-Access.h << 'END-of-patch-Access.h'
X--- Access.h-orig Sun Nov 17 19:34:23 2002
X+++ Access.h Sun Nov 17 19:34:34 2002
X@@ -20,7 +20,7 @@
X *
X */
X
X-#include <iostream.h>
X+#include <iostream>
X #include <math.h>
X
X inline char* onoroff(int val)
END-of-patch-Access.h
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702150051.l1F0pJWV019880>