correct swift-5.6.0

4 files changed, 29 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67f37a50bb62..9f03eef55bbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,7 +35,7 @@ pkgbase = swift-language
 	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 = 0001-arch-aur-pachtes.patch
+	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
@@ -66,8 +66,8 @@ pkgbase = swift-language
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = d5eff4ffedba65a20b4600f36f09527f9fe1ea425302ea35c56f38e403e1d451
-	sha256sums = f450b7470ae26f3353f5201d692ebde9493015cd4c493c1e253770c07dd86e8a
+	sha256sums = e47ca269514997096b6141c18f1dd2cfd83182bb41ccee62169ff3d634198bb4
+	sha256sums = d9985dd648ecb83d56a48e3128000b869f819526ecda9735d7c6a3b9fd2047b7
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/0001-arch-aur-pachtes.patch b/0001-arch-aur-patches.patch
index c2188baf6688..2a501c9c892f 100644
--- a/0001-arch-aur-pachtes.patch
+++ b/0001-arch-aur-patches.patch
@@ -1,38 +1,29 @@
-From 9bbddd5714e13bde1f918dc8f6ccef33396f8b4a Mon Sep 17 00:00:00 2001
+From 13b68dca129e307f6abcabba4936765f734d7879 Mon Sep 17 00:00:00 2001
 From: soloturn <soloturn@gmail.com>
-Date: Sat, 1 Aug 2020 16:21:07 +0200
-Subject: [PATCH] arch aur pachtes
+Date: Sat, 2 Apr 2022 13:44:08 +0200
+Subject: [PATCH] arch aur patches
 
 ---
- utils/build-presets.ini | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
+ utils/build-presets.ini | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/utils/build-presets.ini b/utils/build-presets.ini
-index dc3826f228a..ff2523726c8 100644
+index 64ba12b1e04..faf53241aff 100644
 --- a/utils/build-presets.ini
 +++ b/utils/build-presets.ini
-@@ -726,10 +726,8 @@ llbuild
+@@ -818,11 +818,9 @@ llbuild
  swiftpm
  swift-driver
  xctest
 -libicu
  libcxx
+ swiftdocc
  
 -build-ninja
  install-llvm
  install-swift
  install-lldb
-@@ -737,8 +735,7 @@ install-llbuild
- install-swiftpm
- install-swift-driver
- install-xctest
--install-libicu
--install-prefix=/usr
-+install-prefix=/usr/lib/swift
- install-libcxx
- install-sourcekit-lsp
- build-swift-static-stdlib
-@@ -750,14 +747,13 @@ build-swift-stdlib-unittest-extra
+@@ -844,14 +842,13 @@ build-swift-stdlib-unittest-extra
  
  test-installable-package
  
@@ -47,8 +38,16 @@ index dc3826f228a..ff2523726c8 100644
  # Path to the .tar.gz package we would create.
 -installable-package=%(installable_package)s
  
- [preset: buildbot_linux]
- mixin-preset=mixin_linux_installation
+ # 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
+ 
+ # Path to the .tar.gz package we would create.
+-installable-package=%(installable_package)s
+ 
+ host-test
+ 
 -- 
-2.28.0
+2.35.1
 
diff --git a/0002-asprintf-exists.patch b/0002-asprintf-exists.patch
index 04a2b64338e1..6c9d762ec199 100644
--- a/0002-asprintf-exists.patch
+++ b/0002-asprintf-exists.patch
@@ -12,7 +12,7 @@ diff --git a/CoreFoundation/Base.subproj/CFPlatform.c b/CoreFoundation/Base.subp
 index bf332973..ee5ae559 100644
 --- a/CoreFoundation/Base.subproj/CFPlatform.c
 +++ b/CoreFoundation/Base.subproj/CFPlatform.c
-@@ -1472,7 +1472,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
+@@ -1510,7 +1510,7 @@ void _CF_dispatch_once(dispatch_once_t *predicate, void (^block)(void)) {
  #pragma mark -
  #pragma mark Windows and Linux Helpers
  
@@ -25,7 +25,7 @@ diff --git a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h b/CoreFoundatio
 index 35e08036..86d6574a 100644
 --- a/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
 +++ b/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
-@@ -414,7 +414,7 @@ CF_INLINE int popcountll(long long x) {
+@@ -448,7 +448,7 @@ CF_INLINE int popcountll(long long x) {
  #define CF_TEST_PRIVATE CF_PRIVATE
  #endif
  
diff --git a/PKGBUILD b/PKGBUILD
index 60b7dc8e28c6..bbee6cc2831e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,7 +37,7 @@ source=(
     "swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#tag=${_swiftver}"
     "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-pachtes.patch"
+    "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}"
@@ -72,8 +72,8 @@ sha256sums=(
     'SKIP'
     'SKIP'
     'SKIP'
-    'd5eff4ffedba65a20b4600f36f09527f9fe1ea425302ea35c56f38e403e1d451'
-    'f450b7470ae26f3353f5201d692ebde9493015cd4c493c1e253770c07dd86e8a'
+    'e47ca269514997096b6141c18f1dd2cfd83182bb41ccee62169ff3d634198bb4'
+    'd9985dd648ecb83d56a48e3128000b869f819526ecda9735d7c6a3b9fd2047b7'
     'SKIP'
     'SKIP'
     'SKIP'
@@ -100,7 +100,7 @@ sha256sums=(
 options=(!strip)
 
 prepare () {
-    ( cd swift && patch -p1 -i "$srcdir/0001-arch-aur-pachtes.patch" )
+    ( cd swift && patch -p1 -i "$srcdir/0001-arch-aur-patches.patch" )
     ( cd swift-corelibs-foundation && patch -p1 -i "$srcdir/0002-asprintf-exists.patch" )
 }