update to 5.0.3.r0.g6e42663

3 files changed, 103 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 640d676e9d5f..2f23b5a3a499 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,23 @@
 pkgbase = miru-git
-	pkgdesc = Bittorrent streaming software for cats
-	pkgver = 4.2.7
+	pkgdesc = Bittorrent streaming software for cats. Stream anime torrents, real-time with no waiting for downloads.
+	pkgver = 5.0.3.r0.g6e42663
 	pkgrel = 1
-	url = https://github.com/ThaUnknown/miru
+	url = https://miru.watch/
 	arch = any
-	license = GPL-3.0
-	depends = xdg-utils
-	depends = pnpm
-	conflicts = miru-bin
-	source = git+https://github.com/ThaUnknown/miru
+	license = GPL-3.0-only
+	makedepends = npm
+	makedepends = pnpm
+	makedepends = git
+	makedepends = nvm
+	makedepends = gendesk
+	makedepends = base-devel
+	makedepends = gcc
+	depends = electron29
+	provides = miru=5.0.3
+	conflicts = miru
+	source = miru.git::git+https://github.com/ThaUnknown/miru.git
+	source = miru.sh
 	sha256sums = SKIP
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = miru-git
diff --git a/PKGBUILD b/PKGBUILD
index 6805872d20b7..9a8b65ed2646 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,81 @@
-# Maintainer: kyngs <aurmail at kyngs dot xyz>
+# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
+# Contributor: kyngs <aurmail at kyngs dot xyz>
 pkgname=miru-git
+pkgver=5.0.3.r0.g6e42663
+_electronversion=29
+_nodeversion=16
 pkgrel=1
-pkgver=4.2.7
-pkgdesc="Bittorrent streaming software for cats"
+pkgdesc="Bittorrent streaming software for cats. Stream anime torrents, real-time with no waiting for downloads."
 arch=("any")
-url="https://github.com/ThaUnknown/miru"
-license=("GPL-3.0")
-depends=("xdg-utils" "pnpm")
-source=(
-    "git+${url}"
+url="https://miru.watch/"
+_ghurl="https://github.com/ThaUnknown/miru"
+license=("GPL-3.0-only")
+conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}=${pkgver%.r*}")
+depends=(
+    "electron${_electronversion}"
 )
-sha256sums=(
-    "SKIP"
+makedepends=(
+    'npm'
+    'pnpm'
+    'git'
+    'nvm'
+    'gendesk'
+    'base-devel'
+    'gcc'
 )
-conflicts=("miru-bin")
-
+source=(
+    "${pkgname//-/.}::git+${_ghurl}.git"
+    "${pkgname%-git}.sh")
+sha256sums=('SKIP'
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 pkgver() {
-  git -C "miru" describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^version_//' | sed 's/v//g'
+    cd "${srcdir}/${pkgname//-/.}"
+    git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+}
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
 }
-
 build() {
-    cd "miru"
-    rm -rf node_modules # In case of an existing src/ dir, keeping old node modules could break things
-    pnpm install
-    echo "**Webpack takes a long time (even up to ten minutes) to build, while providing no console output. Do not cancel the build unless it takes more than ten minutes.**"
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-git}|g" \
+        -e "s|@runname@|app.asar|g" \
+        -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
+        -i "${srcdir}/${pkgname%-git}.sh"
+    _ensure_local_nvm
+    gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U"
+    cd "${srcdir}/${pkgname//-/.}"
+    export npm_config_build_from_source=true
+    #export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
+    export ELECTRONVERSION="${_electronversion}"
+    export npm_config_disturl=https://electronjs.org/headers
+    HOME="${srcdir}/.electron-gyp"
+    pnpm config set store-dir "${srcdir}/.pnpm_store"
+    pnpm config set cache-dir "${srcdir}/.pnpm_cache"
+    pnpm config set link-workspace-packages true
+    if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then
+        export npm_config_registry=https://registry.npmmirror.com
+        export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/
+        export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/
+    else
+        echo "Your network is OK."
+    fi
+    cd "${srcdir}/${pkgname//-/.}/electron"
+    rm -rf dist node_modules
+    sed 's|electron-builder",|electron-builder -l --dir",|g;/aa910d571134/d;/2ffc48f0b43f/d;s|"version": "29.1.4",|"version": "29.1.4"|g' -i package.json
+    pnpm install --frozen-lockfile
     pnpm run build
 }
-
 package() {
-    cd "miru/dist"
-    debs=(*.deb)
-    ar vx "${debs[0]}"
-
-    tar -xJ -f data.tar.xz -C "${pkgdir}"
-    install -D -m644 "${pkgdir}/opt/Miru/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
+    install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/electron/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}"
+    cp -r "${srcdir}/${pkgname//-/.}/electron/dist/linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname%-git}"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/electron/buildResources/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
+    install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/${pkgname//-/.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/miru.sh b/miru.sh
new file mode 100644
index 000000000000..7ddcaab8d734
--- /dev/null
+++ b/miru.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+_APPDIR="/usr/lib/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
+export NODE_ENV=production
+cd "${_APPDIR}"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+else
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file