summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoloturn2020-08-01 14:52:21 +0200
committersoloturn2020-08-01 14:52:21 +0200
commit360b457502f51d6dd24250b2e8d4f5c5c1069db7 (patch)
treebdbbf59aa13be1c02d26866b7c5cda05076731ed
parenta01d76a901e3c6ef42d2b9fd939bfd507b6bfc29 (diff)
downloadaur-360b457502f51d6dd24250b2e8d4f5c5c1069db7.tar.gz
patch sphinx build, duplicate term description
https://forums.swift.org/t/unable-to-build-swift/38253
-rw-r--r--.SRCINFO2
-rw-r--r--0005-duplicate-term-module.patch24
-rw-r--r--PKGBUILD3
3 files changed, 29 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea93d49c7d30..444e92a06c4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -36,6 +36,8 @@ pkgbase = swift-language-git
source = llvm-project::git+https://github.com/apple/llvm-project#branch=apple/master
source = 0001-not-build-ninja-icu.patch
source = 0003-swift-python2-as-fallback-only.patch
+ source = 0005-duplicate-term-module.patch
+ md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
diff --git a/0005-duplicate-term-module.patch b/0005-duplicate-term-module.patch
new file mode 100644
index 000000000000..10adaaffcc34
--- /dev/null
+++ b/0005-duplicate-term-module.patch
@@ -0,0 +1,24 @@
+From 1be2cee533fa327a43fd9a8ff32d5d388de8aa9b Mon Sep 17 00:00:00 2001
+From: soloturn <soloturn@gmail.com>
+Date: Sat, 1 Aug 2020 14:45:45 +0200
+Subject: [PATCH] duplicate term module
+
+---
+ docs/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index c748bd36eb..eef2c34984 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -10,7 +10,6 @@ SET(SWIFT_SPHINX_PAPER_SIZE "letter"
+ CACHE STRING "Paper size for generated documentation")
+
+ SET(SPHINX_ARGS
+- -W
+ -D latex_elements.papersize=${SWIFT_SPHINX_PAPER_SIZE}
+ -d ${CMAKE_BINARY_DIR}/doctrees)
+
+--
+2.28.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 52bd43cb1ff7..9a9c93dccff7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,6 +39,7 @@ source=(
# 'llvm-project::git+https://github.com/apple/llvm-project#commit=e80a6b097761253'
'0001-not-build-ninja-icu.patch'
'0003-swift-python2-as-fallback-only.patch'
+ '0005-duplicate-term-module.patch'
)
noextract=()
md5sums=(
@@ -58,11 +59,13 @@ md5sums=(
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
)
prepare () {
( cd swift && patch -p1 -i "$srcdir/0001-not-build-ninja-icu.patch" )
( cd swift && patch -p1 -i "$srcdir/0003-swift-python2-as-fallback-only.patch" )
+ ( cd swift && patch -p1 -i "$srcdir/0005-duplicate-term-module.patch" )
}
pkgver() {