rpms/xorg-x11-utils/F-9 xdpyinfo-1.0.2-silence-misc-errors.patch, NONE, 1.1 xorg-x11-utils.spec, 1.21, 1.22

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29080

Modified Files:
	xorg-x11-utils.spec 
Added Files:
	xdpyinfo-1.0.2-silence-misc-errors.patch 
Log Message:
* Fri Apr 25 2008 Adam Jackson <ajax at redhat.com> 7.3-3
- xdpyinfo-1.0.2-silence-misc-errors.patch: Make xf86misc and xf86dga protocol
  errors non-fatal. (#442176)


xdpyinfo-1.0.2-silence-misc-errors.patch:

--- NEW FILE xdpyinfo-1.0.2-silence-misc-errors.patch ---
diff -up xdpyinfo-1.0.2/xdpyinfo.c.jx xdpyinfo-1.0.2/xdpyinfo.c
--- xdpyinfo-1.0.2/xdpyinfo.c.jx	2008-04-25 13:28:35.000000000 -0400
+++ xdpyinfo-1.0.2/xdpyinfo.c	2008-04-25 13:36:28.000000000 -0400
@@ -135,6 +135,14 @@ in this Software without prior written a
 char *ProgramName;
 Bool queryExtensions = False;
 
+static int
+silent_errors(Display *dpy, XErrorEvent *ev)
+{
+    return 0;
+}
+
+static int (*old_handler)(Display *, XErrorEvent *) = NULL;
+
 static int print_event_mask(char *buf, int lastcol, int indent, long mask);
 
 static int StrCmp(const void *a, const  void *b)
@@ -730,12 +738,16 @@ print_dga_info(Display *dpy, char *extna
 	return 1;
     }
 
+    old_handler = XSetErrorHandler(silent_errors);
+
     if (!XF86DGAGetVideoLL(dpy, DefaultScreen(dpy), &offset,
 			    &width, &bank, &ram))
 	return 0;
     printf("  Base address = 0x%X, Width = %d, Bank size = %d,"
 	   " RAM size = %dk\n", offset, width, bank, ram);
 
+    XSetErrorHandler(old_handler);
+
     return 1;
 }
 #endif
@@ -846,24 +858,17 @@ char *flgtable[] = { "None", "ClearDTR",
 		     "ClearDTR and ClearRTS" };
 
 static int
-misc_error(Display *dpy, XErrorEvent *ev)
-{
-    return 0;
-}
-
-static int
 print_XF86Misc_info(Display *dpy, char *extname)
 {
     int majorrev, minorrev, ret = 1;
     XF86MiscMouseSettings mouseinfo;
     XF86MiscKbdSettings kbdinfo;
-    int (*old_handler)(Display *, XErrorEvent *);
 
     if (!XF86MiscQueryVersion(dpy, &majorrev, &minorrev))
 	return 0;
     print_standard_extension_info(dpy, extname, majorrev, minorrev);
 
-    old_handler = XSetErrorHandler(misc_error);
+    old_handler = XSetErrorHandler(silent_errors);
 
     if ((majorrev > 0) || (majorrev == 0 && minorrev > 0)) do {
       if (!XF86MiscGetKbdSettings(dpy, &kbdinfo)) {


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-9/xorg-x11-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-utils.spec	20 Feb 2008 08:09:35 -0000	1.21
+++ xorg-x11-utils.spec	25 Apr 2008 17:41:06 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -21,6 +21,8 @@
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.3.tar.bz2
 
+Patch0: xdpyinfo-1.0.2-silence-misc-errors.patch
+
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
 BuildRequires: libGL-devel
@@ -48,6 +50,7 @@
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10
+%patch0 -p0 -b .misc
 
 %build
 # Build all apps
@@ -104,6 +107,10 @@
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Fri Apr 25 2008 Adam Jackson <ajax at redhat.com> 7.3-3
+- xdpyinfo-1.0.2-silence-misc-errors.patch: Make xf86misc and xf86dga protocol
+  errors non-fatal. (#442176)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.3-2
 - Autorebuild for GCC 4.3