Misc cleanup - reenable docs, remove unneeded fix

4 files changed, 29 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a575a96ec41c..363c2eb546be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Jun  1 17:32:02 UTC 2016
+# Wed Jun  1 17:33:46 UTC 2016
 pkgbase = swift-development
 	pkgdesc = The Swift programming language and debugger - latest development snapshot
 	pkgver = DEVELOPMENT.SNAPSHOT.2016.05.31.a
@@ -15,6 +15,7 @@ pkgbase = swift-development
 	makedepends = clang>=3.8
 	makedepends = python2-six
 	makedepends = perl
+	makedepends = python2-sphinx
 	depends = python2
 	depends = libutil-linux
 	depends = icu
@@ -33,7 +34,7 @@ pkgbase = swift-development
 	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
 	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
 	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a.tar.gz
-	source = swift-no-docs.patch
+	source = swift-sphinx2.patch
 	sha256sums = 80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0
 	sha256sums = 22a9640ec711c75586017aaaa6d95f99c9a37105f4ac79a786fcfd634d71ef4b
 	sha256sums = 7dcb9dd52c4748535912a964de37f43d624197ce52f193e3c5e622fc33f1b223
@@ -44,7 +45,7 @@ pkgbase = swift-development
 	sha256sums = af64e2dbe1228bb9bdbe7d0c1fa37e0d4eee50008a759fd87f18aad292f8e5fa
 	sha256sums = bcd8c1ee304b5142d1c0c0f249ad92be4d6bb5ac38aca8bbc01a1dfe26bcafde
 	sha256sums = 3b211bd3708af55e9909b210d7f426c9c9307798020809beab72e657cd36a00d
-	sha256sums = 1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d
+	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
 
 pkgname = swift-development
 	pkgdesc = The Swift programming language compiler and tools - development snapshot
diff --git a/PKGBUILD b/PKGBUILD
index 52ddb153a14f..3286416031a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,8 @@ url="http://swift.org/"
 license=('apache')
 depends=('python2' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
          'sqlite' 'ncurses')
-makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.8' 'python2-six' 'perl')
+makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.8' 'python2-six' 'perl'
+             'python2-sphinx')
 source=(
     "swift-${_swiftver}.tar.gz::https://github.com/apple/swift/archive/swift-${_swiftver}.tar.gz"
     "swift-llvm-${_swiftver}.tar.gz::https://github.com/apple/swift-llvm/archive/swift-${_swiftver}.tar.gz"
@@ -21,7 +22,7 @@ source=(
     "swift-corelibs-xctest-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
-    "swift-no-docs.patch"
+    "swift-sphinx2.patch"
 )
 sha256sums=('80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0'
             '22a9640ec711c75586017aaaa6d95f99c9a37105f4ac79a786fcfd634d71ef4b'
@@ -33,7 +34,7 @@ sha256sums=('80729b4288ebb36610024ecd52df1b00427b358309a0607432decfea2f1905f0'
             'af64e2dbe1228bb9bdbe7d0c1fa37e0d4eee50008a759fd87f18aad292f8e5fa'
             'bcd8c1ee304b5142d1c0c0f249ad92be4d6bb5ac38aca8bbc01a1dfe26bcafde'
             '3b211bd3708af55e9909b210d7f426c9c9307798020809beab72e657cd36a00d'
-            '1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d')
+            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f')
 
 prepare() {
     # Use python2 where appropriate
@@ -48,10 +49,6 @@ prepare() {
     sed -i 's/\<python\>/&2/' \
          "$srcdir/swift-swift-${_swiftver}/utils/build-script-impl"
 
-    # Fix bad include paths
-    find "$srcdir" -type f -print0 | \
-         xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
-
     # Use directory names which build-script expects
     for sdir in llvm clang lldb cmark llbuild; do
         ln -sf swift-${sdir}-swift-${_swiftver} ${sdir}
@@ -64,7 +61,7 @@ prepare() {
 
     # Sphinx 1.3.5 raises a warning (promoted to error) when using an unknown
     # syntax highlighting language (like "swift").
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-no-docs.patch" )
+    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-sphinx2.patch" )
 }
 
 build() {
diff --git a/swift-no-docs.patch b/swift-no-docs.patch
deleted file mode 100644
index 47fb791dd7ea..000000000000
--- a/swift-no-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- a/docs/CMakeLists.txt	2016-02-11 13:07:07.451027973 -0800
-+++ b/docs/CMakeLists.txt	2016-02-11 13:06:30.881026867 -0800
-@@ -14,7 +14,7 @@ SET(SPHINX_ARGS
-   -D latex_paper_size=${SWIFT_SPHINX_PAPER_SIZE}
-   -d ${CMAKE_BINARY_DIR}/doctrees)
- 
--if(SPHINX_EXECUTABLE)
-+if(FALSE)
-   add_custom_target(docs_html ALL
-     ${SPHINX_EXECUTABLE} ${SPHINX_ARGS} -b html
-       . ${CMAKE_BINARY_DIR}/docs/html
diff --git a/swift-sphinx2.patch b/swift-sphinx2.patch
new file mode 100644
index 000000000000..ca37917232e4
--- /dev/null
+++ b/swift-sphinx2.patch
@@ -0,0 +1,20 @@
+diff -rupN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+--- a/docs/CMakeLists.txt	2016-06-01 09:50:24.174184477 -0700
++++ b/docs/CMakeLists.txt	2016-06-01 09:51:02.687901780 -0700
+@@ -1,7 +1,7 @@
+ add_subdirectory(tools)
+ 
+ find_program(SPHINX_EXECUTABLE
+-  NAMES sphinx-build
++  NAMES sphinx-build2
+   HINTS $ENV{SPHINX_DIR}
+   PATH_SUFFIXES bin
+   DOC "Sphinx documentation generator")
+@@ -10,7 +10,6 @@ SET(SWIFT_SPHINX_PAPER_SIZE "letter"
+   CACHE STRING "Paper size for generated documentation")
+ 
+ SET(SPHINX_ARGS
+-  -W
+   -D latex_paper_size=${SWIFT_SPHINX_PAPER_SIZE}
+   -d ${CMAKE_BINARY_DIR}/doctrees)
+