Misc cleanup - reenable docs, remove unneeded fix

4 files changed, 31 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfd6fecc279c..fc517b62c115 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri May 27 17:13:45 UTC 2016
+# Wed Jun  1 18:06:28 UTC 2016
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
 	pkgver = 2.2.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://swift.org/
 	arch = i686
 	arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = swift-language
 	makedepends = clang>=3.8
 	makedepends = python2-six
 	makedepends = perl
+	makedepends = python2-sphinx
 	depends = python2
 	depends = libutil-linux
 	depends = icu
@@ -28,13 +29,13 @@ pkgbase = swift-language
 	source = swift-clang-2.2.1-RELEASE.tar.gz::https://github.com/apple/swift-clang/archive/swift-2.2.1-RELEASE.tar.gz
 	source = swift-lldb-2.2.1-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-2.2.1-RELEASE.tar.gz
 	source = swift-cmark-2.2.1-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-2.2.1-RELEASE.tar.gz
-	source = swift-no-docs.patch
+	source = swift-sphinx2.patch
 	sha256sums = e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a
 	sha256sums = f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2
 	sha256sums = 40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f
 	sha256sums = 2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3
 	sha256sums = 254d3c02bf2b03ad456fa3ad27b4da854e36318fcaf6b6f199fdb3e978a90803
-	sha256sums = 1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d
+	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index 1424946390da..d256f2b36f82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,15 @@ pkgname=(swift swift-lldb)
 _swiftver=2.2.1-RELEASE
 _swiftold=2.2-SNAPSHOT-2016-01-11-a
 pkgver=${_swiftver//-RELEASE/}
-pkgrel=2
+pkgrel=3
 pkgdesc="The Swift programming language and debugger"
 arch=('i686' 'x86_64')
 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"
@@ -18,14 +19,14 @@ source=(
     "swift-clang-${_swiftver}.tar.gz::https://github.com/apple/swift-clang/archive/swift-${_swiftver}.tar.gz"
     "swift-lldb-${_swiftver}.tar.gz::https://github.com/apple/swift-lldb/archive/swift-${_swiftver}.tar.gz"
     "swift-cmark-${_swiftver}.tar.gz::https://github.com/apple/swift-cmark/archive/swift-${_swiftver}.tar.gz"
-    "swift-no-docs.patch"
+    "swift-sphinx2.patch"
 )
 sha256sums=('e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a'
             'f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2'
             '40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f'
             '2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3'
             '254d3c02bf2b03ad456fa3ad27b4da854e36318fcaf6b6f199fdb3e978a90803'
-            '1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d')
+            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f')
 
 # Set this to 1 to enable the experimental parts (swiftpm, corelibs)
 # Otherwise, the standard libraries, llbuild, and swiftpm will NOT be available
@@ -61,10 +62,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; do
         ln -sf swift-${sdir}-swift-${_swiftver} ${sdir}
@@ -81,7 +78,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)
+