all in one patch easier to maintain

5 files changed, 2 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e202fcbb1611..51481c995b89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,11 +34,7 @@ pkgbase = swift-language-git
 	source = swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch
 	source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests
 	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
+	source = 0001-arch-aur-pachtes.patch
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/0001-not-build-ninja-icu.patch b/0001-arch-aur-pachtes.patch
index ed30dcf1a1f7..ed30dcf1a1f7 100644
--- a/0001-not-build-ninja-icu.patch
+++ b/0001-arch-aur-pachtes.patch
diff --git a/0003-swift-python2-as-fallback-only.patch b/0003-swift-python2-as-fallback-only.patch
deleted file mode 100644
index 399a00757ec7..000000000000
--- a/0003-swift-python2-as-fallback-only.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a20416f07c26b8dbb62b0b0b2b51d47f658cc1b2 Mon Sep 17 00:00:00 2001
-From: soloturn <soloturn@gmail.com>
-Date: Sat, 11 Jul 2020 04:26:10 +0200
-Subject: [PATCH] swift python2 as fallback only
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c8f9999c2a..df2da5e731 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -898,7 +898,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-   endif()
- endif()
- 
--find_package(Python2 COMPONENTS Interpreter REQUIRED)
-+find_package(Python2 COMPONENTS Interpreter)
- find_package(Python3 COMPONENTS Interpreter REQUIRED)
- if(NOT Python3_Interpreter_FOUND)
-   message(WARNING "Python3 not found, using python2 as a fallback")
--- 
-2.27.0
-
diff --git a/0005-duplicate-term-module.patch b/0005-duplicate-term-module.patch
deleted file mode 100644
index 10adaaffcc34..000000000000
--- a/0005-duplicate-term-module.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 2e4e6e4ab0e1..898839e62e78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,9 +36,7 @@ source=(
     'swift-integration-tests::git+https://github.com/apple/swift-integration-tests'
     'llvm-project::git+https://github.com/apple/llvm-project#branch=apple/master'
 #    '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'
+    '0001-arch-aur-pachtes.patch'
 )
 noextract=()
 md5sums=(
@@ -57,8 +55,6 @@ md5sums=(
     'SKIP'
     'SKIP'
     'SKIP'
-    'SKIP'
-    'SKIP'
 )