1 files changed, 46 insertions, 45 deletions
diff --git a/PKGBUILD b/PKGBUILD
index c5c57ba7c7b5..925d108474d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: zneix <zneix@zneix.eu>
 
 pkgname="chatterino2-7tv-git"
-pkgver=7.5.2.r93.gcd8116f
+pkgver=7.5.3.r86.g28721ab
 pkgrel=1
 pkgdesc='A fork of Chatterino2 with built-in support for 7tv emotes'
 url="https://github.com/SevenTV/chatterino7"
@@ -43,56 +43,48 @@ _source_main() {
 
 _source_chatterino7() {
   local _sources_add=(
-    #'arsenm.sanitizers-cmake'::'git+https://github.com/arsenm/sanitizers-cmake.git'
-    'chatterino.certify'::'git+https://github.com/Chatterino/certify.git'
-    #'chatterino.crash-handler'::'git+https://github.com/Chatterino/crash-handler.git'
-    'chatterino.libcommuni'::'git+https://github.com/Chatterino/libcommuni.git'
-    'chatterino.websocketpp'::'git+https://github.com/Chatterino/websocketpp.git'
-    #'frankosterfeld.qtkeychain'::'git+https://github.com/frankosterfeld/qtkeychain.git'
-    #'google.googletest'::'git+https://github.com/google/googletest.git'
-    'kde.kimageformats'::'git+https://github.com/KDE/kimageformats.git'
-    #'lua'::'git+https://github.com/lua/lua.git'
-    'mackron.miniaudio'::'git+https://github.com/mackron/miniaudio.git'
-    #'martinmoene.expected-lite'::'git+https://github.com/martinmoene/expected-lite.git'
-    #'mohabouje.wintoast'::'git+https://github.com/mohabouje/WinToast.git'
-    'neargye.magic_enum'::'git+https://github.com/Neargye/magic_enum.git'
-    'pajlada.serialize'::'git+https://github.com/pajlada/serialize.git'
-    'pajlada.settings'::'git+https://github.com/pajlada/settings.git'
-    'pajlada.signals'::'git+https://github.com/pajlada/signals.git'
-    #'tencent.rapidjson'::'git+https://github.com/Tencent/rapidjson.git'
-    #'thephd.sol2'::'git+https://github.com/ThePhD/sol2.git'
+    #'arsenm.sanitizers-cmake'::'git+https://github.com/arsenm/sanitizers-cmake.git'::'cmake/sanitizers-cmake'
+    'chatterino.certify'::'git+https://github.com/Chatterino/certify.git'::'lib/certify'
+    #'chatterino.crash-handler'::'git+https://github.com/Chatterino/crash-handler.git'::'tools/crash-handler'
+    'chatterino.libcommuni'::'git+https://github.com/Chatterino/libcommuni.git'::'lib/libcommuni'
+    'chatterino.websocketpp'::'git+https://github.com/Chatterino/websocketpp.git'::'lib/websocketpp'
+    'fmtlib.fmt'::'git+https://github.com/fmtlib/fmt.git'::'lib/twitch-eventsub-ws/lib/fmt'
+    #'frankosterfeld.qtkeychain'::'git+https://github.com/frankosterfeld/qtkeychain.git'::'lib/qtkeychain'
+    #'google.googletest'::'git+https://github.com/google/googletest.git'::'lib/googletest'
+    'howardhinnant.date'::'git+https://github.com/HowardHinnant/date.git'::'lib/twitch-eventsub-ws/lib/date'
+    'kde.kimageformats'::'git+https://github.com/KDE/kimageformats.git'::'lib/kimageformats'
+    'lua'::'git+https://github.com/lua/lua.git'::'lib/lua/src'
+    'mackron.miniaudio'::'git+https://github.com/mackron/miniaudio.git'::'lib/miniaudio'
+    #'martinmoene.expected-lite'::'git+https://github.com/martinmoene/expected-lite.git'::'lib/expected-lite'
+    #'mohabouje.wintoast'::'git+https://github.com/mohabouje/WinToast.git'::'lib/WinToast'
+    'neargye.magic_enum'::'git+https://github.com/Neargye/magic_enum.git'::'lib/magic_enum'
+    'pajlada.serialize'::'git+https://github.com/pajlada/serialize.git'::'lib/serialize'
+    'pajlada.settings'::'git+https://github.com/pajlada/settings.git'::'lib/settings'
+    'pajlada.signals'::'git+https://github.com/pajlada/signals.git'::'lib/signals'
+    #'tencent.rapidjson'::'git+https://github.com/Tencent/rapidjson.git'::'lib/rapidjson'
+    'thephd.sol2'::'git+https://github.com/ThePhD/sol2.git'::'lib/sol2'
   )
 
-  local _p
+  local _p _idx _src _sm_prep _sm_func
   for _p in ${_sources_add[@]}; do
-    source+=("$_p")
+    _idx="${_p%%::*}"
+    _sm_prep+=("${_idx}::${_p##*::}")
+    _src="${_p%::*}"
+    source+=("$_src")
     sha256sums+=('SKIP')
   done
 
-  _prepare_chatterino7() (
-    cd "$srcdir/$_pkgsrc"
-    local _submodules=(
-      #'arsenm.sanitizers-cmake'::'cmake/sanitizers-cmake'
-      'chatterino.certify'::'lib/certify'
-      #'chatterino.crash-handler'::'tools/crash-handler'
-      'chatterino.libcommuni'::'lib/libcommuni'
-      'chatterino.websocketpp'::'lib/websocketpp'
-      #'frankosterfeld.qtkeychain'::'lib/qtkeychain'
-      #'google.googletest'::'lib/googletest'
-      'kde.kimageformats'::'lib/kimageformats'
-      #'lua'::'lib/lua/src'
-      'mackron.miniaudio'::'lib/miniaudio'
-      #'martinmoene.expected-lite'::'lib/expected-lite'
-      #'mohabouje.wintoast'::'lib/WinToast'
-      'neargye.magic_enum'::'lib/magic_enum'
-      'pajlada.serialize'::'lib/serialize'
-      'pajlada.settings'::'lib/settings'
-      'pajlada.signals'::'lib/signals'
-      #'tencent.rapidjson'::'lib/rapidjson'
-      #'thephd.sol2'::'lib/sol2'
-    )
-    _submodule_update
+  _sm_func=$(
+    cat << END
+      _prepare_chatterino7() (
+        cd "\$srcdir/\$_pkgsrc"
+        local _submodules=(${_sm_prep[@]})
+        _submodule_update
+      )
+END
   )
+
+  eval "$_sm_func"
 }
 
 _source_main
@@ -102,12 +94,15 @@ prepare() {
   _submodule_update() {
     local _module
     for _module in "${_submodules[@]}"; do
+      pwd
+      echo $_module
       git submodule init "${_module##*::}"
       git submodule set-url "${_module##*::}" "$srcdir/${_module%%::*}"
       git -c protocol.file.allow=always submodule update "${_module##*::}"
     done
   }
-  _prepare_chatterino7
+
+  _run_if_exists _prepare_chatterino7
 }
 
 pkgver() {
@@ -147,3 +142,9 @@ package() {
 
   install -Dm644 "$_pkgsrc/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
+
+_run_if_exists() {
+  if declare -F "$1" > /dev/null; then
+    eval "$1"
+  fi
+}