summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--swift-no-docs.patch12
3 files changed, 24 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3cdf63fec656..c903c5c49d13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Feb 10 02:03:46 UTC 2016
+# Thu Feb 11 23:15:41 UTC 2016
pkgbase = swift-language
pkgdesc = The Swift programming language and debugger
pkgver = 2.2.SNAPSHOT.2016.02.08.a
- pkgrel = 1
+ pkgrel = 2
url = http://swift.org/
arch = i686
arch = x86_64
@@ -31,6 +31,7 @@ pkgbase = swift-language
source = swift-package-manager-2.2-SNAPSHOT-2016-01-11-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-2.2-SNAPSHOT-2016-01-11-a.tar.gz
source = swift-corelibs-xctest-2.2-SNAPSHOT-2016-01-11-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-2.2-SNAPSHOT-2016-01-11-a.tar.gz
source = swift-corelibs-foundation-2.2-SNAPSHOT-2016-01-11-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-2.2-SNAPSHOT-2016-01-11-a.tar.gz
+ source = swift-no-docs.patch
sha256sums = 0bbb6ea37c05ca73862ee8f9f05ed2118aca12d6c0b371c1cbaf66ed333f6325
sha256sums = 93a142abd766418669816d21e47c0b855719e1b08da946499fd4f48e3d55cb46
sha256sums = cc0eb9e27799b8b2cadf906da4fc7dec1da7952793543d922dea67e104a20421
@@ -40,6 +41,7 @@ pkgbase = swift-language
sha256sums = 60b11af87b565d68dd5e6d13af5052f359923e3146a6ffc8336c86d68b5c4fa6
sha256sums = 5fde35c76b688ec37d8e25f0bc3cc1738548d8bd03a709bcfb3cb2744b221a9e
sha256sums = 66bf0fb21c37bb2792b113b770e225c90bca548b2246f86054e14c6cc79f0517
+ sha256sums = 1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d
pkgname = swift
pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index c3197f9ec1b1..361c63a68403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _swiftver=2.2-SNAPSHOT-2016-02-08-a
_swiftold=2.2-SNAPSHOT-2016-01-11-a
#_develver=${_swiftver//2.2-SNAPSHOT/DEVELOPMENT-SNAPSHOT}
pkgver=${_swiftver//-/.}
-pkgrel=1
+pkgrel=2
pkgdesc="The Swift programming language and debugger"
arch=('i686' 'x86_64')
url="http://swift.org/"
@@ -22,6 +22,7 @@ source=(
"swift-package-manager-${_swiftold}.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-${_swiftold}.tar.gz"
"swift-corelibs-xctest-${_swiftold}.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-${_swiftold}.tar.gz"
"swift-corelibs-foundation-${_swiftold}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftold}.tar.gz"
+ "swift-no-docs.patch"
)
sha256sums=('0bbb6ea37c05ca73862ee8f9f05ed2118aca12d6c0b371c1cbaf66ed333f6325'
'93a142abd766418669816d21e47c0b855719e1b08da946499fd4f48e3d55cb46'
@@ -31,7 +32,8 @@ sha256sums=('0bbb6ea37c05ca73862ee8f9f05ed2118aca12d6c0b371c1cbaf66ed333f6325'
'c5e92b71daecbeeb8fe043fe58bc85c7deacaadc21caa38357d569ae4093a023'
'60b11af87b565d68dd5e6d13af5052f359923e3146a6ffc8336c86d68b5c4fa6'
'5fde35c76b688ec37d8e25f0bc3cc1738548d8bd03a709bcfb3cb2744b221a9e'
- '66bf0fb21c37bb2792b113b770e225c90bca548b2246f86054e14c6cc79f0517')
+ '66bf0fb21c37bb2792b113b770e225c90bca548b2246f86054e14c6cc79f0517'
+ '1a8663c48a1a203d1825ae62a7e4191e4980a2dad461d4d88152221ad9e2171d')
prepare() {
# Use python2 where appropriate
@@ -62,6 +64,10 @@ prepare() {
done
ln -sf swift-swift-${_swiftver} swift
ln -sf swift-package-manager-swift-${_swiftold} swiftpm
+
+ # 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" )
}
build() {
diff --git a/swift-no-docs.patch b/swift-no-docs.patch
new file mode 100644
index 000000000000..47fb791dd7ea
--- /dev/null
+++ b/swift-no-docs.patch
@@ -0,0 +1,12 @@
+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