summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoloturn2020-11-17 06:43:39 +0100
committersoloturn2020-11-17 06:44:12 +0100
commit3806767564ca437e20c57e1e6d2c3540008d0d03 (patch)
treef4676f987d4d402518830b86e08f5687659d129f
parent3d4407eb8bb499830e0c5f2021bef43092a31563 (diff)
downloadaur-3806767564ca437e20c57e1e6d2c3540008d0d03.tar.gz
remove sourcekit-lsp-python2 patch
-rw-r--r--.SRCINFO2
-rw-r--r--0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch32
-rw-r--r--PKGBUILD3
3 files changed, 0 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5cb865befb78..86e4ec2d15df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,7 +34,6 @@ pkgbase = swift-language-git
source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests#branch=main
source = llvm-project::git+https://github.com/apple/llvm-project#branch=swift/main
source = 0001-arch-aur-pachtes.patch
- source = 0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch
source = indexstore-db::git+https://github.com/apple/indexstore-db#branch=main
source = yams::git+https://github.com/jpsim/Yams#commit=3.0.1
source = sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#branch=main
@@ -64,7 +63,6 @@ pkgbase = swift-language-git
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
- md5sums = SKIP
pkgname = swift-language-git
diff --git a/0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch b/0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch
deleted file mode 100644
index c878b0d15fc7..000000000000
--- a/0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 37cfa25aa310f298c1649bbbabedcb6aae418e19 Mon Sep 17 00:00:00 2001
-From: soloturn <soloturn@gmail.com>
-Date: Sat, 3 Oct 2020 11:01:20 +0200
-Subject: [PATCH] linux_load_commands, test-sourcekit-lsp are python2
-
----
- test-snapshot-binaries/linux_load_commands.py | 1 +
- test-sourcekit-lsp/test-sourcekit-lsp.py | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/test-snapshot-binaries/linux_load_commands.py b/test-snapshot-binaries/linux_load_commands.py
-index f7d044e..a021927 100644
---- a/test-snapshot-binaries/linux_load_commands.py
-+++ b/test-snapshot-binaries/linux_load_commands.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python2
-
- # REQUIRES: platform=Linux
- # RUN: rm -rf %T && mkdir -p %t
-diff --git a/test-sourcekit-lsp/test-sourcekit-lsp.py b/test-sourcekit-lsp/test-sourcekit-lsp.py
-index b7e6323..02ede11 100644
---- a/test-sourcekit-lsp/test-sourcekit-lsp.py
-+++ b/test-sourcekit-lsp/test-sourcekit-lsp.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/env python2
-+
- # Canary test for sourcekit-lsp, covering interaction with swiftpm and toolchain
- # language services.
-
---
-2.28.0
-
diff --git a/PKGBUILD b/PKGBUILD
index f5ff3feed76a..af6ae1db1d0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,6 @@ source=(
'swift-integration-tests::git+https://github.com/apple/swift-integration-tests#branch=main'
'llvm-project::git+https://github.com/apple/llvm-project#branch=swift/main'
'0001-arch-aur-pachtes.patch'
- '0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch'
# swift src to check afterwards
'indexstore-db::git+https://github.com/apple/indexstore-db#branch=main'
# 'yams::git+https://github.com/jpsim/Yams'
@@ -64,7 +63,6 @@ md5sums=(
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
)
@@ -77,7 +75,6 @@ md5sums=(
prepare () {
( cd swift && patch -p1 -i "$srcdir/0001-arch-aur-pachtes.patch" )
- ( cd swift-integration-tests && patch -p1 -i "$srcdir/0003-linux_load_commands-test-sourcekit-lsp-are-python2.patch" )
}
pkgver() {