diff options
| author | Rasmus Karlsson | 2023-10-03 18:43:21 +0200 |
|---|---|---|
| committer | Rasmus Karlsson | 2023-10-03 18:43:21 +0200 |
| commit | 7933ca455f218b32c2abab1e8d2e72131509115b (patch) | |
| tree | 3d495baae533d4d44180683a939a85cd15d6005d | |
| parent | 11406cd2600ca9a6de80472adb7f3d22a2e59947 (diff) | |
| download | aur-7933ca455f218b32c2abab1e8d2e72131509115b.tar.gz | |
Update Chatterino to remove the need for a qt6 qtkeychain patch
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-qt6-qtkeychain.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
3 files changed, 4 insertions, 22 deletions
@@ -1,6 +1,6 @@ pkgbase = chatterino2-git pkgdesc = Second installment of the Twitch chat client series "Chatterino", dev/git version - pkgver = 2.4.5.r39.g783c753 + pkgver = 2.4.5.r50.g38a7ce6 pkgrel = 1 url = https://chatterino.com install = chatterino2-git.install @@ -32,7 +32,6 @@ pkgbase = chatterino2-git source = git+https://github.com/zaphoyd/websocketpp source = git+https://github.com/Neargye/magic_enum source = git+https://github.com/mackron/miniaudio - source = 0001-qt6-qtkeychain.patch md5sums = SKIP md5sums = SKIP md5sums = SKIP @@ -44,6 +43,5 @@ pkgbase = chatterino2-git md5sums = SKIP md5sums = SKIP md5sums = SKIP - md5sums = 28d74ad28f928e6c1aaab34d4bbda4a1 pkgname = chatterino2-git diff --git a/0001-qt6-qtkeychain.patch b/0001-qt6-qtkeychain.patch deleted file mode 100644 index 6194a2fd5783..000000000000 --- a/0001-qt6-qtkeychain.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/common/Credentials.cpp b/src/common/Credentials.cpp -index d3bb5ebbd..680f290c5 100644 ---- a/src/common/Credentials.cpp -+++ b/src/common/Credentials.cpp -@@ -11,7 +11,7 @@ - - #ifndef NO_QTKEYCHAIN - # ifdef CMAKE_BUILD --# include "qt5keychain/keychain.h" -+# include "qt6keychain/keychain.h" - # else - # include "keychain.h" - # endif @@ -1,7 +1,7 @@ # Maintainer: Ckat <ckat@teknik.io> pkgname=chatterino2-git _pkgname=chatterino2 -pkgver=2.4.5.r39.g783c753 +pkgver=2.4.5.r50.g38a7ce6 pkgrel=1 pkgdesc='Second installment of the Twitch chat client series "Chatterino", dev/git version' arch=('any') @@ -24,8 +24,7 @@ source=("git+https://github.com/Chatterino/chatterino2" "git+https://github.com/Tencent/rapidjson" "git+https://github.com/zaphoyd/websocketpp" "git+https://github.com/Neargye/magic_enum" - "git+https://github.com/mackron/miniaudio" - "0001-qt6-qtkeychain.patch") + "git+https://github.com/mackron/miniaudio") md5sums=('SKIP' 'SKIP' 'SKIP' @@ -36,8 +35,7 @@ md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - '28d74ad28f928e6c1aaab34d4bbda4a1') + 'SKIP') pkgver() { cd "$srcdir/chatterino2" @@ -60,7 +58,6 @@ prepare () { git config submodule.lib/miniaudio.url "$srcdir/miniaudio" git config submodule.lib/magicenum.url "$srcdir/magicenum" git -c protocol.file.allow=always submodule update - patch --forward --strip=1 --input="${srcdir}/0001-qt6-qtkeychain.patch" } build() { |