diff options
| -rw-r--r-- | internal/rosa/package/gnu.az | 4 | ||||
| -rw-r--r-- | internal/rosa/package/hwdata.az | 4 | ||||
| -rw-r--r-- | internal/rosa/package/kernel/amd64.config | 8 | ||||
| -rw-r--r-- | internal/rosa/package/kernel/arm64.config | 8 | ||||
| -rw-r--r-- | internal/rosa/package/kernel/ppc64le.config | 8 | ||||
| -rw-r--r-- | internal/rosa/package/kernel/riscv64.config | 8 | ||||
| -rw-r--r-- | internal/rosa/package/libexpat.az | 4 | ||||
| -rw-r--r-- | internal/rosa/package/llvm/package.az | 4 | ||||
| -rw-r--r-- | internal/rosa/package/muon/package.az | 11 | ||||
| -rw-r--r-- | internal/rosa/package/muon/remove-cl.patch | 39 | ||||
| -rw-r--r-- | internal/rosa/package/noto.az | 4 |
11 files changed, 30 insertions, 72 deletions
diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az index 15598ee6..7f95fa8f 100644 --- a/internal/rosa/package/gnu.az +++ b/internal/rosa/package/gnu.az @@ -465,10 +465,10 @@ package libiconv { website = "https://www.gnu.org/software/libiconv"; anitya = 10656; - version# = "1.19"; + version# = "1.19.1"; source = remoteTar { url = "https://mirrors.kernel.org/gnu/libiconv/libiconv-"+version+".tar.gz"; - checksum = "UibB6E23y4MksNqYmCCrA3zTFO6vJugD1DEDqqWYFZNuBsUWMVMcncb_5pPAr88x"; + checksum = "vKggSQtd5ktFASBd2xhAvaF9N1drv9jfXnU2lCd9UfIxiGOUiTNyEqWPjjs00F0B"; compress = gzip; }; diff --git a/internal/rosa/package/hwdata.az b/internal/rosa/package/hwdata.az index 5f853a0a..805e2ff7 100644 --- a/internal/rosa/package/hwdata.az +++ b/internal/rosa/package/hwdata.az @@ -3,11 +3,11 @@ package hwdata { website = "https://github.com/vcrhonek/hwdata"; anitya = 5387; - version# = "0.412"; + version# = "0.413"; source = remoteGitHub { suffix = "vcrhonek/hwdata"; tag = "v"+version; - checksum = "_HkJ6nni1s_D_CEPUM905AaQkE8v-CorQOv9sB8x0EafeTeOV86b8l-SqL6i7DJL"; + checksum = "cU-BPfDI2sxjciIagoH8LoeFEyfXQl743G27DfdnNn12_5ZnaA3oTjV60AsnXFFW"; }; writable = true; diff --git a/internal/rosa/package/kernel/amd64.config b/internal/rosa/package/kernel/amd64.config index 50cb2337..5606485f 100644 --- a/internal/rosa/package/kernel/amd64.config +++ b/internal/rosa/package/kernel/amd64.config @@ -2,15 +2,15 @@ # Automatically generated file; DO NOT EDIT. # Linux/x86 6.18.60 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.4" +CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.5" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=230104 +CONFIG_CLANG_VERSION=230105 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=230104 +CONFIG_AS_VERSION=230105 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=230104 +CONFIG_LLD_VERSION=230105 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y diff --git a/internal/rosa/package/kernel/arm64.config b/internal/rosa/package/kernel/arm64.config index c8d348dd..dc7f7fd9 100644 --- a/internal/rosa/package/kernel/arm64.config +++ b/internal/rosa/package/kernel/arm64.config @@ -2,15 +2,15 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.18.60 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.4" +CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.5" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=230104 +CONFIG_CLANG_VERSION=230105 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=230104 +CONFIG_AS_VERSION=230105 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=230104 +CONFIG_LLD_VERSION=230105 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y diff --git a/internal/rosa/package/kernel/ppc64le.config b/internal/rosa/package/kernel/ppc64le.config index fa996991..3d61386e 100644 --- a/internal/rosa/package/kernel/ppc64le.config +++ b/internal/rosa/package/kernel/ppc64le.config @@ -2,15 +2,15 @@ # Automatically generated file; DO NOT EDIT. # Linux/powerpc 6.18.60 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.4" +CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.5" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=230104 +CONFIG_CLANG_VERSION=230105 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=230104 +CONFIG_AS_VERSION=230105 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=230104 +CONFIG_LLD_VERSION=230105 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y diff --git a/internal/rosa/package/kernel/riscv64.config b/internal/rosa/package/kernel/riscv64.config index 280e84c9..c7683f9c 100644 --- a/internal/rosa/package/kernel/riscv64.config +++ b/internal/rosa/package/kernel/riscv64.config @@ -2,15 +2,15 @@ # Automatically generated file; DO NOT EDIT. # Linux/riscv 6.18.60 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.4" +CONFIG_CC_VERSION_TEXT="Rosa OS clang version 23.1.5" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=230104 +CONFIG_CLANG_VERSION=230105 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=230104 +CONFIG_AS_VERSION=230105 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=230104 +CONFIG_LLD_VERSION=230105 CONFIG_RUSTC_VERSION=0 CONFIG_RUSTC_LLVM_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y diff --git a/internal/rosa/package/libexpat.az b/internal/rosa/package/libexpat.az index 2f6386f5..3a49c90b 100644 --- a/internal/rosa/package/libexpat.az +++ b/internal/rosa/package/libexpat.az @@ -3,7 +3,7 @@ package libexpat { website = "https://libexpat.github.io"; anitya = 770; - version# = "2.9.0"; + version# = "2.10.0"; source = remoteGitHubRelease { suffix = "libexpat/libexpat"; tag = "R_"+replace { @@ -12,7 +12,7 @@ package libexpat { new = "_"; }; name = "expat-"+version+".tar.bz2"; - checksum = "dMHFWTPDk1trundt3hRvg6lKbTTcxN-MCRGph2_rfWNA_HYOURLNmlYm9i25c6zZ"; + checksum = "oph4LHYYq7xXNFPOs6oEuuEPKkdw5LWpTU1hsRPausHqd6VTDw8EG9cJMELI4kkZ"; compress = bzip2; }; diff --git a/internal/rosa/package/llvm/package.az b/internal/rosa/package/llvm/package.az index 7a047b74..dafa05d3 100644 --- a/internal/rosa/package/llvm/package.az +++ b/internal/rosa/package/llvm/package.az @@ -2,11 +2,11 @@ package llvm-project { description = "LLVM monorepo with Rosa OS patches"; anitya = 1830; - version# = "23.1.4"; + version# = "23.1.5"; output = remoteGitHub { suffix = "llvm/llvm-project"; tag = "llvmorg-"+version; - checksum = "WcBjxRCDEAJDQVDxnEzr8iivxiShCKU7hM84TMSNfwdymAX-Eyw8oTda7pDSL73O"; + checksum = "WkeyJcYd6f7l0mftSfdPhfOu0PD3TqI4RppVQw9M83gmjUVYZf8aFiSUPJVVE0ND"; }; patches = [ "increase-stack-size-unconditional.patch", diff --git a/internal/rosa/package/muon/package.az b/internal/rosa/package/muon/package.az index 588a4c8d..19e1b120 100644 --- a/internal/rosa/package/muon/package.az +++ b/internal/rosa/package/muon/package.az @@ -3,11 +3,11 @@ package meson-tests { website = "https://github.com/muon-build/meson-tests"; exclude = true; - version# = "38483b8cf5eb4f6e9df7a78d786ec111e0d6eb5d"; + version# = "fc9f5953819851cbd63d25c9ed9d521a90473fd2"; output = remoteTar { url = "https://github.com/muon-build/meson-tests/archive/"+ version+".tar.gz"; - checksum = "ikrJiczlObaLUMHRbzzWmGgAyZMymxxC3D9VFozD0sV3e5ckiHXk8qk0Zr8bBWvO"; + checksum = "6IblifjfYzbc7EW4TMb9krK5E8dZ9TU40UHa0Xa4mhlAPtCpYkmVNmRH6U0U17lf"; compress = gzip; }; patches = [ "remove-broken-tests.patch" ]; @@ -18,16 +18,13 @@ package muon { website = "https://muon.build"; anitya = 391173; - version# = "0.7.0"; + version# = "0.7.1"; source = remoteTar { url = "https://git.sr.ht/~lattis/muon/archive/"+version+".tar.gz"; - checksum = "ackLkMhxutd7xvLAVU25qkM5CAztLaYf1dAC2vIvlRIZ8o6LjaNpH-3OyP1xGQTO"; + checksum = "aSsUxrcopKSSsv-3NiDaZbYvbFMI2dvpPLHBn06IYZRvvsH62oakZ341gEWhUmTC"; compress = gzip; }; patches = [ - // for some reason, muon decides to use clang-cl on Rosa OS - "remove-cl.patch", - // equivalent to the meson patches "respect-colour.patch", diff --git a/internal/rosa/package/muon/remove-cl.patch b/internal/rosa/package/muon/remove-cl.patch deleted file mode 100644 index e421c25d..00000000 --- a/internal/rosa/package/muon/remove-cl.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/script/runtime/toolchains.meson b/src/script/runtime/toolchains.meson -index 97682251..bb49b041 100644 ---- a/src/script/runtime/toolchains.meson -+++ b/src/script/runtime/toolchains.meson -@@ -1059,22 +1059,6 @@ toolchain.register_compiler( - }, - ) - --toolchain.register_compiler( -- 'clang-cl', -- exe: {'c': 'clang-cl', 'cpp': 'clang-cl'}, -- inherit: 'msvc', -- linker: 'lld-link', -- archiver: 'llvm-lib', -- detect: func(out str) -> int -- return 'CL.EXE COMPATIBILITY' in out ? 100 : 0 -- endfunc, -- handlers: { -- 'force_language': func(_c compiler, s str) -> list[str] -- return ['-x', s] -- endfunc, -- }, --) -- - toolchain.register_compiler( - 'nasm', - exe: {'nasm': 'nasm'}, -diff --git a/src/vsenv.c b/src/vsenv.c -index f55541ec..c92e665a 100644 ---- a/src/vsenv.c -+++ b/src/vsenv.c -@@ -73,7 +73,6 @@ vsenv_setup(struct workspace *wk, const char *cache_path, enum setup_platform_en - "cc", - "gcc", - "clang", -- "clang-cl", - }; - uint32_t i; - for (i = 0; i < ARRAY_LEN(comps); ++i) { diff --git a/internal/rosa/package/noto.az b/internal/rosa/package/noto.az index 838d222b..2103100f 100644 --- a/internal/rosa/package/noto.az +++ b/internal/rosa/package/noto.az @@ -3,11 +3,11 @@ package noto { website = "https://fonts.google.com/noto"; anitya = 10671; - version# = "2026.10.01"; + version# = "2026.11.01"; source = remoteGitHub { suffix = "notofonts/notofonts.github.io"; tag = "noto-monthly-release-"+version; - checksum = "lEKVFkRavG8j1wNdrVFK6s1k8Tlp3ICN30cIX_tuTv5w6uAnAMDIWSoviJ4oiwu8"; + checksum = "0AvgvVr9KpKcySfzLZZMaaKnYQGetIUeB6WofbCja1C4XvaiiES_Rw8sihgRH8u6"; }; enterSource = true; |
