Unbork x11 build w/ automake 1.9.x.

BKrev: 419ec3876-Q6xcU9jbpr06p_4Pd20g

diff --git a/x11/files/autofoo.patch b/x11/files/autofoo.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/x11/x11_6.2.1.oe b/x11/x11_6.2.1.oe
index f83baa8..e8472d9 100644 (file)
--- a/x11/x11_6.2.1.oe
+++ b/x11/x11_6.2.1.oe
@@ -5,8 +5,10 @@ DEPENDS = "xproto xextensions xau xtrans xdmcp"
 DESCRIPTION = "Base X libs."
 FILES_${PN}_append = " ${datadir}/X11"
 PROVIDES = "x11"
+PR = "r1"
 
-SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2"
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
+          file://autofoo.patch;patch=1"
 S = "${WORKDIR}/libX11-${PV}"
 
 inherit autotools pkgconfig 

diff --git a/x11/x11_cvs.oe b/x11/x11_cvs.oe
index 4c52bf3..0a551cf 100644 (file)
--- a/x11/x11_cvs.oe
+++ b/x11/x11_cvs.oe
@@ -1,4 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
+PR = "r1"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
@@ -7,7 +8,8 @@ DESCRIPTION = "Base X libs."
 FILES_${PN}_append = " ${datadir}/X11"
 PROVIDES = "x11"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \
+          file://autofoo.patch;patch=1"
 S = "${WORKDIR}/X11"
 
 inherit autotools pkgconfig