update to current

3 files changed, 68 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 677da209869c..7fd4b0dec130 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.2022.03.13.a.r303.gc255f841cb4
+	pkgver = swift.DEVELOPMENT.SNAPSHOT.2022.03.31.a.r60.g333b0861d1b
 	pkgrel = 1
 	url = https://swift.org/
 	arch = x86_64
diff --git a/0001-arch-aur-patches.patch b/0001-arch-aur-patches.patch
index 3c20e747685b..9739e185398d 100644
--- a/0001-arch-aur-patches.patch
+++ b/0001-arch-aur-patches.patch
@@ -1,34 +1,38 @@
-From a92c33ce114cb13c00401f75ee5306386894150c Mon Sep 17 00:00:00 2001
+From b79f0992a2201a2864dfde89291b3e1504613bea Mon Sep 17 00:00:00 2001
 From: soloturn <soloturn@gmail.com>
 Date: Sun, 20 Mar 2022 12:05:07 +0100
 Subject: [PATCH] arch aur patches
 
 ---
- utils/build-presets.ini | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ utils/build-presets.ini | 16 +++-------------
+ 1 file changed, 3 insertions(+), 13 deletions(-)
 
 diff --git a/utils/build-presets.ini b/utils/build-presets.ini
-index 57518c0853d..b6b76f04788 100644
+index 57518c0853d..e959488e23e 100644
 --- a/utils/build-presets.ini
 +++ b/utils/build-presets.ini
-@@ -825,7 +825,6 @@ xctest
- libicu
+@@ -822,10 +822,8 @@ llbuild
+ swiftpm
+ swift-driver
+ xctest
+-libicu
  swiftdocc
  
 -build-ninja
  install-llvm
  install-swift
  install-lldb
-@@ -834,7 +833,7 @@ install-swiftpm
+@@ -833,8 +831,7 @@ install-llbuild
+ install-swiftpm
  install-swift-driver
  install-xctest
- install-libicu
+-install-libicu
 -install-prefix=/usr
 +install-prefix=/usr/lib/swift-git
  install-sourcekit-lsp
  install-swiftdocc
  build-swift-static-stdlib
-@@ -847,13 +846,13 @@ build-swift-stdlib-unittest-extra
+@@ -847,13 +844,13 @@ build-swift-stdlib-unittest-extra
  test-installable-package
  
  # Build the benchmarks against the toolchain.
@@ -44,6 +48,59 @@ index 57518c0853d..b6b76f04788 100644
  
  # This ensures the default module cache
  # location is local to this run, allowing
+@@ -1102,7 +1099,6 @@ mixin-preset=
+     mixin_linux_install_components_with_clang
+ build-subdir=buildbot_incremental
+ 
+-libicu
+ llbuild
+ swiftpm
+ swift-driver
+@@ -1118,7 +1114,6 @@ sourcekit-lsp
+ install-llvm
+ install-swift
+ install-llbuild
+-install-libicu
+ install-swiftpm
+ install-swift-driver
+ install-foundation
+@@ -1673,12 +1668,10 @@ mixin-preset=
+     mixin_linux_install_components_with_clang
+ 
+ libdispatch
+-libicu
+ foundation
+ xctest
+ libcxx=false
+ 
+-install-libicu
+ install-foundation
+ install-libdispatch
+ install-xctest
+@@ -1921,7 +1914,6 @@ mixin-preset=buildbot_indexstoredb_linux,sanitize
+ mixin-preset=
+     mixin_linux_install_components_with_clang
+ 
+-libicu
+ llbuild
+ swiftpm
+ xctest
+@@ -1936,7 +1928,6 @@ reconfigure
+ 
+ install-foundation
+ install-libdispatch
+-install-libicu
+ install-libcxx
+ install-llvm
+ install-swift
+@@ -2691,7 +2682,6 @@ no-assertions
+ [preset: linux_lldb]
+ lldb
+ foundation
+-libicu
+ libdispatch
+ build-ninja
+ 
 -- 
 2.35.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 92d99acde091..37300efffc5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Andrew Sun <adsun701@gmail.com>
 
 pkgname=swift-language-git
-pkgver=swift.DEVELOPMENT.SNAPSHOT.2022.03.13.a.r303.gc255f841cb4
+pkgver=swift.DEVELOPMENT.SNAPSHOT.2022.03.31.a.r60.g333b0861d1b
 pkgrel=1
 pkgdesc="The Swift programming language, taken directly from the Apple repository"
 arch=('x86_64')