From 920db53712c2e69b221e080120bae2c5d72b5fd0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 12 Mar 2006 19:23:34 +0000 Subject: libxcomposite-X11R7.0-0.2.2.2: build fix for people with an old Xcomposite.h in their staging directory --- packages/xlibs/libxcomposite/.mtn2git_empty | 0 packages/xlibs/libxcomposite/change-include-order.patch | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 packages/xlibs/libxcomposite/.mtn2git_empty create mode 100644 packages/xlibs/libxcomposite/change-include-order.patch (limited to 'packages/xlibs/libxcomposite') diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xlibs/libxcomposite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xlibs/libxcomposite/change-include-order.patch new file mode 100644 index 0000000000..630b8818fc --- /dev/null +++ b/packages/xlibs/libxcomposite/change-include-order.patch @@ -0,0 +1,14 @@ +This patch makes the build use its own Xcomposite.h over rather than an +older Xcomposite.h that might already be installed in the staging dir. + +--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig 2006-03-12 20:10:17.000000000 +0100 ++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am 2006-03-12 20:10:35.000000000 +0100 +@@ -21,7 +21,7 @@ + # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + +-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) + + lib_LTLIBRARIES = libXcomposite.la + -- cgit v1.2.3