swift: update from 5.9.1 to 5.9.2 Oct 9 snapshot

finagolfin · Oct 22, 2023 · 93a12da · 93a12da
1 parent 26b82df
commit 93a12da
Show file tree

Hide file tree

Showing 11 changed files with 577 additions and 152 deletions.
diff --git a/packages/libdispatch/build.sh b/packages/libdispatch/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The libdispatch project, for concurrency on multicore ha
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@finagolfin"
 TERMUX_PKG_VERSION="1:5.9"
-TERMUX_PKG_SRCURL=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${TERMUX_PKG_VERSION:2}-RELEASE.tar.gz
-TERMUX_PKG_SHA256=db30ccf6b20963112ab3aad256c2e49a18041a9806cf2f05854fe63a90d688c2
+TERMUX_PKG_SRCURL=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${TERMUX_PKG_VERSION:2}-DEVELOPMENT-SNAPSHOT-2023-10-09-a.tar.gz
+TERMUX_PKG_SHA256=ce5882af1e3833c6c7a304666d2412d4b2dfef0d7bc8396c16f2deacc68753f9
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="libc++, libblocksruntime"
diff --git a/packages/llbuild/build.sh b/packages/llbuild/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A low-level build system, used by the Swift Package Mana
 TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
 TERMUX_PKG_MAINTAINER="@finagolfin"
 TERMUX_PKG_VERSION=5.9
-TERMUX_PKG_SRCURL=https://github.com/apple/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-RELEASE.tar.gz
-TERMUX_PKG_SHA256=cc8dfb098db4b0210ca5466f59d3e5fc55c4eedcd835263e6eae7dd719ba8203
+TERMUX_PKG_SRCURL=https://github.com/apple/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-DEVELOPMENT-SNAPSHOT-2023-10-09-a.tar.gz
+TERMUX_PKG_SHA256=ffefd93cd69edffb93353107664524050baae9999939babefb074f4a34da8fe2
 TERMUX_PKG_DEPENDS="libc++, libandroid-spawn, libsqlite"
 TERMUX_PKG_NO_STATICSPLIT=true
diff --git a/packages/swift/build.sh b/packages/swift/build.sh
@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://swift.org/
 TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language"
 TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
 TERMUX_PKG_MAINTAINER="@finagolfin"
-TERMUX_PKG_VERSION=5.9.1
-SWIFT_RELEASE="RELEASE"
+TERMUX_PKG_VERSION=5.9
+SWIFT_RELEASE="DEVELOPMENT-SNAPSHOT-2023-10-09-a"
 TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz
-TERMUX_PKG_SHA256=d63c9743fa1d35c8c6203745955375fd69c710897de96d1c6245d2c9e42fbb49
+TERMUX_PKG_SHA256=710e29dc33ffeedf2b3b3857f90bb0a2df471853aefd298dcd2e951874e79233
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="clang, libandroid-glob, libandroid-posix-semaphore, libandroid-spawn, libcurl, libicu, libicu-static, libsqlite, libuuid, libxml2, libdispatch, llbuild, pkg-config, swift-sdk-${TERMUX_ARCH/_/-}"
@@ -35,26 +35,26 @@ termux_step_post_get_source() {
 	mv .temp swift
 
 	declare -A library_checksums
-	library_checksums[swift-cmark]=33dde8fc9e02a882d2adc79f1b7b77ae6397a66c73262bbdc3b49c53ab823b01
-	library_checksums[llvm-project]=3cd34ef37dd74a6d4d93be20fb251658e9a1e3c19aeeefd81c027023c485e286
-	library_checksums[swift-experimental-string-processing]=a01b2f895d49c23a4d322bfd486d4a7dcfeb96760d9c17f2e48b93428220b9ee
-	library_checksums[swift-syntax]=b2ab10adcfbaebdd56954f724856d6ddd327422b4109d49ec5fb96b92b078003
-	library_checksums[swift-corelibs-libdispatch]=bcccde91987982dca285a5c73efa0922135b6caca07bc9e5a33333b0aa869db2
-	library_checksums[swift-corelibs-foundation]=9835efe51b78c329042e32b2b1bd82a0816535ca08687a30c0787091cdd40884
-	library_checksums[swift-corelibs-xctest]=8d4cbffba2f828033a0074682d1bedd7a55d6410b6a30ca1e7c69917ab9352fe
-	library_checksums[swift-llbuild]=eeff879bc19de21aed72a747602212dff8ffe25833880c466a44087ffe2ed1ac
-	library_checksums[swift-argument-parser]=44782ba7180f924f72661b8f457c268929ccd20441eac17301f18eff3b91ce0c
-	library_checksums[Yams]=ec1ad699c30f0db45520006c63a88cc1c946a7d7b36dff32a96460388c0a4af2
-	library_checksums[swift-collections]=575cf0f88d9068411f9acc6e3ca5d542bef1cc9e87dc5d69f7b5a1d5aec8c6b6
+	library_checksums[swift-corelibs-foundation]=7969a81c8b54caa14113b56cd9f63d596f525eb30457496e20b52d799105d0a4
 	library_checksums[swift-crypto]=a7b2f5c4887ccd728cdff5d1162b4d4d36bd6c2df9c0c31d5b9b73d341c5c1bb
 	library_checksums[swift-system]=865b8c380455eef27e73109835142920c60ae4c4f4178a3d12ad04acc83f1371
 	library_checksums[swift-asn1]=d4470d61788194abbd60ed73965ee0722cc25037e83d41226a8a780088ba524e
+	library_checksums[swift-corelibs-libdispatch]=ce5882af1e3833c6c7a304666d2412d4b2dfef0d7bc8396c16f2deacc68753f9
+	library_checksums[llvm-project]=ae16f61a232bf44e6a030e7a89e7e6c0d323b15f27fa3a6deb15a9bc473e7f41
+	library_checksums[swift-tools-support-core]=8988be2175a9f43bb69fa90fe1099371b629e41ced9a7a52af85f6ea7d4b1a35
+	library_checksums[swift-collections]=575cf0f88d9068411f9acc6e3ca5d542bef1cc9e87dc5d69f7b5a1d5aec8c6b6
+	library_checksums[swift-driver]=cd7d0b6167b28199ea63699d44628683fab99158c67030c1174eb1dabf21ddce
+	library_checksums[swift-experimental-string-processing]=8c73ec33e9c9ca2b7f1c7d11f32add6b0d7a24f04bcb87076ef4b09cc7a28140
+	library_checksums[swift-package-manager]=749aa9f951d7a4d7c387165e4c72dac2f9a0abee2770b617c4bc423a10f16250
+	library_checksums[swift-cmark]=b9212a2a7bf4a733b1f2dcdc91298ff029a019983470f9323d4bf67dc3abf738
+	library_checksums[swift-argument-parser]=44782ba7180f924f72661b8f457c268929ccd20441eac17301f18eff3b91ce0c
+	library_checksums[sourcekit-lsp]=640f16bc0ef669d897ece0967b6e228fe97ee5874a72f3f2e8c976ad2c980e5c
+	library_checksums[indexstore-db]=2c8ad64bdf75f4b21a7cd8c12dc20a2dc808b02dfe7a823e961bd839d6629d22
+	library_checksums[swift-syntax]=817f4651bb02a661296372eb4cce15628aa0dec27c8cf8db6c2cf997d34d0d65
+	library_checksums[swift-corelibs-xctest]=8513cccd107a329cc00737d009711b7cafade59ad178a700d946bab0efcff23f
+	library_checksums[swift-llbuild]=ffefd93cd69edffb93353107664524050baae9999939babefb074f4a34da8fe2
 	library_checksums[swift-certificates]=d7699ce91d65a622c1b9aaa0235cbbbd1be4ddc42a90fce007ff74bef50e8985
-	library_checksums[swift-driver]=4fc7965cd477daf61ff2d5b555007a195dc601e9864ee6d494826a7aa7ff31c7
-	library_checksums[swift-tools-support-core]=e261dfdfc964a770c545c66267108c77692d06977c0d0bb437498f79ec23365c
-	library_checksums[swift-package-manager]=8e08b39fd7eb5329539514358d470bd84218a8b4ce53962d7fe3797f51adf59b
-	library_checksums[indexstore-db]=0789b254455e6f216b8d907ebc8fe5927106ae3a7a099d6478bbb9e6fac9b9fb
-	library_checksums[sourcekit-lsp]=0fd130c814a35b3ba2b6b6d01979923fd57b3f453d154860ec2f53f9ade38023
+	library_checksums[Yams]=ec1ad699c30f0db45520006c63a88cc1c946a7d7b36dff32a96460388c0a4af2
 
 	for library in "${!library_checksums[@]}"; do \
 		GH_ORG="apple"

diff --git a/packages/swift/swift-cmake.patch b/packages/swift/swift-cmake.patch
@@ -159,7 +159,7 @@ index 4bc312f7f89..d71f6408d9f 100644
 
    set(swift_compiler_tool_dep)
 -  if(SWIFT_INCLUDE_TOOLS)
-+  if(SWIFT_INCLUDE_TOOLS AND NOT ${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE")
++  if(SWIFT_INCLUDE_TOOLS AND NOT ${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE" AND "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
      # Depend on the binary itself, in addition to the symlink.
      set(swift_compiler_tool_dep "swift-frontend${target_suffix}")
    endif()

diff --git a/packages/swift/swift-modify-astgen.patch b/packages/swift/swift-modify-astgen.patch
@@ -431,7 +431,7 @@ index eb2be48a8a8..82bbca53bf4 100644
 +
      var text = node.name.text
      let id = text.withUTF8 { buf in
-       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
+       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, SwiftInt(buf.count))
 @@ -19,7 +24,7 @@ extension ASTGenVisitor {
      let rAngle = self.base.advanced(by: generics.rightAngleBracket.position.utf8Offset).raw
      return .type(

diff --git a/packages/swift/swift-move-regex-literals.patch b/packages/swift/swift-move-regex-literals.patch
@@ -504,7 +504,7 @@ index 0f798f961db94..fc2c07d5381f8 100644
 +  void * _Nullable raw;
  } BridgedDiagnosticEngine;
 
- typedef enum ENUM_EXTENSIBILITY_ATTR(open) BridgedMacroDefinitionKind : long {
+ typedef enum ENUM_EXTENSIBILITY_ATTR(open) BridgedMacroDefinitionKind : SwiftInt {
 @@ -434,6 +434,53 @@ void Decl_dump(void *decl);
  void Stmt_dump(void *statement);
  void Type_dump(void *type);