diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-02-14 22:36:58 -0600 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-02-14 22:36:58 -0600 |
| commit | 0414349a7d90f450a563e238581edb9fe82b61b6 (patch) | |
| tree | c9d521019439bd48ae385f09881292859448a468 | |
| parent | 87783af0a2bb7689354ea2b197867504d79332bd (diff) | |
| download | swift-lang-0414349a7d90f450a563e238581edb9fe82b61b6.tar.gz swift-lang-0414349a7d90f450a563e238581edb9fe82b61b6.tar.xz swift-lang-0414349a7d90f450a563e238581edb9fe82b61b6.zip | |
Removed separate patch for Clang 6 because Apple merged my source fix
| -rw-r--r-- | swift-lang-4.1-fix-for-clang-6.patch | 11 | ||||
| -rw-r--r-- | swift-lang.spec | 10 |
2 files changed, 4 insertions, 17 deletions
diff --git a/swift-lang-4.1-fix-for-clang-6.patch b/swift-lang-4.1-fix-for-clang-6.patch deleted file mode 100644 index f50d408..0000000 --- a/swift-lang-4.1-fix-for-clang-6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- swift/include/swift/Basic/ArrayRefView.h.orig 2018-02-13 10:36:07.091252447 -0600 -+++ swift/include/swift/Basic/ArrayRefView.h 2018-02-13 10:36:48.915917269 -0600 -@@ -47,6 +47,8 @@ - Projected operator->() const { return operator*(); } - iterator &operator++() { Ptr++; return *this; } - iterator operator++(int) { return iterator(Ptr++); } -+ iterator &operator--() { Ptr--; return *this; } -+ iterator operator--(int) { return iterator(Ptr--); } - bool operator==(iterator rhs) const { return Ptr == rhs.Ptr; } - bool operator!=(iterator rhs) const { return Ptr != rhs.Ptr; } - diff --git a/swift-lang.spec b/swift-lang.spec index 6bf8349..e445c20 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-08-a -%global swiftgithash 54a3597 -%global swiftgitdate 20180208 +%global swifttag DEVELOPMENT-SNAPSHOT-2018-02-14-a +%global swiftgithash 5a1a34b +%global swiftgitdate 20180214 Name: swift-lang Version: 4.1 Release: 0.%{swiftgitdate}git%{swiftgithash}%{?dist} @@ -25,7 +25,6 @@ Source13: https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz#/ninj Source14: swift-lang.conf Patch0: %{name}-%{version}-change-lldb-location.patch -Patch1: %{name}-%{version}-fix-for-clang-6.patch BuildRequires: which BuildRequires: clang @@ -87,7 +86,6 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo mv ninja-1.7.2 ninja %patch0 -p0 -%patch1 -p0 %build swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-fedora.tar.gz @@ -157,5 +155,5 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift %postun -p /sbin/ldconfig %changelog -* Sun Feb 11 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180208git54a3597 +* Wed Feb 14 2018 Ron Olson <tachoknight@gmail.com> 4.1-1-0.20180214git5a1a34b - Initial package for Fedora |