diff --git a/packages/discord-ptb-deb/.SRCINFO b/packages/discord-ptb-deb/.SRCINFO index 9bdf400c28..52da190cfe 100644 --- a/packages/discord-ptb-deb/.SRCINFO +++ b/packages/discord-ptb-deb/.SRCINFO @@ -1,11 +1,11 @@ pkgbase = discord-ptb-deb gives = discord-ptb - pkgver = 0.0.144 + pkgver = 0.0.146 pkgdesc = Chat for Communities and Friends - Public Test Build url = https://discord.com/ arch = amd64 repology = project: discord-ptb - source = https://ptb.dl2.discordapp.net/apps/linux/0.0.144/discord-ptb-0.0.144.deb - sha256sums = 893a7a192843d4c542eaadb64426769984c687cbc31a3787891118a1283b17b9 + source = https://ptb.dl2.discordapp.net/apps/linux/0.0.146/discord-ptb-0.0.146.deb + sha256sums = a634f0406bc3b13c2b1dcceb6cee172763405d8a7a9324db5b9b0051690e0fe6 pkgname = discord-ptb-deb diff --git a/packages/discord-ptb-deb/discord-ptb-deb.pacscript b/packages/discord-ptb-deb/discord-ptb-deb.pacscript index c1729a8204..fac237ea5a 100644 --- a/packages/discord-ptb-deb/discord-ptb-deb.pacscript +++ b/packages/discord-ptb-deb/discord-ptb-deb.pacscript @@ -1,9 +1,9 @@ pkgname="discord-ptb-deb" gives="discord-ptb" -pkgver="0.0.144" +pkgver="0.0.146" source=("https://ptb.dl2.discordapp.net/apps/linux/${pkgver}/${gives}-${pkgver}.deb") url='https://discord.com/' pkgdesc="Chat for Communities and Friends - Public Test Build" -sha256sums=("893a7a192843d4c542eaadb64426769984c687cbc31a3787891118a1283b17b9") +sha256sums=("a634f0406bc3b13c2b1dcceb6cee172763405d8a7a9324db5b9b0051690e0fe6") arch=('amd64') repology=("project: ${gives}") diff --git a/packages/firefox-developer-edition-bin/.SRCINFO b/packages/firefox-developer-edition-bin/.SRCINFO index cc456c3174..b199207e6f 100644 --- a/packages/firefox-developer-edition-bin/.SRCINFO +++ b/packages/firefox-developer-edition-bin/.SRCINFO @@ -15,10 +15,14 @@ pkgbase = firefox-developer-edition-bin repology = visiblename: firefox-developer-edition repology = status: devel source_amd64 = https://download-installer.cdn.mozilla.net/pub/devedition/releases/140.0b2/linux-x86_64/en-US/firefox-140.0b2.tar.xz + source_amd64 = firefox-developer-edition.desktop + source_amd64 = firefox-developer-edition.png::https://www.mozilla.org/media/img/structured-data/logo-firefox-developer.8aedc8028e4d.png sha256sums_amd64 = ab17cf4f447bc681649903aca837c950f62e7fee004eaaa9fc2c894f6d001891 sha256sums_amd64 = SKIP sha256sums_amd64 = SKIP source_arm64 = https://download-installer.cdn.mozilla.net/pub/devedition/releases/140.0b2/linux-aarch64/en-US/firefox-140.0b2.tar.xz + source_arm64 = firefox-developer-edition.desktop + source_arm64 = firefox-developer-edition.png::https://www.mozilla.org/media/img/structured-data/logo-firefox-developer.8aedc8028e4d.png sha256sums_arm64 = b6b38968b00781bbc144065f0294947bdcd1f23bfa641f57efb6e88f5905cb40 sha256sums_arm64 = SKIP sha256sums_arm64 = SKIP diff --git a/packages/insomnia-deb/.SRCINFO b/packages/insomnia-deb/.SRCINFO index d920a7282a..dcf8d8fe7b 100644 --- a/packages/insomnia-deb/.SRCINFO +++ b/packages/insomnia-deb/.SRCINFO @@ -1,11 +1,11 @@ pkgbase = insomnia-deb gives = insomnia - pkgver = 2023.4.0 + pkgver = 11.1.0 pkgdesc = The open-source, cross-platform API client for GraphQL, REST, WebSockets and gRPC url = https://github.com/Kong/insomnia/ arch = amd64 maintainer = Diegiwg - source = https://github.com/Kong/insomnia/releases/download/core%402023.4.0/Insomnia.Core-2023.4.0.deb - sha256sums = eed91dd07689783742bd7d6dd57087aeb436df116b70cb32d67849244a7a9259 + source = https://github.com/Kong/insomnia/releases/download/core%4011.1.0/Insomnia.Core-11.1.0.deb + sha256sums = e0797a3707ca729fd326de6914485b28713ada7430bed76ec2cae421471a7418 pkgname = insomnia-deb diff --git a/packages/insomnia-deb/insomnia-deb.pacscript b/packages/insomnia-deb/insomnia-deb.pacscript index 13472bc31b..555979daa2 100644 --- a/packages/insomnia-deb/insomnia-deb.pacscript +++ b/packages/insomnia-deb/insomnia-deb.pacscript @@ -1,9 +1,9 @@ pkgname="insomnia-deb" gives="insomnia" -pkgver="2023.4.0" +pkgver="11.1.0" arch=("amd64") source=("https://github.com/Kong/insomnia/releases/download/core%40${pkgver}/Insomnia.Core-${pkgver}.deb") -sha256sums=("eed91dd07689783742bd7d6dd57087aeb436df116b70cb32d67849244a7a9259") +sha256sums=("e0797a3707ca729fd326de6914485b28713ada7430bed76ec2cae421471a7418") url="https://github.com/Kong/insomnia/" pkgdesc="The open-source, cross-platform API client for GraphQL, REST, WebSockets and gRPC" maintainer=("Diegiwg ") diff --git a/packages/ollama-bin/.SRCINFO b/packages/ollama-bin/.SRCINFO index 6dcc565415..3758f3bb35 100644 --- a/packages/ollama-bin/.SRCINFO +++ b/packages/ollama-bin/.SRCINFO @@ -11,9 +11,11 @@ pkgbase = ollama-bin optdepends_ubuntu = libnvidia-compute-390 | libnvidia-compute-418 | libnvidia-compute-430 | libnvidia-compute-440 | libnvidia-compute-450 | libnvidia-compute-455 | libnvidia-compute-460 | libnvidia-compute-465 | libnvidia-compute-470 | libnvidia-compute-495 | libnvidia-compute-510 | libnvidia-compute-515 | libnvidia-compute-520 | libnvidia-compute-525 | libnvidia-compute-530 | libnvidia-compute-535 | libnvidia-compute-545 | libnvidia-compute-550: required to use CUDA on NVIDIA GPU optdepends_debian = libcuda1: required to use CUDA on NVIDIA GPU source_amd64 = https://github.com/ollama/ollama/releases/download/v0.5.13/ollama-linux-amd64.tgz + source_amd64 = ollama.service sha256sums_amd64 = 30ec1cf2be608898c3b574c3805da66759406e59ad7db01a26719eaf7365c75a sha256sums_amd64 = e6893011419cf5d3073f713a130f112b61bbd1ce6f64ee9b4513c6f020f9624a source_arm64 = https://github.com/ollama/ollama/releases/download/v0.5.13/ollama-linux-arm64.tgz + source_arm64 = ollama.service sha256sums_arm64 = 8a4feee77f78e078f132c474694969e240f3d02c6d14f28d744bd59daa95332c sha256sums_arm64 = e6893011419cf5d3073f713a130f112b61bbd1ce6f64ee9b4513c6f020f9624a diff --git a/packages/pacup/.SRCINFO b/packages/pacup/.SRCINFO index f75a42d25f..18e906e3c7 100644 --- a/packages/pacup/.SRCINFO +++ b/packages/pacup/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = pacup - pkgver = 3.3.11 + pkgver = 3.3.12 pkgdesc = Help maintainers update pacscripts (next-gen Perl rewrite) arch = all depends = libdata-compare-perl @@ -15,7 +15,7 @@ pkgbase = pacup replaces = pacup-bin replaces = pacup-git maintainer = Oren Klopfer - source = https://github.com/pacstall/pacup/archive/refs/tags/3.3.11.tar.gz - sha256sums = d9f6d5523a0aa584230cdf32675705745651fb2ae8768e8628d48c98dd151469 + source = https://github.com/pacstall/pacup/archive/refs/tags/3.3.12.tar.gz + sha256sums = 0caac4d9d5083fefae1a55fae148a4acf974ec6a7e3b07cf8912978a909393fb pkgname = pacup diff --git a/packages/pacup/pacup.pacscript b/packages/pacup/pacup.pacscript index 4ebe32b73a..92276427e0 100644 --- a/packages/pacup/pacup.pacscript +++ b/packages/pacup/pacup.pacscript @@ -1,6 +1,6 @@ pkgname="pacup" arch=("all") -pkgver="3.3.11" +pkgver="3.3.12" pkgdesc="Help maintainers update pacscripts (next-gen Perl rewrite)" depends=( 'libdata-compare-perl' @@ -19,7 +19,7 @@ replaces=( "${pkgname}-git" ) source=("https://github.com/pacstall/${pkgname}/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('d9f6d5523a0aa584230cdf32675705745651fb2ae8768e8628d48c98dd151469') +sha256sums=('0caac4d9d5083fefae1a55fae148a4acf974ec6a7e3b07cf8912978a909393fb') maintainer=('Oren Klopfer ') build() { diff --git a/packages/protonplus/.SRCINFO b/packages/protonplus/.SRCINFO index dc6cdc2f36..f1d31159bc 100644 --- a/packages/protonplus/.SRCINFO +++ b/packages/protonplus/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = protonplus gives = protonplus - pkgver = 0.4.11 - pkgdesc = A simple Wine and Proton-based compatiblity tools manager for GNOME + pkgver = 0.4.31 + pkgdesc = A modern compatibility tools manager for Linux url = https://github.com/Vysp3r/ProtonPlus arch = x86_64 depends = libadwaita-1-0 @@ -23,8 +23,8 @@ pkgbase = protonplus incompatible = debian:bookworm incompatible = ubuntu:jammy license = GPL-3.0-or-later - maintainer = xdavius - source = protonplus-0.4.11.tar.gz::https://github.com/Vysp3r/ProtonPlus/archive/refs/tags/v0.4.11.tar.gz - sha256sums = 223c8da373a265de28591ba9269440c5cf79fa4f9168c00b99503a65982d4df1 + maintainer = Vysp3r + source = protonplus-0.4.31.tar.gz::https://github.com/Vysp3r/ProtonPlus/archive/refs/tags/v0.4.31.tar.gz + sha256sums = 1abbf8053f37b2cc765c18cb2d5b355e687d25b32bbb1bd0426749295328b357 pkgname = protonplus diff --git a/packages/protonplus/protonplus.pacscript b/packages/protonplus/protonplus.pacscript index 20ed596cc1..2d0735cb3e 100644 --- a/packages/protonplus/protonplus.pacscript +++ b/packages/protonplus/protonplus.pacscript @@ -1,8 +1,8 @@ pkgname="protonplus" gives="protonplus" _app_id="com.vysp3r.ProtonPlus" -pkgver="0.4.11" -pkgdesc="A simple Wine and Proton-based compatiblity tools manager for GNOME" +pkgver="0.4.31" +pkgdesc="A modern compatibility tools manager for Linux" arch=('x86_64') url='https://github.com/Vysp3r/ProtonPlus' license=('GPL-3.0-or-later') @@ -19,8 +19,8 @@ makedepends=('meson' 'desktop-file-utils') checkdepends=('appstream-util') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz") -sha256sums=('223c8da373a265de28591ba9269440c5cf79fa4f9168c00b99503a65982d4df1') -maintainer=("xdavius ") +sha256sums=('1abbf8053f37b2cc765c18cb2d5b355e687d25b32bbb1bd0426749295328b357') +maintainer=("Vysp3r ") incompatible=("debian:bookworm" "ubuntu:jammy") diff --git a/scripts/srcinfo.sh b/scripts/srcinfo.sh index e175c487a5..ff6861d389 100755 --- a/scripts/srcinfo.sh +++ b/scripts/srcinfo.sh @@ -147,7 +147,7 @@ function srcinfo.vars() { function srcinfo.write_global() { unset "${allvars[@]}" "${allars[@]}" - local CARCH='CARCH_REPLACE' DISTRO='DISTROBASE:DISTROVER' CDISTRO='CDISTROBASE:CDISTROVER' AARCH='AARCH_REPLACE' var ar aars bar ars rar rep seek + local CARCH='CARCH_REPLACE' DISTRO='DISTROBASE:DISTROVER' CDISTRO='CDISTROBASE:CDISTROVER' AARCH='AARCH_REPLACE' var ar aars bar ars rar rep seek alt local -A AARCHS_MAP=( ["amd64"]="x86_64" ["arm64"]="aarch64" @@ -180,31 +180,42 @@ function srcinfo.write_global() { ars="${ars//+([[:space:]])/ }" ars="${ars#[[:space:]]}" ars="${ars%[[:space:]]}" - if [[ ${ars} =~ CARCH_REPLACE || ${ars} =~ AARCH_REPLACE ]]; then - for aars in "${arch[@]}"; do - if [[ ${ars} =~ AARCH_REPLACE ]]; then - seek="AARCH_REPLACE" - rep="${AARCHS_MAP[${aars}]:-${aars}}" - else - seek="CARCH_REPLACE" - rep="${CARCHS_MAP[${aars}]:-${aars}}" - fi - local -n fin="${ar}_${rep}" + for aars in "${arch[@]}"; do + if [[ ${ars} =~ AARCH_REPLACE ]]; then + seek="AARCH_REPLACE" + rep="${AARCHS_MAP[${aars}]:-${aars}}" + alt="${CARCHS_MAP[${aars}]:-${aars}}" + else + seek="CARCH_REPLACE" + rep="${CARCHS_MAP[${aars}]:-${aars}}" + alt="${AARCHS_MAP[${aars}]:-${aars}}" + fi + local -n fin="${ar}_${rep}" fan="${ar}_${alt}" fun="${ar}" + if [[ ${ars} =~ ARCH_REPLACE ]]; then # shellcheck disable=SC2076 if [[ " ${AARCHS_MAP[*]} " =~ " ${ar##*_} " || " ${!AARCHS_MAP[*]} " =~ " ${ar##*_} " || ${ar} == *"x86_64" ]]; then - : "${ar}=${ars}" + : "${ar}+=(${ars//${seek}/${rep}})" [[ ${ar} != *"${aars}" ]] && continue else - : "${ar}_${aars}=${ars}" + : "${ar}_${aars}+=(${ars//${seek}/${rep}})" fi - if [[ -z ${fin[*]} ]]; then - eval "${_//${seek}/${rep}}" + if [[ -z ${fin[*]} && -z ${fan[*]} || " ${fin[*]} " == *" ${ars//${rep}/${seek}} "* ]]; then + eval "${_//+=/=}" + elif [[ " ${fun[*]} " != *" ${ars//${aars}/${alt}} "* && " ${fan[*]} " != *" ${ars//${aars}/${alt}} "* ]]; then + eval "${_}" + fi + else + # shellcheck disable=SC2076 + if [[ " ${AARCHS_MAP[*]} " =~ " ${ar##*_} " || " ${!AARCHS_MAP[*]} " =~ " ${ar##*_} " || ${ar} == *"x86_64" ]]; then + eval "${ar}+=(${ars})" + else + eval "${ar}_${aars}+=(${ars})" fi - done - # shellcheck disable=SC2076 - if [[ " ${multivalued_arch_attrs[*]} " =~ " ${ar} " ]]; then - unset "${ar}" fi + done + # shellcheck disable=SC2076 + if [[ " ${multivalued_arch_attrs[*]} " =~ " ${ar} " ]]; then + unset "${ar}" fi done done diff --git a/srclist b/srclist index 07e8c41215..f2f1d96c5e 100644 --- a/srclist +++ b/srclist @@ -2114,13 +2114,13 @@ pkgname = discord-deb --- pkgbase = discord-ptb-deb gives = discord-ptb - pkgver = 0.0.144 + pkgver = 0.0.146 pkgdesc = Chat for Communities and Friends - Public Test Build url = https://discord.com/ arch = amd64 repology = project: discord-ptb - source = https://ptb.dl2.discordapp.net/apps/linux/0.0.144/discord-ptb-0.0.144.deb - sha256sums = 893a7a192843d4c542eaadb64426769984c687cbc31a3787891118a1283b17b9 + source = https://ptb.dl2.discordapp.net/apps/linux/0.0.146/discord-ptb-0.0.146.deb + sha256sums = a634f0406bc3b13c2b1dcceb6cee172763405d8a7a9324db5b9b0051690e0fe6 pkgname = discord-ptb-deb --- @@ -3158,10 +3158,14 @@ pkgbase = firefox-developer-edition-bin repology = visiblename: firefox-developer-edition repology = status: devel source_amd64 = https://download-installer.cdn.mozilla.net/pub/devedition/releases/140.0b2/linux-x86_64/en-US/firefox-140.0b2.tar.xz + source_amd64 = firefox-developer-edition.desktop + source_amd64 = firefox-developer-edition.png::https://www.mozilla.org/media/img/structured-data/logo-firefox-developer.8aedc8028e4d.png sha256sums_amd64 = ab17cf4f447bc681649903aca837c950f62e7fee004eaaa9fc2c894f6d001891 sha256sums_amd64 = SKIP sha256sums_amd64 = SKIP source_arm64 = https://download-installer.cdn.mozilla.net/pub/devedition/releases/140.0b2/linux-aarch64/en-US/firefox-140.0b2.tar.xz + source_arm64 = firefox-developer-edition.desktop + source_arm64 = firefox-developer-edition.png::https://www.mozilla.org/media/img/structured-data/logo-firefox-developer.8aedc8028e4d.png sha256sums_arm64 = b6b38968b00781bbc144065f0294947bdcd1f23bfa641f57efb6e88f5905cb40 sha256sums_arm64 = SKIP sha256sums_arm64 = SKIP @@ -5365,13 +5369,13 @@ pkgname = imwheel-exclude-patched-git --- pkgbase = insomnia-deb gives = insomnia - pkgver = 2023.4.0 + pkgver = 11.1.0 pkgdesc = The open-source, cross-platform API client for GraphQL, REST, WebSockets and gRPC url = https://github.com/Kong/insomnia/ arch = amd64 maintainer = Diegiwg - source = https://github.com/Kong/insomnia/releases/download/core%402023.4.0/Insomnia.Core-2023.4.0.deb - sha256sums = eed91dd07689783742bd7d6dd57087aeb436df116b70cb32d67849244a7a9259 + source = https://github.com/Kong/insomnia/releases/download/core%4011.1.0/Insomnia.Core-11.1.0.deb + sha256sums = e0797a3707ca729fd326de6914485b28713ada7430bed76ec2cae421471a7418 pkgname = insomnia-deb --- @@ -9425,9 +9429,11 @@ pkgbase = ollama-bin optdepends_ubuntu = libnvidia-compute-390 | libnvidia-compute-418 | libnvidia-compute-430 | libnvidia-compute-440 | libnvidia-compute-450 | libnvidia-compute-455 | libnvidia-compute-460 | libnvidia-compute-465 | libnvidia-compute-470 | libnvidia-compute-495 | libnvidia-compute-510 | libnvidia-compute-515 | libnvidia-compute-520 | libnvidia-compute-525 | libnvidia-compute-530 | libnvidia-compute-535 | libnvidia-compute-545 | libnvidia-compute-550: required to use CUDA on NVIDIA GPU optdepends_debian = libcuda1: required to use CUDA on NVIDIA GPU source_amd64 = https://github.com/ollama/ollama/releases/download/v0.5.13/ollama-linux-amd64.tgz + source_amd64 = ollama.service sha256sums_amd64 = 30ec1cf2be608898c3b574c3805da66759406e59ad7db01a26719eaf7365c75a sha256sums_amd64 = e6893011419cf5d3073f713a130f112b61bbd1ce6f64ee9b4513c6f020f9624a source_arm64 = https://github.com/ollama/ollama/releases/download/v0.5.13/ollama-linux-arm64.tgz + source_arm64 = ollama.service sha256sums_arm64 = 8a4feee77f78e078f132c474694969e240f3d02c6d14f28d744bd59daa95332c sha256sums_arm64 = e6893011419cf5d3073f713a130f112b61bbd1ce6f64ee9b4513c6f020f9624a @@ -9932,7 +9938,7 @@ pkgbase = pacup-git pkgname = pacup-git --- pkgbase = pacup - pkgver = 3.3.11 + pkgver = 3.3.12 pkgdesc = Help maintainers update pacscripts (next-gen Perl rewrite) arch = all depends = libdata-compare-perl @@ -9948,8 +9954,8 @@ pkgbase = pacup replaces = pacup-bin replaces = pacup-git maintainer = Oren Klopfer - source = https://github.com/pacstall/pacup/archive/refs/tags/3.3.11.tar.gz - sha256sums = d9f6d5523a0aa584230cdf32675705745651fb2ae8768e8628d48c98dd151469 + source = https://github.com/pacstall/pacup/archive/refs/tags/3.3.12.tar.gz + sha256sums = 0caac4d9d5083fefae1a55fae148a4acf974ec6a7e3b07cf8912978a909393fb pkgname = pacup --- @@ -10560,8 +10566,8 @@ pkgname = protonmail-bridge-deb --- pkgbase = protonplus gives = protonplus - pkgver = 0.4.11 - pkgdesc = A simple Wine and Proton-based compatiblity tools manager for GNOME + pkgver = 0.4.31 + pkgdesc = A modern compatibility tools manager for Linux url = https://github.com/Vysp3r/ProtonPlus arch = x86_64 depends = libadwaita-1-0 @@ -10583,9 +10589,9 @@ pkgbase = protonplus incompatible = debian:bookworm incompatible = ubuntu:jammy license = GPL-3.0-or-later - maintainer = xdavius - source = protonplus-0.4.11.tar.gz::https://github.com/Vysp3r/ProtonPlus/archive/refs/tags/v0.4.11.tar.gz - sha256sums = 223c8da373a265de28591ba9269440c5cf79fa4f9168c00b99503a65982d4df1 + maintainer = Vysp3r + source = protonplus-0.4.31.tar.gz::https://github.com/Vysp3r/ProtonPlus/archive/refs/tags/v0.4.31.tar.gz + sha256sums = 1abbf8053f37b2cc765c18cb2d5b355e687d25b32bbb1bd0426749295328b357 pkgname = protonplus ---