swift-5.7

4 files changed, 96 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c37ff372ef44..771cdcf672fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 5.6.2
+	pkgver = 5.7.0
 	pkgrel = 1
 	url = https://swift.org/
 	arch = x86_64
@@ -21,37 +21,36 @@ pkgbase = swift-language
 	depends = ncurses
 	provides = swift-language
 	options = !strip
-	source = git+https://github.com/apple/swift#tag=swift-5.6-RELEASE
-	source = cmark::git+https://github.com/apple/swift-cmark#tag=swift-5.6-RELEASE
-	source = llbuild::git+https://github.com/apple/swift-llbuild#tag=swift-5.6-RELEASE
+	source = git+https://github.com/apple/swift#tag=swift-5.7-RELEASE
+	source = cmark::git+https://github.com/apple/swift-cmark#tag=swift-5.7-RELEASE
+	source = llbuild::git+https://github.com/apple/swift-llbuild#tag=swift-5.7-RELEASE
 	source = swift-argument-parser::git+https://github.com/apple/swift-argument-parser#tag=1.0.3
-	source = swift-driver::git+https://github.com/apple/swift-driver#tag=swift-5.6-RELEASE
-	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.6-RELEASE
-	source = swiftpm::git+https://github.com/apple/swift-package-manager#tag=swift-5.6-RELEASE
-	source = swift-syntax::git+https://github.com/apple/swift-syntax#tag=swift-5.6-RELEASE
-	source = swift-stress-tester::git+https://github.com/apple/swift-stress-tester#tag=swift-5.6-RELEASE
-	source = swift-corelibs-xctest::git+https://github.com/apple/swift-corelibs-xctest#tag=swift-5.6-RELEASE
-	source = swift-corelibs-foundation::git+https://github.com/apple/swift-corelibs-foundation#tag=swift-5.6-RELEASE
-	source = swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#tag=swift-5.6-RELEASE
-	source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests#tag=swift-5.6-RELEASE
-	source = llvm-project::git+https://github.com/apple/llvm-project#tag=swift-5.6-RELEASE
+	source = swift-driver::git+https://github.com/apple/swift-driver#tag=swift-5.7-RELEASE
+	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.7-RELEASE
+	source = swiftpm::git+https://github.com/apple/swift-package-manager#tag=swift-5.7-RELEASE
+	source = swift-syntax::git+https://github.com/apple/swift-syntax#tag=swift-5.7-RELEASE
+	source = swift-stress-tester::git+https://github.com/apple/swift-stress-tester#tag=swift-5.7-RELEASE
+	source = swift-corelibs-xctest::git+https://github.com/apple/swift-corelibs-xctest#tag=swift-5.7-RELEASE
+	source = swift-corelibs-foundation::git+https://github.com/apple/swift-corelibs-foundation#tag=swift-5.7-RELEASE
+	source = swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#tag=swift-5.7-RELEASE
+	source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests#tag=swift-5.7-RELEASE
+	source = llvm-project::git+https://github.com/apple/llvm-project#tag=swift-5.7-RELEASE
 	source = 0001-arch-aur-patches.patch
-	source = 0002-asprintf-exists.patch
-	source = indexstore-db::git+https://github.com/apple/indexstore-db#tag=swift-5.6-RELEASE
-	source = yams::git+https://github.com/jpsim/Yams#tag=4.0.2
-	source = sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#tag=swift-5.6-RELEASE
-	source = swift-cmark-gfm::git+https://github.com/apple/swift-cmark#branch=release/5.6-gfm
+	source = indexstore-db::git+https://github.com/apple/indexstore-db#tag=swift-5.7-RELEASE
+	source = yams::git+https://github.com/jpsim/Yams#tag=5.0.0
+	source = sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#tag=swift-5.7-RELEASE
+	source = swift-cmark-gfm::git+https://github.com/apple/swift-cmark#tag=swift-5.7-RELEASE
 	source = swift-crypto::git+https://github.com/apple/swift-crypto#tag=1.1.5
 	source = swift-docc::git+https://github.com/apple/swift-docc#branch=main
 	source = swift-docc-render-artifact::git+https://github.com/apple/swift-docc-render-artifact#branch=main
 	source = swift-docc-symbolkit::git+https://github.com/apple/swift-docc-symbolkit#branch=main
-	source = swift-format::git+https://github.com/apple/swift-format#tag=swift-5.6-RELEASE
+	source = swift-format::git+https://github.com/apple/swift-format#tag=swift-5.7-RELEASE
 	source = swift-installer-scripts::git+https://github.com/apple/swift-installer-scripts#branch=main
-	source = swift-markdown::git+https://github.com/apple/swift-markdown#tag=swift-5.6-RELEASE
+	source = swift-markdown::git+https://github.com/apple/swift-markdown#tag=swift-5.7-RELEASE
 	source = swift-nio::git+https://github.com/apple/swift-nio#tag=2.31.2
 	source = swift-nio-ssl::git+https://github.com/apple/swift-nio-ssl#tag=2.15.0
-	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.6-RELEASE
-	source = swift-xcode-playground-support::git+https://github.com/apple/swift-xcode-playground-support#tag=swift-5.6-RELEASE
+	source = swift-tools-support-core::git+https://github.com/apple/swift-tools-support-core#tag=swift-5.7-RELEASE
+	source = swift-xcode-playground-support::git+https://github.com/apple/swift-xcode-playground-support#tag=swift-5.7-RELEASE
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -66,8 +65,7 @@ pkgbase = swift-language
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = e47ca269514997096b6141c18f1dd2cfd83182bb41ccee62169ff3d634198bb4
-	sha256sums = d9985dd648ecb83d56a48e3128000b869f819526ecda9735d7c6a3b9fd2047b7
+	sha256sums = 3941d6e2ff26ee0bf2d0ae37ed618d1cb36af85e256b0b84dd4e5d8549ec2982
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/0001-arch-aur-patches.patch b/0001-arch-aur-patches.patch
index 2a501c9c892f..7213444ca6d6 100644
--- a/0001-arch-aur-patches.patch
+++ b/0001-arch-aur-patches.patch
@@ -1,33 +1,41 @@
-From 13b68dca129e307f6abcabba4936765f734d7879 Mon Sep 17 00:00:00 2001
+From b79f0992a2201a2864dfde89291b3e1504613bea Mon Sep 17 00:00:00 2001
 From: soloturn <soloturn@gmail.com>
-Date: Sat, 2 Apr 2022 13:44:08 +0200
+Date: Sun, 20 Mar 2022 12:05:07 +0100
 Subject: [PATCH] arch aur patches
 
 ---
- utils/build-presets.ini | 8 ++------
- 1 file changed, 2 insertions(+), 6 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 64ba12b1e04..faf53241aff 100644
+index 57518c0853d..e959488e23e 100644
 --- a/utils/build-presets.ini
 +++ b/utils/build-presets.ini
-@@ -818,11 +818,9 @@ llbuild
+@@ -822,10 +822,8 @@ llbuild
  swiftpm
  swift-driver
  xctest
 -libicu
- libcxx
  swiftdocc
  
 -build-ninja
  install-llvm
  install-swift
  install-lldb
-@@ -844,14 +842,13 @@ build-swift-stdlib-unittest-extra
- 
+@@ -833,8 +831,7 @@ install-llbuild
+ install-swiftpm
+ install-swift-driver
+ install-xctest
+-install-libicu
+-install-prefix=/usr
++install-prefix=/usr/lib/swift-git
+ install-sourcekit-lsp
+ install-swiftdocc
+ build-swift-static-stdlib
+@@ -847,13 +844,13 @@ build-swift-stdlib-unittest-extra
  test-installable-package
  
--# Build the benchmarks against the toolchain.
+ # Build the benchmarks against the toolchain.
 -toolchain-benchmarks
 +# does not work outside /usr, Build the benchmarks against the toolchain.
 +# toolchain-benchmarks
@@ -40,13 +48,58 @@ index 64ba12b1e04..faf53241aff 100644
  
  # This ensures the default module cache
  # location is local to this run, allowing
-@@ -953,7 +950,6 @@ build-swift-stdlib-unittest-extra
- install-destdir=%(install_destdir)s
+@@ -1102,7 +1099,6 @@ mixin-preset=
+     mixin_linux_install_components_with_clang
+ build-subdir=buildbot_incremental
  
- # Path to the .tar.gz package we would create.
--installable-package=%(installable_package)s
+-libicu
+ llbuild
+ swiftpm
+ swift-driver
+@@ -1116,7 +1112,6 @@ sourcekit-lsp
+ install-llvm
+ install-swift
+ install-llbuild
+-install-libicu
+ install-swiftpm
+ install-swift-driver
+ install-foundation
+@@ -1671,12 +1666,10 @@ mixin-preset=
+     mixin_linux_install_components_with_clang
+ 
+ libdispatch
+-libicu
+ foundation
+ xctest
+ libcxx=false
+ 
+-install-libicu
+ install-foundation
+ install-libdispatch
+ install-xctest
+@@ -1918,7 +1911,6 @@ mixin-preset=buildbot_indexstoredb_linux,sanitize
+ mixin-preset=
+     mixin_linux_install_components_with_clang
+ 
+-libicu
+ llbuild
+ swiftpm
+ xctest
+@@ -1933,7 +1925,6 @@ reconfigure
  
- host-test
+ install-foundation
+ install-libdispatch
+-install-libicu
+ install-libcxx
+ install-llvm
+ install-swift
+@@ -2687,7 +2678,6 @@ no-assertions
+ [preset: linux_lldb]
+ lldb
+ foundation
+-libicu
+ libdispatch
+ build-ninja
  
 -- 
 2.35.1
diff --git a/0002-asprintf-exists.patch b/0002-asprintf-exists.patch
deleted file mode 100644
index 6c9d762ec199..000000000000
--- a/0002-asprintf-exists.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 51e6961d4a0d0fc5f92b686354c7e23d33e11048 Mon Sep 17 00:00:00 2001
-From: soloturn <soloturn@gmail.com>
-Date: Mon, 19 Jul 2021 09:29:44 +0200
-Subject: [PATCH] asprintf exists
-
----
- CoreFoundation/Base.subproj/CFPlatform.c            | 2 +-
- CoreFoundation/Base.subproj/CoreFoundation_Prefix.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subproj/CFPlatform.c
-index bf332973..ee5ae559 100644
---- a/CoreFoundation/Base.subproj/CFPlatform.c
-+++ b/CoreFoundation/Base.subproj/CFPlatform.c
-@@ -1510,7 +1510,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
- #pragma mark -
- #pragma mark Windows and Linux Helpers
- 
--#if TARGET_OS_WIN32 || TARGET_OS_LINUX
-+#if TARGET_OS_WIN32
- 
- #include <stdio.h>
- 
-diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
-index 35e08036..86d6574a 100644
---- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
-+++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
-@@ -448,7 +448,7 @@ CF_INLINE int popcountll(long long x) {
- #define CF_TEST_PRIVATE CF_PRIVATE
- #endif
- 
--#if TARGET_OS_LINUX || TARGET_OS_WIN32
-+#if TARGET_OS_WIN32
- 
- #include <stdarg.h>
- 
--- 
-2.32.0
-
diff --git a/PKGBUILD b/PKGBUILD
index a6e5fcf0d2b5..776f144d508a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
 # Contributor: Andrew Sun <adsun701@gmail.com>
 
 pkgname=swift-language
-_swiftver=swift-5.6-RELEASE
-pkgver=5.6.2
+_swiftver=swift-5.7-RELEASE
+pkgver=5.7.0
 pkgrel=1
 swiftargumentparserver=1.0.3
 swiftcryptover=1.1.5
 swiftniover=2.31.2
 swiftniosslver=2.15.0
-yamsver=4.0.2
+yamsver=5.0.0
 
 pkgdesc="The Swift programming language and debugger"
 arch=('x86_64')
@@ -38,12 +38,11 @@ source=(
     "swift-integration-tests::git+https://github.com/apple/swift-integration-tests#tag=${_swiftver}"
     "llvm-project::git+https://github.com/apple/llvm-project#tag=${_swiftver}"
     "0001-arch-aur-patches.patch"
-    "0002-asprintf-exists.patch"
     # swift src to check afterwards
     "indexstore-db::git+https://github.com/apple/indexstore-db#tag=${_swiftver}"
     "yams::git+https://github.com/jpsim/Yams#tag=${yamsver}"
     "sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#tag=${_swiftver}"
-    "swift-cmark-gfm::git+https://github.com/apple/swift-cmark#branch=release/5.6-gfm"
+    "swift-cmark-gfm::git+https://github.com/apple/swift-cmark#tag=${_swiftver}"
     "swift-crypto::git+https://github.com/apple/swift-crypto#tag=${swiftcryptover}"
     "swift-docc::git+https://github.com/apple/swift-docc#branch=main"
     "swift-docc-render-artifact::git+https://github.com/apple/swift-docc-render-artifact#branch=main"
@@ -72,8 +71,7 @@ sha256sums=(
     'SKIP'
     'SKIP'
     'SKIP'
-    'e47ca269514997096b6141c18f1dd2cfd83182bb41ccee62169ff3d634198bb4'
-    'd9985dd648ecb83d56a48e3128000b869f819526ecda9735d7c6a3b9fd2047b7'
+    '3941d6e2ff26ee0bf2d0ae37ed618d1cb36af85e256b0b84dd4e5d8549ec2982'
     'SKIP'
     'SKIP'
     'SKIP'
@@ -101,7 +99,6 @@ options=(!strip)
 
 prepare () {
     ( cd swift && patch -p1 -i "$srcdir/0001-arch-aur-patches.patch" )
-    ( cd swift-corelibs-foundation && patch -p1 -i "$srcdir/0002-asprintf-exists.patch" )
 }
 
 #pkgver() {