debian/changelog | 38 ++++++
debian/control | 3
debian/libxfixes3.symbols | 3
debian/patches/01_fixesproto-v6.diff | 202 -----------------------------------
debian/patches/series | 2
5 files changed, 41 insertions(+), 207 deletions(-)
New commits:
commit 8820f73ac39b3d5ad5ff3ff82595386f7e5520c4
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Feb 7 19:59:42 2013 +0200
Drop the v6 protocol.
diff --git a/debian/changelog b/debian/changelog
index 3b485d6..e15d55e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxfixes (1:5.0-4ubuntu6) raring; urgency=low
+
+ * Drop the v6 protocol.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 07 Feb 2013 19:57:29 +0200
+
libxfixes (1:5.0-4ubuntu5) quantal; urgency=low
* Rebuild for new armel compiler default of ARMv5t.
diff --git a/debian/control b/debian/control
index ad1b5ce..e1bca9d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 8.1.3),
dh-autoreconf,
libx11-dev (>= 2:1.3.3-2),
- x11proto-fixes-dev (>= 1:5.0-2ubuntu1~),
+ x11proto-fixes-dev (>= 1:5.0),
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4),
diff --git a/debian/libxfixes3.symbols b/debian/libxfixes3.symbols
index 7dffb59..2cedbeb 100644
--- a/debian/libxfixes3.symbols
+++ b/debian/libxfixes3.symbols
@@ -1,11 +1,9 @@
libXfixes.so.3 libxfixes3 #MINVER#
- XFixesBarrierReleasePointer@Base 1:5.0-4ubuntu1
XFixesChangeCursor@Base 0
XFixesChangeCursorByName@Base 0
XFixesChangeSaveSet@Base 0
XFixesCopyRegion@Base 0
XFixesCreatePointerBarrier@Base 1:5.0
- XFixesCreatePointerBarrierVelocity@Base 1:5.0-4ubuntu1
XFixesCreateRegion@Base 0
XFixesCreateRegionFromBitmap@Base 0
XFixesCreateRegionFromGC@Base 0
@@ -27,7 +25,6 @@ libXfixes.so.3 libxfixes3 #MINVER#
XFixesQueryExtension@Base 0
XFixesQueryVersion@Base 0
XFixesRegionExtents@Base 0
- XFixesSelectBarrierInput@Base 1:5.0-4ubuntu1
XFixesSelectCursorInput@Base 0
XFixesSelectSelectionInput@Base 0
XFixesSetCursorName@Base 0
diff --git a/debian/patches/01_fixesproto-v6.diff
b/debian/patches/01_fixesproto-v6.diff
deleted file mode 100644
index 14a2df4..0000000
--- a/debian/patches/01_fixesproto-v6.diff
+++ /dev/null
@@ -1,202 +0,0 @@
-commit 5251cfa60a123a73e8261ea654200eba1e653b33
-Author: Christopher James Halse Rogers <r...@ubuntu.com>
-Date: Fri Jan 27 18:32:45 2012 +1100
-
- 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);
-
- #endif /* XFIXES_MAJOR >= 5 */
-
-+#if XFIXES_MAJOR >= 6
-+
-+typedef int32_t BarrierEventID;
-+
-+typedef struct {
-+ int type; /* event base */
-+ unsigned long serial;
-+ Bool send_event;
-+ Display *display;
-+ Window window;
-+ int subtype;
-+ BarrierEventID event_id;
-+ int directions;
-+ PointerBarrier barrier;
-+ int x;
-+ int y;
-+ int velocity;
-+ Time timestamp;
-+} XFixesBarrierNotifyEvent;
-+
-+void
-+XFixesSelectBarrierInput (Display *dpy,
-+ Window win,
-+ unsigned long eventMask);
-+
-+void
-+XFixesBarrierReleasePointer(Display *dpy,
-+ PointerBarrier b,
-+ BarrierEventID 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
-@@ -334,3 +334,84 @@
- UnlockDisplay (dpy);
- SyncHandle();
- }
-+
-+void
-+XFixesSelectBarrierInput (Display *dpy, Window win, unsigned long eventMask)
-+{
-+ XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
-+ xXFixesSelectBarrierInputReq *req;
-+
-+ XFixesSimpleCheckExtension (dpy, info);
-+ if (info->major_version < 6)
-+ return;
-+
-+ LockDisplay (dpy);
-+ GetReq (XFixesSelectBarrierInput, req);
-+ req->reqType = info->codes->major_opcode;
-+ req->xfixesReqType = X_XFixesSelectBarrierInput;
-+ req->window = win;
-+ req->eventMask = eventMask;
-+ UnlockDisplay (dpy);
-+ SyncHandle();
-+}
-+
-+PointerBarrier
-+XFixesCreatePointerBarrierVelocity(Display *dpy, Window w, int x1, int y1,
-+ int x2, int y2, int directions, int velocity,
-+ int num_devices, int *devices)
-+{
-+ XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
-+ xXFixesCreatePointerBarrierVelocityReq *req;
-+ PointerBarrier barrier;
-+ int extra = 0;
-+
-+ XFixesCheckExtension (dpy, info, 0);
-+ if (info->major_version < 6)
-+ return 0;
-+
-+ if (num_devices)
-+ extra = (((2 * num_devices) + 3) / 4) * 4;
-+
-+ LockDisplay (dpy);
-+ GetReqExtra (XFixesCreatePointerBarrierVelocity, extra, req);
-+ req->reqType = info->codes->major_opcode;
-+ req->xfixesReqType = X_XFixesCreatePointerBarrierVelocity;
-+ barrier = req->barrier = XAllocID (dpy);
-+ req->window = w;
-+ req->x1 = x1;
-+ req->y1 = y1;
-+ req->x2 = x2;
-+ req->y2 = y2;
-+ req->directions = directions;
-+ req->velocity = velocity;
-+ if ((req->num_devices = num_devices)) {
-+ int i;
-+ CARD16 *devs = (CARD16 *)(req + 1);
-+ for (i = 0; i < num_devices; i++)
-+ devs[i] = (CARD16)(devices[i]);
-+ }
-+
-+ UnlockDisplay (dpy);
-+ SyncHandle();
-+ return barrier;
-+}
-+
-+void
-+XFixesBarrierReleasePointer(Display *dpy, PointerBarrier b, BarrierEventID
event_id)
-+{
-+ XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy);
-+ xXFixesBarrierReleasePointerReq *req;
-+
-+ XFixesSimpleCheckExtension (dpy, info);
-+ if (info->major_version < 6)
-+ return;
-+
-+ LockDisplay (dpy);
-+ GetReq (XFixesBarrierReleasePointer, req);
-+ req->reqType = info->codes->major_opcode;
-+ req->xfixesReqType = X_XFixesBarrierReleasePointer;
-+ req->barrier = b;
-+ req->event_id = event_id;
-+ 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
-@@ -253,6 +253,26 @@
- aevent->cursor_name = awire->name;
- return True;
- }
-+ case XFixesBarrierNotify: {
-+ XFixesBarrierNotifyEvent *aevent;
-+ xXFixesBarrierNotifyEvent *awire;
-+ awire = (xXFixesBarrierNotifyEvent *)wire;
-+ aevent = (XFixesBarrierNotifyEvent *)event;
-+ aevent->type = awire->type & 0x7F;
-+ aevent->subtype = awire->subtype;
-+ aevent->serial = _XSetLastRequestRead(dpy,
-+ (xGenericReply *) wire);
-+ aevent->send_event = (awire->type & 0x80) != 0;
-+ aevent->display = dpy;
-+ aevent->window = awire->window;
-+ aevent->event_id = awire->event_id;
-+ aevent->barrier = awire->barrier;
-+ aevent->x = awire->x;
-+ aevent->y = awire->y;
-+ aevent->velocity = awire->velocity;
-+ aevent->timestamp = awire->timestamp;
-+ return True;
-+ }
- }
- return False;
- }
-@@ -292,6 +312,22 @@
- awire->cursorSerial = aevent->cursor_serial;
- awire->name = aevent->cursor_name;
- }
-+ case XFixesBarrierNotify: {
-+ XFixesBarrierNotifyEvent *aevent;
-+ xXFixesBarrierNotifyEvent *awire;
-+ awire = (xXFixesBarrierNotifyEvent *)wire;
-+ aevent = (XFixesBarrierNotifyEvent *)event;
-+ awire->type = aevent->type | (aevent->send_event ? 0x80 : 0);
-+ awire->subtype = aevent->subtype;
-+ awire->window = aevent->window;
-+ awire->event_id = aevent->event_id;
-+ awire->barrier = aevent->barrier;
-+ awire->x = aevent->x;
-+ awire->y = aevent->y;
-+ awire->velocity = aevent->velocity;
-+ awire->timestamp = aevent->timestamp;
-+ return True;
-+ }
- }
- return False;
- }
diff --git a/debian/patches/series b/debian/patches/series
index af85a93..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_fixesproto-v6.diff
+# placeholder
commit c2cfd73fc342b9e5a6fac67fa31214bd9381056c
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Feb 7 19:52:58 2013 +0200
import ubuntu changes
diff --git a/debian/changelog b/debian/changelog
index 591188e..3b485d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+libxfixes (1:5.0-4ubuntu5) quantal; urgency=low
+
+ * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <cjwat...@ubuntu.com> Fri, 05 Oct 2012 10:46:53 +0100
+
+libxfixes (1:5.0-4ubuntu4) precise; urgency=low
+
+ * debian/patches/01_fixesproto-v6.diff:
+ - Fix BarrierNotifyEvent layout (again), so that the xany union member
+ contains a valid Display. Fixes crashes in Qt event handling.
+ * debian/control:
+ - Declare a Breaks against unity; it's the only user of this ABI,
+ and not an upstream ABI break.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 13 Mar 2012
22:00:04 +1100
+
+libxfixes (1:5.0-4ubuntu3) precise; urgency=low
+
+ * Revert previous upload; this changes ABI, breaking the Unity launcher
+ reveal behaviour.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 13 Mar 2012
14:37:41 +1100
+
+libxfixes (1:5.0-4ubuntu2) precise; urgency=low
+
+ * debian/patches/01_fixesproto-v6.diff:
+ - Fix BarrierNotifyEvent layout, so that the xany union member
+ contains a valid Display. Fixes crashes in Qt event handling.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 13 Mar 2012
10:01:44 +1100
+
libxfixes (1:5.0-4ubuntu1) precise; urgency=low
* debian/control:
diff --git a/debian/control b/debian/control
index b6f1585..ad1b5ce 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends:
${misc:Depends},
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
+Breaks: unity (<< 5.6.0-0ubuntu2)
Description: X11 miscellaneous 'fixes' extension library
libXfixes provides an X Window System client interface to the 'XFIXES'
extension to the X protocol.
diff --git a/debian/patches/01_fixesproto-v6.diff
b/debian/patches/01_fixesproto-v6.diff
index 673c20b..14a2df4 100644
--- a/debian/patches/01_fixesproto-v6.diff
+++ b/debian/patches/01_fixesproto-v6.diff
@@ -4,11 +4,11 @@ Date: Fri Jan 27 18:32:45 2012 +1100
libXFixes v6: Pointer barrier improvements
-diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
-index 8995d14..992bff1 100644
---- a/include/X11/extensions/Xfixes.h
-+++ b/include/X11/extensions/Xfixes.h
-@@ -259,11 +259,48 @@ XFixesCreatePointerBarrier(Display *dpy, Window w, int
x1, int y1,
+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);
@@ -28,11 +28,11 @@ index 8995d14..992bff1 100644
+
+typedef struct {
+ int type; /* event base */
-+ int subtype;
+ unsigned long serial;
+ Bool send_event;
+ Display *display;
+ Window window;
++ int subtype;
+ BarrierEventID event_id;
+ int directions;
+ PointerBarrier barrier;
@@ -57,11 +57,11 @@ index 8995d14..992bff1 100644
_XFUNCPROTOEND
#endif /* _XFIXES_H_ */
-diff --git a/src/Cursor.c b/src/Cursor.c
-index b3dfed1..6053046 100644
---- a/src/Cursor.c
-+++ b/src/Cursor.c
-@@ -334,3 +334,84 @@ XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier
b)
+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
+@@ -334,3 +334,84 @@
UnlockDisplay (dpy);
SyncHandle();
}
@@ -146,11 +146,11 @@ index b3dfed1..6053046 100644
+ UnlockDisplay (dpy);
+ SyncHandle();
+}
-diff --git a/src/Xfixes.c b/src/Xfixes.c
-index c32ee39..dc41e25 100644
---- a/src/Xfixes.c
-+++ b/src/Xfixes.c
-@@ -253,6 +253,26 @@ XFixesWireToEvent(Display *dpy, XEvent *event, xEvent
*wire)
+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
+@@ -253,6 +253,26 @@
aevent->cursor_name = awire->name;
return True;
}
@@ -177,7 +177,7 @@ index c32ee39..dc41e25 100644
}
return False;
}
-@@ -292,6 +312,22 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent
*wire)
+@@ -292,6 +312,22 @@
awire->cursorSerial = aevent->cursor_serial;
awire->name = aevent->cursor_name;
}
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3vql-0002ic...@vasks.debian.org
