libx11-git: Disable dolt

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

4 files changed, 16 insertions, 3 deletions

diff --git a/meta/packages/xorg-lib/libx11-git/nodolt.patch b/meta/packages/xorg-lib/libx11-git/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-git/nodolt.patch
@@ -0,0 +1,12 @@
+Index: libX11-1.2.1/configure.ac
+===================================================================
+--- libX11-1.2.1.orig/configure.ac      2009-07-02 14:07:54.000000000 +0100
++++ libX11-1.2.1/configure.ac   2009-07-02 14:08:01.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
+ 
diff --git a/meta/packages/xorg-lib/libx11-trim_git.bb b/meta/packages/xorg-lib/libx11-trim_git.bb
index 45ec225b43..99426c3c5d 100644
--- a/meta/packages/xorg-lib/libx11-trim_git.bb
+++ b/meta/packages/xorg-lib/libx11-trim_git.bb
@@ -1,7 +1,7 @@
 require libx11.inc
 require libx11_git.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
 
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
index 1234659fa6..a976a16cd3 100644
--- a/meta/packages/xorg-lib/libx11_git.bb
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -1,7 +1,7 @@
 require libx11.inc
 require libx11_git.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
            bigreqsproto xtrans libxau libxcb libxdmcp util-macros gettext"
diff --git a/meta/packages/xorg-lib/libx11_git.inc b/meta/packages/xorg-lib/libx11_git.inc
index a543826043..40d806178f 100644
--- a/meta/packages/xorg-lib/libx11_git.inc
+++ b/meta/packages/xorg-lib/libx11_git.inc
@@ -4,7 +4,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
 S = "${WORKDIR}/git"
 
 SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
-            file://include_fix.patch;patch=1"
+            file://include_fix.patch;patch=1 \
+            file://nodolt.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
 FILESPATH = "${FILE_DIRNAME}/libx11-git"