[arch-commits] CVS update of extra/lib/cairo (cairo-1.4.8-hide-xerrors.patch)

Jan de Groot jgc at archlinux.org
Tue Dec 11 09:11:57 EST 2007


    Date: Tuesday, December 11, 2007 @ 09:11:57
  Author: jgc
    Path: /home/cvs-extra/extra/lib/cairo

 Removed: cairo-1.4.8-hide-xerrors.patch (1.1)

upgpkg: cairo 1.4.12-1
Remove old patch


--------------------------------+
 cairo-1.4.8-hide-xerrors.patch |   52 ---------------------------------------
 1 file changed, 52 deletions(-)


Index: extra/lib/cairo/cairo-1.4.8-hide-xerrors.patch
diff -u extra/lib/cairo/cairo-1.4.8-hide-xerrors.patch:1.1 extra/lib/cairo/cairo-1.4.8-hide-xerrors.patch:removed
--- extra/lib/cairo/cairo-1.4.8-hide-xerrors.patch:1.1	Tue Jun 19 17:58:37 2007
+++ extra/lib/cairo/cairo-1.4.8-hide-xerrors.patch	Tue Dec 11 09:11:57 2007
@@ -1,52 +0,0 @@
---- src/cairo-xlib-display.c
-+++ src/cairo-xlib-display.c
-@@ -405,10 +405,13 @@ void
- _cairo_xlib_display_notify (cairo_xlib_display_t *display)
- {
-     cairo_xlib_job_t *jobs, *job, *freelist;
-+    Display *dpy = display->display;
- 
-     CAIRO_MUTEX_LOCK (display->mutex);
-     jobs = display->workqueue;
-     while (jobs != NULL) {
-+	cairo_xlib_error_func_t old_handler;
-+
- 	display->workqueue = NULL;
- 	CAIRO_MUTEX_UNLOCK (display->mutex);
- 
-@@ -422,24 +425,32 @@ _cairo_xlib_display_notify (cairo_xlib_d
- 	} while (jobs != NULL);
- 	freelist = jobs = job;
- 
-+	/* protect the notifies from triggering XErrors
-+	 * XXX There is a remote possibility that the application has
-+	 * been reallocated an XID that we are about to destroy here... */
-+	XSync (dpy, False);
-+	old_handler = XSetErrorHandler (_noop_error_handler);
-+
- 	do {
- 	    job = jobs;
- 	    jobs = job->next;
- 
- 	    switch (job->type){
- 	    case WORK:
--		job->func.work.notify (display->display, job->func.work.data);
-+		job->func.work.notify (dpy, job->func.work.data);
- 		if (job->func.work.destroy != NULL)
- 		    job->func.work.destroy (job->func.work.data);
- 		break;
- 
- 	    case RESOURCE:
--		job->func.resource.notify (display->display,
--			                   job->func.resource.xid);
-+		job->func.resource.notify (dpy, job->func.resource.xid);
- 		break;
- 	    }
- 	} while (jobs != NULL);
- 
-+	XSync (dpy, False);
-+	XSetErrorHandler (old_handler);
-+
- 	CAIRO_MUTEX_LOCK (display->mutex);
- 	do {
- 	    job = freelist;




More information about the arch-commits mailing list