From d4ddcaa805eac4eb30427dfdab70595724add5de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Wed, 18 Dec 2024 09:13:07 +0100 Subject: [PATCH] filesystem: drop clang32 --- filesystem/PKGBUILD | 15 ++++++--------- filesystem/clang32.ico | Bin 30395 -> 0 bytes filesystem/msys2_shell.cmd | 6 +----- filesystem/msystem | 9 --------- filesystem/shell | 5 ++--- 5 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 filesystem/clang32.ico diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 90f60975..7b60386e 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Alethea Rose pkgname=filesystem -pkgver=2023.02.07 -pkgrel=3 +pkgver=2024.12.18 +pkgrel=1 pkgdesc='Base filesystem' arch=('i686' 'x86_64') license=('spdx:BSD-3-Clause') @@ -31,7 +31,6 @@ source=('bash.bash_logout' 'msys2.ico' 'ucrt64.ico' 'clang64.ico' - 'clang32.ico' 'clangarm64.ico' 'msys2_shell.cmd' 'msystem' @@ -65,16 +64,15 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0' '793b9450a1a59a6c294e51fd0c2a47090d68c68ff2f33a25a11b45f6408c3917' '733e97cbb823773e1a08a91a41035a7692bc0ff270d3c894224911b4b091db44' '56d4080c15dff89a6263f3d5f9aa68849b2062179cabd6d78edfe0e3af6bf64a' - '58f7431d7d8d9d09ebd3185c090404682d760bf18c27f94085007b037a5889bd' '3b7af99516768485383b34d606749e6f98a250372a8191bc8d3a962d66bdfe35' - '390b7471838d14fd41f97f49616dc444454ebc90aea1da54a20799720d4f3772' - '5f7aa3a776dbdaae78a27e608bf004bf50d5aaace2c2b03581d940b771bc8582' + '0b21f70be5adddc1e0614b46d5ce694ae98c6bd1e4165953776c3f7a7793c370' + 'b0a722f7a4096f8d9a572bf6f530b53d39f2a94b4d0e1ed3f70f26ce7469bbea' '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d' 'b8abe6231cd2b089d708d3e3097ef8c279af1e1594aa15c6eaab4150ed9dffdc' '6c0ca979c7b146b3750103b1296a399764f4e1b222ee091d3aa072b6da16c1a5' 'cbec90c9403826bf6d8dd1fed16240b9d8695ec15df5dcdab7e485bb46c016ab' 'a2ec65de2adb0277f51001463c1a0759f8a5bc35cf2f213fa26ee73df52c5280' - 'ad9873e18169ca87194af3413bdcbda536d9600b4f7d24fa9f7d59928309ff4a' + '14a23772ffb216d34a18012d42d6ec5edf3c3cfb6162bc46d390624a69092ae6' 'f63241cc56aa7b7ec6962d19991d211b4e1641b78ba5226835118ab493830a8b' 'e96c1f54ffff792e738aa032815c82c30821b0683806e5ed0ba2a759db2fd494' '3a4d629d72ab8ac58427097c3a8915c4e8186f819cd369c2da5eca955d08fceb' @@ -128,7 +126,6 @@ package() { install -m644 ${srcdir}/mingw64.ico mingw64.ico install -m644 ${srcdir}/ucrt64.ico ucrt64.ico install -m644 ${srcdir}/clang64.ico clang64.ico - install -m644 ${srcdir}/clang32.ico clang32.ico install -m644 ${srcdir}/clangarm64.ico clangarm64.ico install -m644 ${srcdir}/msys2.ico msys2.ico install -m755 ${srcdir}/msys2_shell.cmd msys2_shell.cmd @@ -161,7 +158,7 @@ package() { install -D -m644 ${srcdir}/redirect-config.site usr/local/etc/config.site # setup /mingw hierarchies - for m in mingw32 mingw64 clang32 clang64 clangarm64 ucrt64; do + for m in mingw32 mingw64 clang64 clangarm64 ucrt64; do install -d -m755 ${m} for d in bin etc include lib share; do install -d -m755 ${m}/${d} diff --git a/filesystem/clang32.ico b/filesystem/clang32.ico deleted file mode 100644 index 39039bab19a05e579ea019b0b7b87f9ddfa70bf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30395 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 M+D!W-JMYN<1sePU5&!@I diff --git a/filesystem/msys2_shell.cmd b/filesystem/msys2_shell.cmd index a1608617..c9f4d3c2 100644 --- a/filesystem/msys2_shell.cmd +++ b/filesystem/msys2_shell.cmd @@ -41,7 +41,6 @@ if "x%~1" == "x-mingw32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW3 if "x%~1" == "x-mingw64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW64& goto :checkparams if "x%~1" == "x-ucrt64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=UCRT64& goto :checkparams if "x%~1" == "x-clang64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG64& goto :checkparams -if "x%~1" == "x-clang32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG32& goto :checkparams if "x%~1" == "x-clangarm64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANGARM64& goto :checkparams if "x%~1" == "x-mingw" shift& set /a msys2_shiftCounter+=1& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams rem Console types @@ -110,9 +109,6 @@ if "%MSYSTEM%" == "MINGW32" ( ) else if "%MSYSTEM%" == "CLANG64" ( set "CONTITLE=MinGW Clang x64" set "CONICON=clang64.ico" -) else if "%MSYSTEM%" == "CLANG32" ( - set "CONTITLE=MinGW Clang x32" - set "CONICON=clang32.ico" ) else if "%MSYSTEM%" == "CLANGARM64" ( set "CONTITLE=MinGW Clang ARM64" set "CONICON=clangarm64.ico" @@ -206,7 +202,7 @@ echo Usage: echo %~1 [options] [login shell parameters] echo. echo Options: -echo -mingw32 ^| -mingw64 ^| -ucrt64 ^| -clang32 ^| -clang64 ^| +echo -mingw32 ^| -mingw64 ^| -ucrt64 ^| -clang64 ^| echo -msys[2] ^| -clangarm64 Set shell type echo -defterm ^| -mintty ^| -conemu Set terminal type echo -here Use current directory as working diff --git a/filesystem/msystem b/filesystem/msystem index cc09f7fd..6bcffd72 100644 --- a/filesystem/msystem +++ b/filesystem/msystem @@ -39,15 +39,6 @@ case "${MSYSTEM}" in MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}" export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX ;; - CLANG32) - MSYSTEM_PREFIX='/clang32' - MSYSTEM_CARCH='i686' - MSYSTEM_CHOST='i686-w64-mingw32' - MINGW_CHOST="${MSYSTEM_CHOST}" - MINGW_PREFIX="${MSYSTEM_PREFIX}" - MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}" - export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX - ;; CLANG64) MSYSTEM_PREFIX='/clang64' MSYSTEM_CARCH='x86_64' diff --git a/filesystem/shell b/filesystem/shell index ffb5ca10..2499ab24 100755 --- a/filesystem/shell +++ b/filesystem/shell @@ -36,12 +36,12 @@ fi # Argument validation -if [[ "${BASH_SOURCE}" != "${0}" && ! "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clang32|clangarm64|msys)$ ]]; then +if [[ "${BASH_SOURCE}" != "${0}" && ! "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clangarm64|msys)$ ]]; then echo "Unrecognized shell type ${1}" return 1 fi -if [[ "${BASH_SOURCE}" = "${0}" && "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clang32|clangarm64|msys)$ ]]; then +if [[ "${BASH_SOURCE}" = "${0}" && "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clangarm64|msys)$ ]]; then echo "Cannot switch to ${1} shell without sourcing" exit 1 fi @@ -81,7 +81,6 @@ else /mingw64/*) winpty "${@}" || exit ;; /ucrt64/*) winpty "${@}" || exit ;; /clang64/*) winpty "${@}" || exit ;; - /clang32/*) winpty "${@}" || exit ;; /clangarm64/*) winpty "${@}" || exit ;; *) "${@}" || exit ;; esac