diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-19 21:49:32 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-03-19 21:49:32 +0800 |
| commit | 32cf7f208b47c15bad3f5e10e88adeaf2820a847 (patch) | |
| tree | 543ad1c9525753b345eb306060d6d8d54fe9bc5f | |
| parent | 34b239b36bd8914fb2acb4242df779d1a6bb902c (diff) | |
| download | xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.tar xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.tar.gz xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.tar.bz2 xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.tar.lz xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.tar.xz xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.tar.zst xorg-devel-ports-32cf7f208b47c15bad3f5e10e88adeaf2820a847.zip | |
Add a patch to fix symbol conflict with libXi.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@753 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11/libXfixes/Makefile | 23 | ||||
| -rw-r--r-- | x11/libXfixes/distinfo | 2 | ||||
| -rw-r--r-- | x11/libXfixes/files/patch-include_X11_extensions_Xfixes.h | 16 | ||||
| -rw-r--r-- | x11/libXfixes/pkg-descr | 3 | ||||
| -rw-r--r-- | x11/libXfixes/pkg-plist | 6 |
5 files changed, 50 insertions, 0 deletions
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile new file mode 100644 index 0000000..beb16f2 --- /dev/null +++ b/x11/libXfixes/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libXext +# Date Created: 29 Oct, 2003 +# Whom: Eric Anholt <anholt@FreeBSD.org> +# +# $FreeBSD: head/x11/libXfixes/Makefile 300897 2012-07-14 14:29:18Z beat $ +# + +PORTNAME= libXfixes +PORTVERSION= 5.0 +PORTREVISION= 1 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= X Fixes extension library + +LICENSE= MIT + +XORG_CAT= lib +USE_XORG= x11 fixesproto:both xproto:both xextproto + +MAN3= Xfixes.3 + +.include <bsd.port.mk> diff --git a/x11/libXfixes/distinfo b/x11/libXfixes/distinfo new file mode 100644 index 0000000..e9cd526 --- /dev/null +++ b/x11/libXfixes/distinfo @@ -0,0 +1,2 @@ +SHA256 (xorg/lib/libXfixes-5.0.tar.bz2) = 537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3 +SIZE (xorg/lib/libXfixes-5.0.tar.bz2) = 253777 diff --git a/x11/libXfixes/files/patch-include_X11_extensions_Xfixes.h b/x11/libXfixes/files/patch-include_X11_extensions_Xfixes.h new file mode 100644 index 0000000..98fee84 --- /dev/null +++ b/x11/libXfixes/files/patch-include_X11_extensions_Xfixes.h @@ -0,0 +1,16 @@ +Temparly patch to fix symbol conflict between libXi and libXfixes. +http://lists.x.org/archives/xorg-devel/2013-March/035729.html +This is needed because Xi header might be included before the Xfixes header + +--- include/X11/extensions/Xfixes.h.orig 2013-03-19 12:07:49.000000000 +0000 ++++ include/X11/extensions/Xfixes.h 2013-03-19 12:09:51.000000000 +0000 +@@ -252,7 +252,9 @@ + + #if XFIXES_MAJOR >= 5 + ++#if !defined _XINPUT2_H_ + typedef XID PointerBarrier; ++#endif + + PointerBarrier + XFixesCreatePointerBarrier(Display *dpy, Window w, int x1, int y1, diff --git a/x11/libXfixes/pkg-descr b/x11/libXfixes/pkg-descr new file mode 100644 index 0000000..b6ab220 --- /dev/null +++ b/x11/libXfixes/pkg-descr @@ -0,0 +1,3 @@ +This package contains the X Fixes extension library. + +WWW: http://www.freedesktop.org/Software/xlibs diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist new file mode 100644 index 0000000..f8e8b57 --- /dev/null +++ b/x11/libXfixes/pkg-plist @@ -0,0 +1,6 @@ +include/X11/extensions/Xfixes.h +lib/libXfixes.a +lib/libXfixes.la +lib/libXfixes.so +lib/libXfixes.so.3 +libdata/pkgconfig/xfixes.pc |