sourcekit-lsp python3 now fixed upstream

3 files changed, 2 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 334f431f4e8b..22b6076449e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = swift-language-git
 	pkgdesc = The Swift programming language, taken directly from the Apple repository
-	pkgver = swift.DEVELOPMENT.SNAPSHOT.2020.10.15.a.r55.g789ada59f31
+	pkgver = swift.DEVELOPMENT.SNAPSHOT.2020.10.22.a.r57.g40ce7f6e24b
 	pkgrel = 1
 	url = https://swift.org/
 	arch = x86_64
diff --git a/0001-sourcekit-lsp-python2-python3.patch b/0001-sourcekit-lsp-python2-python3.patch
deleted file mode 100644
index 81ffde590884..000000000000
--- a/0001-sourcekit-lsp-python2-python3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ca6dbf10325a997405accbe9380e48d8d0695555 Mon Sep 17 00:00:00 2001
-From: soloturn <soloturn@gmail.com>
-Date: Sat, 24 Oct 2020 07:34:24 +0200
-Subject: [PATCH] sourcekit-lsp python2, python3
-
----
- Utilities/build-script-helper.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Utilities/build-script-helper.py b/Utilities/build-script-helper.py
-index 2a4f193..2e7ca03 100755
---- a/Utilities/build-script-helper.py
-+++ b/Utilities/build-script-helper.py
-@@ -71,7 +71,7 @@ def install(swiftpm_bin_path, toolchain):
-     install_binary(exe, swiftpm_bin_path, toolchain_bin, toolchain)
- 
- def install_binary(exe, source_dir, install_dir, toolchain):
--  cmd = ['rsync', '-a', os.path.join(source_dir.decode('UTF-8'), exe), install_dir]
-+  cmd = ['rsync', '-a', os.path.join(source_dir, exe), install_dir]
-   print(' '.join(cmd))
-   subprocess.check_call(cmd)
- 
--- 
-2.29.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 90f97a1bcc82..cf555ea22a77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Andrew Sun <adsun701@gmail.com>
 
 pkgname=swift-language-git
-pkgver=swift.DEVELOPMENT.SNAPSHOT.2020.10.22.a.r57.g40ce7f6e24b
+pkgver=swift.DEVELOPMENT.SNAPSHOT.2020.10.24.a.r84.g290923c344a
 pkgrel=1
 pkgdesc="The Swift programming language, taken directly from the Apple repository"
 arch=('x86_64')
@@ -39,7 +39,6 @@ source=(
     'swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#branch=main'
     'swift-xcode-playground-support::git+https://github.com/apple/swift-xcode-playground-support#branch=main'
     'tensorflow-swift-apis::git+https://github.com/tensorflow/swift-apis.git'
-    '0001-sourcekit-lsp-python2-python3.patch'
 )
 noextract=()
 md5sums=(
@@ -66,7 +65,6 @@ md5sums=(
     'SKIP'
     'SKIP'
     'SKIP'
-    'SKIP'
 )
 
 
@@ -79,7 +77,6 @@ md5sums=(
 
 prepare () {
     ( cd swift && patch -p1 -i "$srcdir/0001-arch-aur-pachtes.patch" )
-    ( cd sourcekit-lsp && patch -p1 -i "$srcdir/0001-sourcekit-lsp-python2-python3.patch" )
     ( cd swift-integration-tests && patch -p1 -i "$srcdir/0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch" )
 }