diff --git a/.gitignore b/.gitignore index 9e4f6be..c3d26bc 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /swift-numerics.tar.gz /swift-system.tar.gz /yams.tar.gz +/swift-experimental-string-processing.tar.gz diff --git a/no-test.patch b/no-test.patch new file mode 100644 index 0000000..3df50ca --- /dev/null +++ b/no-test.patch @@ -0,0 +1,11 @@ +--- swift/utils/build-presets.ini.orig 2023-02-06 19:59:52.297617075 -0600 ++++ swift/utils/build-presets.ini 2023-02-06 20:00:17.131186971 -0600 +@@ -834,7 +834,7 @@ + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out + +-test-installable-package ++#test-installable-package + + # Build the benchmarks against the toolchain. + toolchain-benchmarks diff --git a/sources b/sources index a180cbf..3c588c8 100644 --- a/sources +++ b/sources @@ -1,34 +1,35 @@ SHA512 (cmake.tar.gz) = d00dc63627c452494f0f240792b742529a9ba00622cc69ba42bda26299dcdf0f5596e1e7e17bff0daf0543e94de1f23b37d8fce8a79e8c90aeaca10c50bd4605 -SHA512 (cmark.tar.gz) = 85274c6f22e7e719e9679da95469ad81ff671f05cc9c7d800262927f259e6fa5499086c0489157bd2c572dfa938b568a1ce790adc26dd2df548b197f14e74e20 -SHA512 (corelibs-foundation.tar.gz) = e6d5502daa688d6c4fe7691cc7d20291af5550deb3d1f63f57ba4cab69517f42a75c043caa33fe43a146a94c7258d46eac587e752a433ca448d53a18b64617e3 -SHA512 (corelibs-libdispatch.tar.gz) = 7d8f40ff7a43ac0367552855317e73e140ba7ff7d2b6494aa772ba052fd7d1a151b0122465b6a82a7e4483e8dd951e77d6b626d63e0997c9a64e3a2bc6d66250 -SHA512 (corelibs-xctest.tar.gz) = d0895f9e2bde93d163c68f517b4adfa89eed0061132157eecbcb1edb8bc8fa1bc456d108b4bf427ceb0807945fb478628bd189f55867989f9eca91f0d8361cd6 +SHA512 (cmark.tar.gz) = 429bc1400b0d16b32caaa11ec5fc2f29feffc60410ad36ce49d4c65abf58065b08b980d9598fe259ea6ca545dd469829f64b55ec9e949b429ad08c87c7906723 +SHA512 (corelibs-foundation.tar.gz) = de22d7c246c7a0aa01e5071b114597cbbef59fc3f8caf397c632214fda44c80ac3011f06f53413a107de8501959fe4c42d4f4fdaa046c9b0b1073a63f59540fc +SHA512 (corelibs-libdispatch.tar.gz) = 913885f00c2010a88ceeb2f9414f2b39e9884ca3fd58e927248dcfafa2205560468114de5627e1225d23ea9e3a50e39670b3afd03defba3de54268653888c32c +SHA512 (corelibs-xctest.tar.gz) = d285f73ac9054e1ca6c5f2864cfd95a05305199d3feef7ca9ea76916d20cc0221b5ce969970ed51c5b3664e0c055c7a20952a342713f08172d87c2043d8c5a27 SHA512 (icu.tar.gz) = 6902ccee36b29f31d7615d5bf5ce78e0d33744c8dcefce1aec90de7e18e384f673b4301fcca1f3cbe81f236dc250763104bff1af240621ff54b65a053ba6f6d7 -SHA512 (indexstore-db.tar.gz) = d15338505df98e807064d7064bd217110019699e1b6f5028a8b9dfd1eb44648d52192ecf0786114618b10310f6b16492b28f27f00bd68a8547817028f4810622 -SHA512 (llbuild.tar.gz) = 21179d62d930f06a3d9a907be635dd268958a36f782dbf4f1f3531dea1d28b664f95961660a2c0cf02e5d6c755294d864608e8cb7517df748deac7816754d8e0 -SHA512 (llvm-project.tar.gz) = 0183db8f8885a466f8cdac8775e4cbda10603d35f885fa97a12ccc21a1b8079b9c3ee370d5b4d88df2e68bfb0946b0f1c7c12d2ce552f7a8bd0170d4df3a39e4 +SHA512 (indexstore-db.tar.gz) = 0b331d384c3e0b78ffc88c3f791f8f0520725250d38e40065bf760100116c24f51d19765a9bc110ee4ebc3e19245209e76d36c5ea3f742779c9c828fd2941201 +SHA512 (llbuild.tar.gz) = 8ea20d9d2c16dd6062a5562324d1d9fd15f3642b7e22f9ad9715c25328e3a94a33b2fafaec3dc5ecf99f7686426f56dae99618b03537a83dd70d6002933c79a5 +SHA512 (llvm-project.tar.gz) = 9cea24ded3e5a5180f0d95ee3ccd2d4ff3403874b327f1aeb038e278c510f2ac5a4b39dc0b92f05c61183c0d39eb29ad10fee7e0f839037a10eb3af0433b7a49 SHA512 (ninja.tar.gz) = 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -SHA512 (package-manager.tar.gz) = 36c556c92c6b6eccef5420f0e9e43b8922a5ccdc8580262caca260e111c45958f50856f0ac74b7021056e3ef0873c32d1157a234d128dfad9decb91344327075 -SHA512 (sourcekit-lsp.tar.gz) = 15004189d61631cdd2fb6c157d8d0e1ff79be713730a7e8dc4ce598e76599f9d90a5f2e3a4d2d99b97bb86b16278f39b75ca240aec60bef1ebaa762ff2843217 +SHA512 (package-manager.tar.gz) = 05ff587cc07015828883d8effdafc2da12836e8ef5926a54f61900fb73586fc9198988c8819f3a3ac42571d877950b20a5c12418d02fe04f293512ea2ec65a8e +SHA512 (sourcekit-lsp.tar.gz) = 77f32a3be6247093c2c4c188b567be62c1ec7b0116fb0b311ec50f70c3809576595f009a67acc5d25b4dae65651a3627d82ffbddf0f17b0b7b28e2da4847cd0f SHA512 (swift-argument-parser.tar.gz) = f98558f3ea1f64a0046e037911b060b39a01ef60956c3529ddece76bb38181fbcf8fa6f08d3ee579755882e4a1a684316792627aeb698b20aafcac813d86dc9f SHA512 (swift-atomics.tar.gz) = b538a9709eadfe96831393b977add28227da65d814b248bd03effc2bb7e36fff69cca692a6fd5946a029d43ddaca9b38aee91d9abf01e09ec8e5473d07d6886f -SHA512 (swift-cmark-gfm.zip) = 7050dce76d5143d718e2d6f6789dcb2cf3cf0a5ca545e23ab5801bcf949edf05fbf90e8931dd2157c01d4f44205e8b7312d2f930bd57b81864982b69bedde3de SHA512 (swift-collections.tar.gz) = f603f96827051fab8376ccb9d951e57e0ddd2e8a26350419c9d7356458e278ed7a9e8f1d240f5a9141880b476d53fb3c2148bf7ec15c928514acd1eed0ffc2ca -SHA512 (swift-crypto.tar.gz) = cf4c5a1607325ef6b38e8ad330b54e8366bc540fab20b519cb3e3b8d73052ada93a358286ede73a7b7ae58a4641c5857f1fc820db768cbcacd65b20d3e6842d2 -SHA512 (swift-docc-render-artifact.tar.gz) = 241a5c8dac9058fbecca083cec0a13bb4f7ae481da0128eeb96c3f5ace870726a5253bd85e193c5c7268a8b28ad780cd5ef75443a8085e887ae2a2bbfebcd2f4 -SHA512 (swift-docc-symbolkit.tar.gz) = 646fb22f0e0c9e66efc1d9f18c04fe92ea2bf5b3c4ab04ddbfb4df95e47727291d2f83eb53cddf49c70fce15e634bb8430aea9fff8afe490f2a825bb71979083 -SHA512 (swift-docc.tar.gz) = 8ec63b77375b7b933bac0e7b5c0b12f71bfd881a88ffca31a88c473cb210f4f9067d0fc9d45423ef61b4b85bb921a1338a47311e6045d3b915212eefc96e8aad -SHA512 (swift-driver.tar.gz) = 13b7c28b9acf311a1bad0640600022a89acd11e99fc4ee5bf7d8e60e21bb1af916c905cd09dc6977a1b7577a66cecea9c577db26d1523d20508a7c509052c5c9 -SHA512 (swift-format.tar.gz) = fc4e7f3ecb6504ac1e74a19d19738b436fae7f1e41152a96ddd734648435ffc0b35daf309fd99141282411850c317a83d43138a79ff51465551f4aeb51493ffc -SHA512 (swift-integration-tests.tar.gz) = 7a4ca93a59d09911cfb99202bcf2c03476e6b1d63c3d198ef1c636146a3ec8390aa275b9a54190c6168460553f1f07c0b6af311a8bdef82180e57cbb7321e46d -SHA512 (swift-lmdb.tar.gz) = a3596def12e02b07a9b70eb44bff6ecc04126091f0dcf92abb7affc69aedc2b5ed341f42e53ebe6b02562c1fd0d58716902af2907aa29da1b1605bc85ac6a78a -SHA512 (swift-markdown.tar.gz) = 042b2f63996ebe0c243597b4713a87ae5260fe0eef0aab1ddd1109b1322becf32e35567fe6ec6ba2bae5905c472a4df4db63b91fe170576d8e6c03a778a31c6c +SHA512 (swift-crypto.tar.gz) = 93a1304a2ba7e7b7335f0c137339fb3ef510fd12120ed0ac1edaa678b6b013b32690d380f94936cc4bd76ce3f14f06b9e69e2eacdad6a1924749b71c08037217 +SHA512 (swift-docc-render-artifact.tar.gz) = b3ca9b9734c5ae333fb521a995a47cb8af3a4097f4d250a0ec1194dbc239adc9285065478bbd507867167122826d93fc55f15bd18717118b4474e044b9b7edb4 +SHA512 (swift-docc-symbolkit.tar.gz) = 639521f8ce28974e02d24be3270ddf39766db57d568e682a2f7c8ec31d7ee7fb0c24ddc4a2173aae2e35c4bee9e51012dae6fd46e5c9e6cec294971c8cb5bf26 +SHA512 (swift-docc.tar.gz) = 4317a94b2018a1c12f50547bd002bca47231d0fa85a0fc18fc5035bad2197bb581d55083767e9a20458b2ae331c6f47a0c4b643a25925453e2d2460dabf80366 +SHA512 (swift-driver.tar.gz) = 391a8b8ff984ed9619285605432a752c80444ffc7d6b8cbd4a1caf1e48c6d64b010ed3a68dfce054f897240c210d68c65a534cd709eb7bec950add2454bf6b10 +SHA512 (swift-experimental-string-processing.tar.gz) = 1632126dead4b5fa6d975d2cae79da9cabaf600bac4fc8e1f95b5e82a1bc382949dce6f935e556e32dedb8644c8de771897266fab74b6d7cee27e39e3f8dff9e +SHA512 (swift-format.tar.gz) = 683850cd6035f750ff2e9e066e53cae92370cddcfadf5e4df61c646c4b5911c0c644d0652752b22f00df9753fdeb750e7d7d61c72236bc6e8753eb4958c20ec1 +SHA512 (swift-integration-tests.tar.gz) = a4b54659d77afecab1d32917f9dc595c3e7ecc6ee9d44c1e14ebc8fea0881f1ea9d9af16be65db38600da6923ac0f0cf7fffc8ed8fcc8262ef949d49c6b56845 +SHA512 (swift-lmdb.tar.gz) = bf361096ba201ecf9bdff6982b2f1ed35d4c00dd47ca4fc4dd65fa6df393249031978c007551a824d2708e2d3cce7f4b345357952f091874b95b888b27ea95e9 +SHA512 (swift-markdown.tar.gz) = 11cf2d6f23c97c0d0f017fb3ab309687d0f8726679bb5a502b538e588a6d47607cddf67c6418714dfb453fe226016903b246c439dfa9834308c2103730373c64 SHA512 (swift-nio-ssl.tar.gz) = 5ba54beb93d669715b05627455003aad29847f04886ed08fd6bcc37f3ffcb64183c033ae3220446d69bc720a3da5940f3979b8039ddbe8869d81d70a18c42e36 SHA512 (swift-nio.tar.gz) = e8b8bc5d49c92e327d660c1ee34a9bbdb169e19501211ed56765c51303905494f808d4b76ae9f9a50718db5efe337961ef6baad146197c9d7ba7a8b6c08e3a8e SHA512 (swift-numerics.tar.gz) = 7d0d8f27d8c639f92fb652183ade9032b36f39e19b966aa734cab5b4d43ce5d342856dddd87ac1d4cd605c18583c8e629f37634e440de34ec0d5e18aa138d0ba -SHA512 (swift-syntax.tar.gz) = a78badd0eeaeb3abbb1c1cf9b4d1d204129cb4b3235c51f831e3e1735e0f50ebc0c789944fa8cbac129de9e8dad9623383f25f533223550e0780be2a941cd4e5 +SHA512 (swift-stress-tester.tar.gz) = 9213c73dd7303ca95a42e9a5c8379a7e123bae8eec70939154008d918cbf16472a8f73f5b930e9fbd1aa0388fe93c9ddc1c64f40145808c03d36856b3dba8f8c +SHA512 (swift-syntax.tar.gz) = 273106efe463a4105fd234c4b25671636e811ee87221f68d36a204f0c82d40dddcd75f9808ba5479bab1efc0d61bd6afc84f780aea02ac5186552b19a9777d23 SHA512 (swift-system.tar.gz) = fec08fbc352197215596974303cd7e08b46ff44b1bd36c70b95be4e7490880f4d7e645e64e90f1c81bfca06d9302c600ccc02c9f5cc7b83a69da46489b105e1c -SHA512 (swift-tools-support-core.tar.gz) = e3d1cd64899f34285d22a79f30c5c6835810638b74830ee99926f1faee304c10b2b192d2fb7188450c7df007c93f8cdba48443e9cedeed96aff2e9283c7a67fd -SHA512 (swift-xcode-playground-support.tar.gz) = a1309ac3ea7edb15628b93ad261958ccd27c60ccc8a36af6d224c9e94a58b172862b26689acfc1bf6efbc0a218e7857caf5f99d57ec1db158ce485224ac5dfc9 -SHA512 (swift.tar.gz) = fafa80ff4d7e55ded58b3de942d25c8a9cf24ccbdd4f949e85d9d7a1119998825cd48be6ce9121bcbeb04d1755b63617e055a73f05748339528ecf432b9946fa +SHA512 (swift-tools-support-core.tar.gz) = cbe9f3b77fd11a8f72b5f97554d605810025a185fad7b5431cfbb703946ddf13cb8ce7f511ce6b1b9ffca141048ae988c31b68a044bfeebde86808f5e039f807 +SHA512 (swift-xcode-playground-support.tar.gz) = f66c839e4b78cdecb7f8dfac8bf78e026671cfcbc6df4c176d4f06f4c7d61bdb84988032f994628ed489941081a6073d2686852b6b3c54b984b0198d82df971d +SHA512 (swift.tar.gz) = 3c3568b42572c37b0d5ef261bc6fbd28c0b7907ae389ec5d5be25ae6fda6e4d5582bce7c3d92551f0a0412c39bb663768ca807f199054450826ed0062776e4ea SHA512 (yams.tar.gz) = 91feecb95d1997235e443dea925ff11fa665e94c12c8eca2ed066ef340a51ec0253df2545d91184c31423cb4b039e1f89ac8f743cf3f154c9d93495eecc45432 diff --git a/swift-lang.spec b/swift-lang.spec index 1adda19..fac3073 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -3,18 +3,19 @@ %global linux_version fedora +################################################# # Make sure these are changed for every release! -%global swift_version 5.7.3-RELEASE -%global fedora_release 2 -%global package_version 5.7.3 +################################################# +%global swift_version 5.8-RELEASE +%global fedora_release 1 +%global package_version 5.8 # Set to the right version per the json file %global swift_source_location swift-source -%global sap_version 0.4.3 %global icu_version 65-1 %global yams_version 5.0.1 %global swift_argument_parser_version 1.0.3 -%global swift_crypto_version 1.1.5 +%global swift_crypto_version 2.2.3 %global ninja_version 1.11.1 %global cmake_version 3.19.6 %global swift_atomics_version 1.0.2 @@ -23,10 +24,11 @@ %global swift_system_version 1.1.1 %global swift_nio_version 2.31.2 %global swift_nio_ssl_version 2.15.0 -# HEY! Are you changing the version of the project below? -# Make sure to change it in the %prep section as well in -# the renaming part -%global swift_cmark_gfm_branch release/5.7-gfm + +# Temporary I presume as the json file suggests there should +# be eventually a release version of swift-format +%global swift_format_version 0.50700.1 + Name: swift-lang Version: %{package_version} @@ -57,7 +59,7 @@ Source18: https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_ Source19: https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz Source20: https://github.com/KitWare/CMake/archive/refs/tags/v%{cmake_version}.tar.gz#/cmake.tar.gz Source21: https://github.com/apple/swift-atomics/archive/%{swift_atomics_version}.tar.gz#/swift-atomics.tar.gz -Source22: https://github.com/apple/swift-cmark/archive/refs/heads/%{swift_cmark_gfm_branch}.zip#/swift-cmark-gfm.zip +Source22: https://github.com/apple/swift-stress-tester/archive/swift-%{swift_version}.tar.gz#/swift-stress-tester.tar.gz Source23: https://github.com/apple/swift-docc/archive/swift-%{swift_version}.tar.gz#/swift-docc.tar.gz Source24: https://github.com/apple/swift-docc-render-artifact/archive/swift-%{swift_version}.tar.gz#/swift-docc-render-artifact.tar.gz Source25: https://github.com/apple/swift-docc-symbolkit/archive/swift-%{swift_version}.tar.gz#/swift-docc-symbolkit.tar.gz @@ -66,14 +68,18 @@ Source27: https://github.com/apple/swift-numerics/archive/%{swift_numerics Source28: https://github.com/apple/swift-system/archive/%{swift_system_version}.tar.gz#/swift-system.tar.gz Source29: https://github.com/apple/swift-nio/archive/%{swift_nio_version}.tar.gz#/swift-nio.tar.gz Source30: https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_version}.tar.gz#/swift-nio-ssl.tar.gz -Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +%dnl Source31: https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz +Source31: https://github.com/apple/swift-format/archive/refs/tags/%{swift_format_version}.tar.gz#/swift-format.tar.gz Source32: https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz Source33: https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz +Source34: https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz +%dnl Source35: https://github.com/apple/swift-llvm-bindings/archive/swift-%{swift_version}.tar.gz#/swift-llvm-bindings.tar.gz Patch1: uintptr.patch Patch2: enablelzma.patch Patch3: fs.patch Patch4: unusedvars.patch +Patch5: no-test.patch BuildRequires: clang BuildRequires: swig @@ -111,6 +117,7 @@ ExclusiveArch: x86_64 aarch64 Provides: swiftlang = %{version}-%{release} + %description Swift is a general-purpose programming language built using a modern approach to safety, performance, and software design @@ -124,7 +131,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 +%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is # necessary @@ -155,10 +162,12 @@ mv swift-numerics-%{swift_numerics_version} swift-numerics mv swift-system-%{swift_system_version} swift-system mv swift-nio-%{swift_nio_version} swift-nio mv swift-nio-ssl-%{swift_nio_ssl_version} swift-nio-ssl -mv swift-format-swift-%{swift_version} swift-format +%dnl mv swift-format-swift-%{swift_version} swift-format +mv swift-format-%{swift_format_version} swift-format mv swift-lmdb-swift-%{swift_version} swift-lmdb mv swift-markdown-swift-%{swift_version} swift-markdown -mv swift-cmark-release-5.7-gfm swift-cmark-gfm +mv swift-stress-tester-swift-%{swift_version} swift-stress-tester +mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing # ICU mv icu-release-%{icu_version} icu @@ -173,26 +182,21 @@ mv ninja-%{ninja_version} ninja %py3_shebang_fix swift/utils/api_checker/swift-api-checker.py %py3_shebang_fix llvm-project/compiler-rt/lib/hwasan/scripts/hwasan_symbolize -# Fix for uintptr_t not being declared because the header wasn't -# explicitly declared +# Fix for uinit_ptr not being declared implicitly %patch1 -p0 # Enable LZMA %patch2 -p0 -# Fix for glibc defining certain structs and enums twice that are flagged -# as redefined when including linux/fs.h -%patch3 -p0 - -# Fix for variable that is initialized and not used -%patch4 -p0 +# Tests fail for some reason preventing the package from being built +%patch5 -p0 %build export VERBOSE=1 -# Before Fedora 34, we may not have /usr/bin/python, so we +# EPEL8 may not have /usr/bin/python, so we # roll our own because the build script expects there to be one. -%if 0%{?fedora} < 34 || 0%{?el8} +%if 0%{?el8} if [ ! -d $PWD/binforpython ] ; then mkdir -p $PWD/binforpython ln -s /usr/bin/python3 $PWD/binforpython/python @@ -233,14 +237,13 @@ export QA_SKIP_RPATHS=1 %changelog -* Wed Jan 25 2023 Ron Olson - 5.7.3-2 -- Added patch for missing includes - Resolves: rhbz#2162626 +* Fri Mar 31 2023 Ron Olson - 5.8-1 +- Updated to Swift 5.8-RELEASE + Resolves: rhbz#2183429 * Sat Jan 21 2023 Fedora Release Engineering - 5.7.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Jan 20 2023 Ron Olson - 5.7.3-1 -- Updated to Swift 5.7.3-RELEASE - Resolves: rhbz#2162626 +* Tue Dec 27 2022 Ron Olson - 5.8-1 +- Cleanup and first attempt at getting 5.8 going * Fri Dec 16 2022 Ron Olson - 5.7.2-2 - SPDX migration * Wed Dec 14 2022 Ron Olson - 5.7.2-1