diff -u libxfixes-5.0/debian/changelog libxfixes-5.0/debian/changelog
--- libxfixes-5.0/debian/changelog
+++ libxfixes-5.0/debian/changelog
@@ -1,3 +1,15 @@
+libxfixes (1:5.0-4ubuntu4.3) precise-security; urgency=medium
+
+  * No change rebuild in the security pocket
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Sat, 06 Dec 2014 12:19:12 -0500
+
+libxfixes (1:5.0-4ubuntu4.2) precise-proposed; urgency=low
+
+  * Fix compile with upstream pointer barriers. (LP: #1242633)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 04 Sep 2013 13:10:28 +0200
+
 libxfixes (1:5.0-4ubuntu4.1) precise-security; urgency=low
 
   * SECURITY UPDATE: denial of service and possible code execution via
diff -u libxfixes-5.0/debian/patches/01_fixesproto-v6.diff libxfixes-5.0/debian/patches/01_fixesproto-v6.diff
--- libxfixes-5.0/debian/patches/01_fixesproto-v6.diff
+++ libxfixes-5.0/debian/patches/01_fixesproto-v6.diff
@@ -4,27 +4,18 @@
 
     libXFixes v6: Pointer barrier improvements
 
-Index: libxfixes-dev/include/X11/extensions/Xfixes.h
-===================================================================
---- libxfixes-dev.orig/include/X11/extensions/Xfixes.h	2012-03-13 09:36:56.810984004 +1100
-+++ libxfixes-dev/include/X11/extensions/Xfixes.h	2012-03-13 09:39:08.842990643 +1100
-@@ -259,11 +259,48 @@
- 			   int x2, int y2, int directions,
- 			   int num_devices, int *devices);
- 
-+PointerBarrier
-+XFixesCreatePointerBarrierVelocity(Display *dpy, Window w, int x1, int y1,
-+			   int x2, int y2, int directions, int velocity,
-+			   int num_devices, int *devices);
-+
- void
- XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b);
+--- a/include/X11/extensions/Xfixes.h
++++ b/include/X11/extensions/Xfixes.h
+@@ -264,6 +264,41 @@
  
  #endif /* XFIXES_MAJOR >= 5 */
  
 +#if XFIXES_MAJOR >= 6
 +
-+typedef int32_t BarrierEventID;
++PointerBarrier
++XFixesCreatePointerBarrierVelocity(Display *dpy, Window w, int x1, int y1,
++			   int x2, int y2, int directions, int velocity,
++			   int num_devices, int *devices);
 +
 +typedef struct {
 +    int type;			/* event base */
@@ -33,7 +24,7 @@
 +    Display *display;
 +    Window window;
 +    int subtype;
-+    BarrierEventID event_id;
++    unsigned event_id;
 +    int directions;
 +    PointerBarrier barrier;
 +    int x;
@@ -50,17 +41,15 @@
 +void
 +XFixesBarrierReleasePointer(Display *dpy,
 +			    PointerBarrier b,
-+			    BarrierEventID event_id);
++			    unsigned event_id);
 +
 +#endif
 +
  _XFUNCPROTOEND
  
  #endif /* _XFIXES_H_ */
-Index: libxfixes-dev/src/Cursor.c
-===================================================================
---- libxfixes-dev.orig/src/Cursor.c	2012-03-13 09:36:56.810984004 +1100
-+++ libxfixes-dev/src/Cursor.c	2012-03-13 09:38:44.842989436 +1100
+--- a/src/Cursor.c
++++ b/src/Cursor.c
 @@ -334,3 +334,84 @@
      UnlockDisplay (dpy);
      SyncHandle();
@@ -128,7 +117,7 @@
 +}
 +
 +void
-+XFixesBarrierReleasePointer(Display *dpy, PointerBarrier b, BarrierEventID event_id)
++XFixesBarrierReleasePointer(Display *dpy, PointerBarrier b, unsigned event_id)
 +{
 +    XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
 +    xXFixesBarrierReleasePointerReq *req;
@@ -146,10 +135,8 @@
 +    UnlockDisplay (dpy);
 +    SyncHandle();
 +}
-Index: libxfixes-dev/src/Xfixes.c
-===================================================================
---- libxfixes-dev.orig/src/Xfixes.c	2012-03-13 09:36:56.810984004 +1100
-+++ libxfixes-dev/src/Xfixes.c	2012-03-13 09:38:44.842989436 +1100
+--- a/src/Xfixes.c
++++ b/src/Xfixes.c
 @@ -253,6 +253,26 @@
  	aevent->cursor_name = awire->name;
  	return True;
@@ -172,7 +159,7 @@
 +	aevent->y = awire->y;
 +	aevent->velocity = awire->velocity;
 +	aevent->timestamp = awire->timestamp;
-+	return True;      
++	return True;
 +    }
      }
      return False;
@@ -195,7 +182,7 @@
 +	awire->y = aevent->y;
 +	awire->velocity = aevent->velocity;
 +	awire->timestamp = aevent->timestamp;
-+	return True;      
++	return True;
 +    }
      }
      return False;