diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-18 19:16:07 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-18 19:16:07 +0800 |
| commit | 7525c49629e7e0b99bf366913c942a28e0f5234c (patch) | |
| tree | 511f74ae353063ed5f75822cf52bc81cff0cfa20 | |
| parent | e08f3478656641af7874004f2fb6fb492037dd3e (diff) | |
| download | xorg-devel-ports-7525c49629e7e0b99bf366913c942a28e0f5234c.tar.gz xorg-devel-ports-7525c49629e7e0b99bf366913c942a28e0f5234c.tar.zst xorg-devel-ports-7525c49629e7e0b99bf366913c942a28e0f5234c.zip | |
Fix conflict between libXi and libXfixes where PointerBarrier is double defined.
This patch is not accepted upstream as of yet.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@743 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11/libXi/files/patch-include_X11_extensions_XInput2.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/x11/libXi/files/patch-include_X11_extensions_XInput2.h b/x11/libXi/files/patch-include_X11_extensions_XInput2.h new file mode 100644 index 0000000..1def407 --- /dev/null +++ b/x11/libXi/files/patch-include_X11_extensions_XInput2.h @@ -0,0 +1,19 @@ +Temparly patch to fix symbol conflict between libXi and libXfixes. +http://lists.x.org/archives/xorg-devel/2013-March/035729.html + +diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h +index a746012..8de4aeb 100644 +--- include/X11/extensions/XInput2.h ++++ include/X11/extensions/XInput2.h +@@ -169,7 +169,11 @@ typedef struct + int status; + } XIGrabModifiers; + ++/* Xfixes.h typedefs PointerBarrier and gcc pre-4.6 (or with -pedantic) will ++ complain about the duplicate typedef */ ++#if !defined _XFIXES_H_ || XFIXES_MAJOR < 5 + typedef XID PointerBarrier; ++#endif + typedef unsigned int BarrierEventID; + + typedef struct |