update to 4.0

2 files changed, 33 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6028c1340932..29ba1b3da71b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = ffbox
 	pkgdesc = An user-friendly ffmpeg GUI.一个多媒体转码百宝箱/一个 FFmpeg 的套壳
-	pkgver = 3.0
-	pkgrel = 6
+	pkgver = 4.0
+	pkgrel = 1
 	url = https://github.com/ttqftech/FFBox
-	arch = any
+	arch = x86_64
 	license = LicenseRef-custom
 	makedepends = gendesk
-	makedepends = yarn
+	makedepends = pnpm
 	makedepends = npm
 	makedepends = nvm
 	makedepends = git
-	depends = electron8-bin
+	depends = electron24-bin
 	depends = ffmpeg
 	conflicts = ffbox
-	source = ffbox.git::git+https://github.com/ttqftech/FFBox.git#tag=v3.0
+	source = ffbox.git::git+https://github.com/ttqftech/FFBox.git#tag=v4.0
 	source = ffbox.sh
-	sha256sums = SKIP
+	sha256sums = 99497d0fe95a663951baa9a189343222078208d90e22eeaaa4d0d0408fb6c055
 	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = ffbox
diff --git a/PKGBUILD b/PKGBUILD
index a648df4214ff..025467c9c656 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=ffbox
 _pkgname=FFBox
-pkgver=3.0
-_electronversion=8
+pkgver=4.0
+_electronversion=24
 _nodeversion=16
-pkgrel=6
+pkgrel=1
 pkgdesc="An user-friendly ffmpeg GUI.一个多媒体转码百宝箱/一个 FFmpeg 的套壳"
-arch=('any')
+arch=('x86_64')
 url="https://github.com/ttqftech/FFBox"
 license=('LicenseRef-custom')
 conflicts=("${pkgname}")
@@ -16,7 +16,7 @@ depends=(
 )
 makedepends=(
     'gendesk'
-    'yarn'
+    'pnpm'
     'npm'
     'nvm'
     'git'
@@ -25,7 +25,7 @@ source=(
     "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
     "${pkgname}.sh"
 )
-sha256sums=('SKIP'
+sha256sums=('99497d0fe95a663951baa9a189343222078208d90e22eeaaa4d0d0408fb6c055'
             'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
@@ -36,34 +36,41 @@ _ensure_local_nvm() {
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
-        -e "s|@runname@|app.asar|g" \
+        -e "s|@runname@|app|g" \
+        -e "s|@options@||g" \
         -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
     gendesk -f -n -q --categories="AudioVideo" --name="${_pkgname}" --exec="${pkgname} %U"
     cd "${srcdir}/${pkgname}.git"
     export npm_config_build_from_source=true
-    #export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    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"
-    if [ `curl ifconfig.co/country` = "China" ];then
-        echo 'registry="https://registry.npmmirror.com/"' >> .npmrc
-        echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/v"' >> .npmrc
-        echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc
+    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
-    mkdir -p "${srcdir}/.electron-gyp"
-    touch "${srcdir}/.electron-gyp/.yarnrc"
-    yarn install --no-lockfile --cache-folder "${srcdir}/.yarn_cache"
-    yarn run electron:build
+    rm -rf app release pnpm-lock.yaml
+    sed 's|"electron-builder",|"electron-builder -l dir",|g' -i package.json
+    sed "s|'../FFBoxService'|'../../ffbox/FFBoxService'|g" -i src/main/index.ts
+    pnpm install
+    pnpm add -D pkg
+    pnpm run build:everything
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}.git/dist_electron/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}.git/release/linux-"*/FFBoxService -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r "${srcdir}/${pkgname}.git/release/linux-"*/resources/app "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}.git/public/images/256.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -Dm644 "${srcdir}/${pkgname}.git/dist_electron/linux-"*/LICENSE* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/src/renderer/public/images/icon_256_transparent.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file