upgpkg: firecamp 1.4.4-1

upstream release

update

4 files changed, 38 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a753efc32b9b..f67779359769 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = firecamp
 	pkgdesc = firecamp, A campsite for developers.
-	pkgver = 1.2.5
+	pkgver = 1.4.4
 	pkgrel = 1
 	url = https://firecamp.app/
 	arch = x86_64
 	license = unknown
 	makedepends = p7zip
 	makedepends = asar
-	depends = electron
+	depends = electron8
 	provides = firecamp
 	options = !strip
-	source = firecamp-1.2.5.orig.appimage::https://firecamp.ams3.digitaloceanspaces.com/versions/linux/Firecamp-1.2.5.AppImage
-	source = runner.patch
-	sha256sums = 13bb9878a787afd0ba3391c0160dab7d9af5124d7691924090e9142451c15ac3
-	sha256sums = f22a12c6b3ee55161ac9e8debadba48263fad338c13b6700d06261c2346426dd
+	source = firecamp-1.4.4.orig.appimage::https://firecamp.ams3.digitaloceanspaces.com/versions/linux/Firecamp-1.4.4.AppImage
+	source = path.patch
+	sha256sums = 240c94d2b5242e39ffb27287abc9c9ba7456a204036db9dd46f97f5d47b277cd
+	sha256sums = SKIP
 
 pkgname = firecamp
 
diff --git a/PKGBUILD b/PKGBUILD
index b2523de566dd..1148dad24b2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,36 @@
 # Maintainer: Bruce Zhang
 pkgname=firecamp
-pkgver=1.2.5
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="firecamp, A campsite for developers."
 arch=('x86_64')
 url="https://firecamp.app/"
 license=('unknown')
-depends=('electron')
+depends=('electron8')
 makedepends=('p7zip' 'asar')
 provides=('firecamp')
 options=('!strip')
 source=(
     "$pkgname-$pkgver.orig.appimage::https://firecamp.ams3.digitaloceanspaces.com/versions/linux/Firecamp-$pkgver.AppImage"
-    'runner.patch'
+	"path.patch"
 )
-sha256sums=('13bb9878a787afd0ba3391c0160dab7d9af5124d7691924090e9142451c15ac3'
-            'f22a12c6b3ee55161ac9e8debadba48263fad338c13b6700d06261c2346426dd')
+sha256sums=('240c94d2b5242e39ffb27287abc9c9ba7456a204036db9dd46f97f5d47b277cd' 'SKIP')
 
 prepare() {
 	cd "$srcdir"
 	7z x "$pkgname-$pkgver.orig.appimage" -ofirecamp
 	cd firecamp/resources
 	asar e app.asar app
-	patch -u app/electron.js -i "$srcdir/runner.patch"
+	patch -s -p0 < "$srcdir/path.patch"
 	echo "#!/usr/bin/env sh
 export ELECTRON_IS_DEV=0
-exec electron /usr/share/firecamp/app \$@ --no-sandbox" > "$srcdir/firecamp.sh"
+exec electron8 /usr/share/firecamp/app \$@ --no-sandbox" > "$srcdir/firecamp.sh"
 }
 
 package() {
 	cd "$srcdir/firecamp/resources"
 	mkdir -p "$pkgdir/usr/share/firecamp"
 	cp -r app "$pkgdir/usr/share/firecamp/app"
+	cp -r "$srcdir/firecamp/resources/node_modules/google-protobuf" "$pkgdir/usr/share/firecamp/app/node_modules"
 	install -Dm755 "$srcdir/firecamp.sh" "$pkgdir/usr/bin/firecamp"
 }
diff --git a/path.patch b/path.patch
new file mode 100644
index 000000000000..4221a96aea13
--- /dev/null
+++ b/path.patch
@@ -0,0 +1,25 @@
+diff -ruN app/services/icon-path/index.js app_new/services/icon-path/index.js
+--- app/services/icon-path/index.js	2020-12-04 16:57:28.158203215 +0800
++++ app_new/services/icon-path/index.js	2020-12-04 17:05:31.062678085 +0800
+@@ -22,7 +22,7 @@
+ } else {
+   if (process.platform === "linux")
+     trayIcon = path.join(
+-      process.resourcesPath,
+-      "assets/icons/images/22x22.png"
++      "/usr/share/firecamp/app",
++      "assets/icons/png/24x24.png"
+     );
+   else if (process.platform === "darwin")
+diff -ruN app/services/protobuf/index.js app_new/services/protobuf/index.js
+--- app/services/protobuf/index.js	2020-12-04 17:02:45.669701138 +0800
++++ app_new/services/protobuf/index.js	2020-12-04 17:03:38.614007488 +0800
+@@ -384,7 +384,7 @@
+   }
+
+   init() {
+-    this.loadModule();
++    // this.loadModule();
+     this.compileSchema();
+     this.fetchInputObject();
+     this.encodePayload();
diff --git a/runner.patch b/runner.patch
deleted file mode 100644
index ce101d348393..000000000000
--- a/runner.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- app/electron.js	2019-09-18 13:47:21.474838132 +0800
-+++ app-new/electron.js	2019-09-18 13:45:04.000000000 +0800
-@@ -69,39 +69,39 @@
- //   token: "b9905f2b8cdfa2ba1a4aa7c951febaa7dda60ff4"
- // });
- 
--if (process.env.NODE_ENV === "development") {
-+// if (process.env.NODE_ENV === "development") {
-   if (process.platform === "linux")
-     trayIcon = path.join(
-       __dirname,
--      "desktop/electron/assets/icons/images/22x22.png"
-+      "electron/assets/icons/png/32x32.png"
-     );
-   else if (process.platform === "darwin")
-     trayIcon = path.join(
-       __dirname,
--      "desktop/electron/assets/icons/images/22x22.png"
-+      "electron/assets/icons/png/32x32.png"
-     );
-   else if (process.platform === "win32")
-     trayIcon = path.join(
-       __dirname,
--      "desktop/electron/assets/icons/images/32x32.png"
-+      "electron/assets/icons/png/32x32.png"
-     );
--} else if (process.env.NODE_ENV === "production") {
--  if (process.platform === "linux")
--    trayIcon = path.join(
--      process.resourcesPath,
--      "electron/assets/icons/images/22x22.png"
--    );
--  else if (process.platform === "darwin")
--    trayIcon = path.join(
--      process.resourcesPath,
--      "electron/assets/icons/images/22x22.png"
--    );
--  else if (process.platform === "win32")
--    trayIcon = path.join(
--      process.resourcesPath,
--      "electron/assets/icons/images/32x32.png"
--    );
--}
-+// } else if (process.env.NODE_ENV === "production") {
-+//   if (process.platform === "linux")
-+//     trayIcon = path.join(
-+//       process.resourcesPath,
-+//       "electron/assets/icons/images/22x22.png"
-+//     );
-+//   else if (process.platform === "darwin")
-+//     trayIcon = path.join(
-+//       process.resourcesPath,
-+//       "electron/assets/icons/images/22x22.png"
-+//     );
-+//   else if (process.platform === "win32")
-+//     trayIcon = path.join(
-+//       process.resourcesPath,
-+//       "electron/assets/icons/images/32x32.png"
-+//     );
-+// }
- 
- if (process.platform === "linux")
-   appIcon =