Skip to content

Commit d42957b

Browse files
Revival8697Revival8697
authored
Merge branch 'CachyOS:master' into handheld-qt6-tools
2 parents 9b0f524 + c0f236c commit d42957b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+558
-153
lines changed

‎bash/.SRCINFO‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = bash
22
pkgdesc = The GNU Bourne Again shell
3-
pkgver = 5.3.8
3+
pkgver = 5.3.9
44
pkgrel = 2
55
url = https://www.gnu.org/software/bash/bash.html
66
install = bash.install
@@ -40,6 +40,8 @@ pkgbase = bash
4040
source = https://ftp.gnu.org/gnu/bash/bash-5.3-patches/bash53-007.sig
4141
source = https://ftp.gnu.org/gnu/bash/bash-5.3-patches/bash53-008
4242
source = https://ftp.gnu.org/gnu/bash/bash-5.3-patches/bash53-008.sig
43+
source = https://ftp.gnu.org/gnu/bash/bash-5.3-patches/bash53-009
44+
source = https://ftp.gnu.org/gnu/bash/bash-5.3-patches/bash53-009.sig
4345
validpgpkeys = 7C0135FB088AAF6C66C650B9BB5869F064EA74AB
4446
b2sums = 82d1b54322bbd1e8c2a93380f1b2888a42a1d7186e504f41cee705a0fdd41463d8f20baa1755051e1396192f8ebd089524767d933a9e0b5fb76f2588601539bb
4547
b2sums = SKIP
@@ -64,5 +66,7 @@ pkgbase = bash
6466
b2sums = SKIP
6567
b2sums = 7ebe5ac77d3697da01ad7beb88a8fdaeac3ac2fb671cc5151ce10428044b4f5fd7ea13e35c91eef1a7d6027f9053a57a27864d5f6a935d48d6cd2be6a9239233
6668
b2sums = SKIP
69+
b2sums = 09ddf6b605d409142a4107bd52c8b48a91a225d65b867b5074c8b5359d0b1012d2f50e54d1d5636b3413431cf4840d6bd34f9c84f062f3ead96eeaf912127532
70+
b2sums = SKIP
6771

6872
pkgname = bash

‎bash/PKGBUILD‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
pkgname=bash
1010
_basever=5.3
11-
_patchlevel=8
11+
_patchlevel=9
1212
pkgver=${_basever}.${_patchlevel}
1313
pkgrel=2
1414
pkgdesc='The GNU Bourne Again shell'
@@ -65,6 +65,8 @@ b2sums=('82d1b54322bbd1e8c2a93380f1b2888a42a1d7186e504f41cee705a0fdd41463d8f20ba
6565
'5939ba2b3e0dbd83ecb51b47e71f35e32e7647fad1bedf0f00b73cc279b91de977b1cae7314b87483f62cbc0888a739b39528f0ca882a26bc81cc9b9898336e3'
6666
'SKIP'
6767
'7ebe5ac77d3697da01ad7beb88a8fdaeac3ac2fb671cc5151ce10428044b4f5fd7ea13e35c91eef1a7d6027f9053a57a27864d5f6a935d48d6cd2be6a9239233'
68+
'SKIP'
69+
'09ddf6b605d409142a4107bd52c8b48a91a225d65b867b5074c8b5359d0b1012d2f50e54d1d5636b3413431cf4840d6bd34f9c84f062f3ead96eeaf912127532'
6870
'SKIP')
6971

7072
prepare() {

‎cachyos-mirrorlist/cachyos-mirrorlist‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
######################################################
66
## CDN77 (World Wide Datacenters)
77
Server = https://cdn77.cachyos.org/repo/$arch/$repo
8-
## Tebi CDN (Germany, USA, SG)
9-
Server = https://cdn-1.cachyos.org/$arch/$repo
10-
## Cloudflare R2
8+
## Rerouted to mirror
119
Server = https://cdn.cachyos.org/repo/$arch/$repo
1210
## Germany
1311
Server = https://aur.cachyos.org/repo/$arch/$repo

‎cachyos-settings/.SRCINFO‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = cachyos-settings
22
pkgdesc = CachyOS - Settings
3-
pkgver = 1.2.12
3+
pkgver = 1.3.0
44
pkgrel = 1
55
epoch = 1
66
url = https://github.com/CachyOS/CachyOS-Settings
@@ -19,9 +19,9 @@ pkgbase = cachyos-settings
1919
optdepends = lua-luv: for topmem
2020
optdepends = power-profiles-daemon: For game-performance
2121
provides = ntsync-common
22-
source = git+https://github.com/CachyOS/CachyOS-Settings.git?signed#tag=1.2.12
22+
source = git+https://github.com/CachyOS/CachyOS-Settings.git?signed#tag=1.3.0
2323
validpgpkeys = E8B9AA39F054E30E8290D492C3C4820857F654FE
2424
validpgpkeys = B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9
25-
sha256sums = 067a2866248f22395a1fa2e1549438e4ff6a2ef7d34edbe1256eff7a4cf5c5ad
25+
sha256sums = cc743db56a18dd9c8370c42242463060229e321ae07cd4c1fa80f43fa10b8d12
2626

2727
pkgname = cachyos-settings

‎cachyos-settings/PKGBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
_gitname=CachyOS-Settings
44
pkgname=cachyos-settings
5-
pkgver=1.2.12
5+
pkgver=1.3.0
66
pkgrel=1
77
epoch=1
88
groups=(cachyos)
@@ -13,7 +13,7 @@ pkgdesc='CachyOS - Settings'
1313
url="https://github.com/CachyOS/$_gitname"
1414
source=("git+$url.git?signed#tag=$pkgver")
1515
install="$pkgname.install"
16-
sha256sums=('067a2866248f22395a1fa2e1549438e4ff6a2ef7d34edbe1256eff7a4cf5c5ad')
16+
sha256sums=('cc743db56a18dd9c8370c42242463060229e321ae07cd4c1fa80f43fa10b8d12')
1717
validpgpkeys=(
1818
E8B9AA39F054E30E8290D492C3C4820857F654FE # Peter Jung <admin@ptr1337.dev>
1919
B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9 # Vladislav Nepogodin <nepogodin.vlad@gmail.com>

‎chwd/.SRCINFO‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = chwd
22
pkgdesc = CachyOS Hardware Detection Tool
3-
pkgver = 1.17.0
3+
pkgver = 1.17.1
44
pkgrel = 1
55
url = https://github.com/cachyos/chwd
66
arch = x86_64
@@ -18,8 +18,8 @@ pkgbase = chwd
1818
provides = chwd-db
1919
conflicts = chwd-db
2020
replaces = chwd-db
21-
source = chwd::git+https://github.com/cachyos/chwd.git#tag=1.17.0?signed
21+
source = chwd::git+https://github.com/cachyos/chwd.git#tag=1.17.1?signed
2222
validpgpkeys = B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9
23-
sha256sums = 93eb92c3f491eef203cf9afc658fc182d739362d032c5efaeea7d5843e4054bf
23+
sha256sums = 7887be01c8ebdfcc7d745914be73cd713377c92d2cbaa733340f4abb96440e6a
2424

2525
pkgname = chwd

‎chwd/PKGBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Contributor: Vasiliy Stelmachenok <ventureo@yandex.ru>
33

44
pkgname=chwd
5-
pkgver=1.17.0
5+
pkgver=1.17.1
66
pkgrel=1
77
pkgdesc="CachyOS Hardware Detection Tool"
88
arch=(x86_64)
@@ -15,7 +15,7 @@ replaces=('chwd-db')
1515
conflicts=('chwd-db')
1616
groups=('cachyos')
1717
source=("chwd::git+$url.git#tag=${pkgver}?signed")
18-
sha256sums=('93eb92c3f491eef203cf9afc658fc182d739362d032c5efaeea7d5843e4054bf')
18+
sha256sums=('7887be01c8ebdfcc7d745914be73cd713377c92d2cbaa733340f4abb96440e6a')
1919
validpgpkeys=(
2020
'B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9' # Vladislav Nepogodin <nepogodin.vlad@gmail.com>
2121
)

‎handheld/cachyos-handheld/.SRCINFO‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = cachyos-handheld
22
pkgdesc = CachyOS - Handheld!
3-
pkgver = 1.2.4
4-
pkgrel = 2
3+
pkgver = 1.2.5
4+
pkgrel = 1
55
url = https://github.com/CachyOS/CachyOS-Handheld
66
install = cachyos-handheld.install
77
arch = any
@@ -17,6 +17,7 @@ pkgbase = cachyos-handheld
1717
depends = curl
1818
depends = tar
1919
depends = scx-scheds
20+
depends = scx-tools
2021
depends = qt5-tools
2122
depends = gamescope-session-steam-git
2223
depends = jupiter-hw-support
@@ -29,11 +30,11 @@ pkgbase = cachyos-handheld
2930
replaces = cachyos-deckify
3031
options = !strip
3132
options = !debug
32-
source = git+https://github.com/CachyOS/CachyOS-Handheld?signed#tag=1.2.4
33+
source = git+https://github.com/CachyOS/CachyOS-Handheld?signed#tag=1.2.5
3334
source = controller-fix.patch
3435
validpgpkeys = E8B9AA39F054E30E8290D492C3C4820857F654FE
3536
validpgpkeys = B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9
36-
sha256sums = 3ddd381ad3aa4726bbed50d31976ad7e09708514efcfbbbe75359594c2ccf6f2
37+
sha256sums = 851eb160ed7dfbffc163480e5028b28c0e4d7dca9da6064307c62d685a3d373c
3738
sha256sums = 0d07ea5cb0ea0bf55abd3b5392d5ab38852638b5b306e5c247311a56a6c56763
3839

3940
pkgname = cachyos-handheld

‎handheld/cachyos-handheld/cachyos-handheld.install‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ post_install() {
7878
# echo "If you are installing this without the CachyOS Installation, please update your username in the /etc/sddm.conf.d/*"
7979
}
8080

81+
pre_upgrade() {
82+
rm -f /etc/limine-entry-tool.d/20-chwd.conf
83+
}
84+
8185
post_upgrade() {
8286
# Use scx_lavd as default scheduler
8387
scx_lavd_default

‎handheld/gamescope/.SRCINFO‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = gamescope
22
pkgdesc = SteamOS session compositing window manager
3-
pkgver = 3.16.17
3+
pkgver = 3.16.19
44
pkgrel = 2
55
url = https://github.com/ValveSoftware/gamescope
66
arch = x86_64
@@ -50,15 +50,15 @@ pkgbase = gamescope
5050
depends = xcb-util-wm
5151
depends = xorg-server-xwayland
5252
replaces = gamescope-plus
53-
source = git+https://github.com/ValveSoftware/gamescope.git#tag=3.16.17
53+
source = git+https://github.com/ValveSoftware/gamescope.git#tag=3.16.19
5454
source = git+https://gitlab.freedesktop.org/emersion/libdisplay-info.git
5555
source = git+https://gitlab.freedesktop.org/emersion/libliftoff.git
5656
source = git+https://github.com/ValveSoftware/openvr.git
5757
source = git+https://github.com/Joshua-Ashton/reshade.git
5858
source = git+https://github.com/KhronosGroup/SPIRV-Headers.git
5959
source = git+https://github.com/Joshua-Ashton/vkroots.git
6060
source = git+https://github.com/Joshua-Ashton/wlroots.git
61-
b2sums = 35d50d0a3687bc8d38cf876becc120ad0c2a319187bfd83036cca38dee033e1894f4c4a9bba68deffae2fa1d18a4ddf96ccf28385f6d420c194013933f4d4760
61+
b2sums = 3a4d281f20c3818afd2d733962307429c0411f24b619e2223007a3e8c1928530b63e99ae88ec14cd25ad0f72765153897a8ff824775662b75e82a043eeab75b6
6262
b2sums = SKIP
6363
b2sums = SKIP
6464
b2sums = SKIP

0 commit comments

Comments
 (0)