summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoloturn2022-03-20 12:07:48 +0100
committersoloturn2022-03-20 12:07:48 +0100
commit678491b6057b3e13d7044b3a82cad89a0f9720be (patch)
tree2c60a3d21bc56f328d91a217e30f765598d03812
parent5c6aa792d5c91e6b72fd9b3f04664dfd9164c819 (diff)
downloadaur-678491b6057b3e13d7044b3a82cad89a0f9720be.tar.gz
udpate to latest
-rw-r--r--.SRCINFO4
-rw-r--r--0001-arch-aur-patches.patch (renamed from 0001-arch-aur-pachtes.patch)34
-rw-r--r--PKGBUILD6
3 files changed, 19 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f63dceacf4ee..677da209869c 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.01.09.a.r228.g5a9abb2119a
+ pkgver = swift.DEVELOPMENT.SNAPSHOT.2022.03.13.a.r303.gc255f841cb4
pkgrel = 1
url = https://swift.org/
arch = x86_64
@@ -40,7 +40,7 @@ pkgbase = swift-language-git
source = swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#branch=main
source = swift-integration-tests::git+https://github.com/apple/swift-integration-tests#branch=main
source = llvm-project::git+https://github.com/apple/llvm-project#branch=stable/20210726
- source = 0001-arch-aur-pachtes.patch
+ source = 0001-arch-aur-patches.patch
source = indexstore-db::git+https://github.com/apple/indexstore-db#branch=main
source = yams::git+https://github.com/jpsim/Yams#commit=4.0.2
source = sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#branch=main
diff --git a/0001-arch-aur-pachtes.patch b/0001-arch-aur-patches.patch
index 1729f2b18cf3..3c20e747685b 100644
--- a/0001-arch-aur-pachtes.patch
+++ b/0001-arch-aur-patches.patch
@@ -1,43 +1,37 @@
-From 6bb6d0b8338b59cb3120516a797547f5f8fa26b7 Mon Sep 17 00:00:00 2001
+From a92c33ce114cb13c00401f75ee5306386894150c Mon Sep 17 00:00:00 2001
From: soloturn <soloturn@gmail.com>
-Date: Fri, 31 Dec 2021 18:10:49 +0100
-Subject: [PATCH] arch aur pachtes
+Date: Sun, 20 Mar 2022 12:05:07 +0100
+Subject: [PATCH] arch aur patches
---
- utils/build-presets.ini | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
+ utils/build-presets.ini | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
-index 7f5a7cdc6a6..d85bb468b50 100644
+index 57518c0853d..b6b76f04788 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -818,11 +818,9 @@ llbuild
- swiftpm
- swift-driver
- xctest
--libicu
- libcxx
+@@ -825,7 +825,6 @@ xctest
+ libicu
swiftdocc
-build-ninja
install-llvm
install-swift
install-lldb
-@@ -830,8 +828,7 @@ install-llbuild
- install-swiftpm
+@@ -834,7 +833,7 @@ install-swiftpm
install-swift-driver
install-xctest
--install-libicu
+ install-libicu
-install-prefix=/usr
+install-prefix=/usr/lib/swift-git
- install-libcxx
install-sourcekit-lsp
install-swiftdocc
-@@ -844,14 +841,13 @@ build-swift-stdlib-unittest-extra
-
+ build-swift-static-stdlib
+@@ -847,13 +846,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
@@ -51,5 +45,5 @@ index 7f5a7cdc6a6..d85bb468b50 100644
# This ensures the default module cache
# location is local to this run, allowing
--
-2.34.1
+2.35.1
diff --git a/PKGBUILD b/PKGBUILD
index a6ff1ff72017..92d99acde091 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Andrew Sun <adsun701@gmail.com>
pkgname=swift-language-git
-pkgver=swift.DEVELOPMENT.SNAPSHOT.2022.01.09.a.r228.g5a9abb2119a
+pkgver=swift.DEVELOPMENT.SNAPSHOT.2022.03.13.a.r303.gc255f841cb4
pkgrel=1
pkgdesc="The Swift programming language, taken directly from the Apple repository"
arch=('x86_64')
@@ -34,7 +34,7 @@ source=(
'swift-corelibs-libdispatch::git+https://github.com/apple/swift-corelibs-libdispatch#branch=main'
'swift-integration-tests::git+https://github.com/apple/swift-integration-tests#branch=main'
'llvm-project::git+https://github.com/apple/llvm-project#branch=stable/20210726'
- '0001-arch-aur-pachtes.patch'
+ '0001-arch-aur-patches.patch'
'indexstore-db::git+https://github.com/apple/indexstore-db#branch=main'
'yams::git+https://github.com/jpsim/Yams#commit=4.0.2'
'sourcekit-lsp::git+https://github.com/apple/sourcekit-lsp#branch=main'
@@ -101,7 +101,7 @@ md5sums=(
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" )
}
pkgver() {