From 1805a94f1f1c78f183080671911c722962e0caae Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 19 Sep 2016 09:34:43 +1000
Subject: [PATCH] llvm: fix docs even more

---
 ...-fix-code-2.patch => 0001-fix-docs-2.patch |  0
 0001-fix-docs-3.patch                         | 46 +++++++++++++++++++
 llvm.spec                                     |  4 +-
 3 files changed, 49 insertions(+), 1 deletion(-)
 rename 0001-fix-code-2.patch => 0001-fix-docs-2.patch (100%)
 create mode 100644 0001-fix-docs-3.patch

diff --git a/0001-fix-code-2.patch b/0001-fix-docs-2.patch
similarity index 100%
rename from 0001-fix-code-2.patch
rename to 0001-fix-docs-2.patch
diff --git a/0001-fix-docs-3.patch b/0001-fix-docs-3.patch
new file mode 100644
index 0000000..f46b57f
--- /dev/null
+++ b/0001-fix-docs-3.patch
@@ -0,0 +1,46 @@
+From 9871423412faa2ed8380445a26ed1b0991a18502 Mon Sep 17 00:00:00 2001
+From: Aaron Ballman <aaron@aaronballman.com>
+Date: Tue, 19 Jul 2016 23:50:11 +0000
+Subject: [PATCH] This code block breaks the docs build
+ (http://lab.llvm.org:8011/builders/llvm-sphinx-docs/builds/11925/steps/docs-llvm-html/logs/stdio).
+ Setting the code highlighting to none instead of llvm.
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276060 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ docs/BranchWeightMetadata.rst | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/BranchWeightMetadata.rst b/docs/BranchWeightMetadata.rst
+index 6cbcb0f..9e61d23 100644
+--- a/docs/BranchWeightMetadata.rst
++++ b/docs/BranchWeightMetadata.rst
+@@ -29,7 +29,7 @@ Supported Instructions
+ Metadata is only assigned to the conditional branches. There are two extra
+ operands for the true and the false branch.
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   !0 = metadata !{
+     metadata !"branch_weights",
+@@ -43,7 +43,7 @@ operands for the true and the false branch.
+ Branch weights are assigned to every case (including the ``default`` case which
+ is always case #0).
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   !0 = metadata !{
+     metadata !"branch_weights",
+@@ -56,7 +56,7 @@ is always case #0).
+ 
+ Branch weights are assigned to every destination.
+ 
+-.. code-block:: llvm
++.. code-block:: none
+ 
+   !0 = metadata !{
+     metadata !"branch_weights",
+-- 
+2.5.5
+
diff --git a/llvm.spec b/llvm.spec
index 322b157..19890db 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -20,7 +20,8 @@ Source100:	llvm-config.h
 Patch0:		llvm-3.7.1-cmake-s390.patch
 
 Patch1:		0001-This-code-block-breaks-the-docs-build-http-lab.llvm..patch
-Patch2:		0001-fix-code-2.patch
+Patch2:		0001-fix-docs-2.patch
+Patch3:		0001-fix-docs-3.patch
 
 BuildRequires:	cmake
 BuildRequires:	zlib-devel
@@ -75,6 +76,7 @@ Static libraries for the LLVM compiler infrastructure.
 %patch0 -p1 -b .s390
 %patch1 -p1 -b .sphinx
 %patch2 -p1 -b .docs2
+%patch3 -p1 -b .docs3
 
 %build
 mkdir -p _build