update to swift-5.3

3 files changed, 23 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8c7440c9961..c334cd641704 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,34 +6,30 @@ pkgbase = swift-language
 	arch = i686
 	arch = x86_64
 	license = apache
-	makedepends = git
+	makedepends = clang
 	makedepends = cmake
+	makedepends = git
 	makedepends = ninja
-	makedepends = swig
-	makedepends = clang>=5.0
 	makedepends = python-six
-	makedepends = perl
-	makedepends = python-sphinx
-	makedepends = python-requests
-	makedepends = rsync
-	depends = python
-	depends = libutil-linux
+	makedepends = python2
+	makedepends = swig
 	depends = icu
-	depends = libbsd
 	depends = libedit
 	depends = libxml2
-	depends = sqlite
+	depends = python
+	depends = libbsd
 	depends = ncurses
-	depends = libblocksruntime
-	source = swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-cmark-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-llbuild-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = llvm-project-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/llvm-project/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-corelibs-xctest-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-corelibs-foundation-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-corelibs-libdispatch-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-integration-tests-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
-	source = swift-package-manager-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-5.3-DEVELOPMENT-SNAPSHOT-2020-06-24-a.tar.gz
+	source = swift-5.3-RELEASE.tar.gz::https://github.com/apple/swift/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-cmark-5.3-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-llbuild-5.3-RELEASE.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-5.3-RELEASE.tar.gz
+	source = llvm-project-5.3-RELEASE.tar.gz::https://github.com/apple/llvm-project/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-corelibs-xctest-5.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-corelibs-foundation-5.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-corelibs-libdispatch-5.3-RELEASE.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-integration-tests-5.3-RELEASE.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-5.3-RELEASE.tar.gz
+	source = swift-package-manager-5.3-RELEASE.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-5.3-RELEASE.tar.gz
+	source = 0001-not-build-ninja-icu.patch
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
index 022fbdd3bca9..a2618c6cf06a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /src/
 /pkg/
-*.tar.xz
-*.tar.gz
+*.tar.xz*
+*.tar.gz*
diff --git a/PKGBUILD b/PKGBUILD
index 4cea368aff06..210542bc0e06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgbase=swift-language
 pkgname=(swift swift-lldb)
-#_swiftver=5.2.4-RELEASE
+_swiftver=5.3-RELEASE
 #pkgver=${_swiftver//-RELEASE/}
-_swiftver=5.3-DEVELOPMENT-SNAPSHOT-2020-07-04-a
+#_swiftver=5.3-DEVELOPMENT-SNAPSHOT-2020-07-04-a
 #_swiftver=DEVELOPMENT-SNAPSHOT-2020-06-24-a
 pkgver=5.3
 pkgrel=1
@@ -15,10 +15,8 @@ pkgdesc="The Swift programming language and debugger"
 arch=('i686' 'x86_64')
 url="http://swift.org/"
 license=('apache')
-depends=('python' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
-         'sqlite' 'ncurses')
-makedepends=('git' 'cmake' 'ninja' 'swig')
-
+depends=('icu' 'libedit' 'libxml2' 'python' 'libbsd' 'ncurses' )
+makedepends=('clang' 'cmake' 'git' 'ninja' 'python-six' 'python2' 'swig')
 source=(
     "swift-${_swiftver}.tar.gz::https://github.com/apple/swift/archive/swift-${_swiftver}.tar.gz"
     "swift-cmark-${_swiftver}.tar.gz::https://github.com/apple/swift-cmark/archive/swift-${_swiftver}.tar.gz"
@@ -45,9 +43,6 @@ sha256sums=(
 )
 
 prepare() {
-    # not sure where diagnostics is included, pip install it
-    pip install diagnostics
-
     # Use directory names which build-script expects
     rm -rf llvm-project
     ln -sf llvm-project-swift-${_swiftver} llvm-project