Update to latest version

5 files changed, 19 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85ba0725696f..43d761688dc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,21 @@
 pkgbase = fvtt-player-client
 	pkgdesc = Foundry VTT Desktop Client
-	pkgver = 1.3.1
-	pkgrel = 8
+	pkgver = 1.5.4
+	pkgrel = 1
 	url = https://github.com/theripper93/fvtt-player-client
 	arch = x86_64
 	license = MIT
 	makedepends = git
 	makedepends = yarn
 	makedepends = npm
-	makedepends = electron-builder
 	depends = electron
 	depends = nodejs
 	provides = fvtt-player-client
-	source = fvtt-player-client-1.3.1.tar.gz::https://github.com/theripper93/fvtt-player-client/archive/1.3.1.tar.gz
+	source = fvtt-player-client-1.5.4.tar.gz::https://github.com/theripper93/fvtt-player-client/archive/1.5.4.tar.gz
 	source = fvtt-desktop-client.desktop
 	source = fvtt-desktop-client
-	source = improve-button.patch
-	source = f5reload.patch
-	sha256sums = 3f867ade10d9168e6fd8fa4ef557471132e1cb49ed4ab5e13fd3433a8484603e
+	sha256sums = 412698fa201314332827ee5c7acf0c70a23d73ce5a0a137bf0223c1ce1c38298
 	sha256sums = f23835dbdc669c2915ba44c650973a00c9606912c421fc36ff72092658df8b4a
-	sha256sums = db5c0491dad5e13a153b488a7a08229d8002a82b5471d26a0c98da285ed6fd9b
-	sha256sums = 4357ab2161a20fa6db1241eea2b3b8ab2db1cf30256c2ec47a7af5385e362ed8
-	sha256sums = 2cd6fc4b88acf9fd0b143e777b6cfd3e64f4d94959154fdb158eae822d4ad28b
+	sha256sums = 91fdedeca016f05254f4b88b6cebb11f6d5961846df6579e9f28f8ea4dd67474
 
 pkgname = fvtt-player-client
diff --git a/PKGBUILD b/PKGBUILD
index c5ab45de409b..4c73ff381722 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,36 @@
 # Maintainer: OmegaRogue <omegarogue@omegavoid.codes>
 pkgname=fvtt-player-client
-pkgver=1.3.1
-pkgrel=8
+pkgver=1.5.4
+pkgrel=1
 pkgdesc='Foundry VTT Desktop Client'
 arch=('x86_64')
 url='https://github.com/theripper93/fvtt-player-client'
 license=('MIT')
 depends=('electron' 'nodejs')
-makedepends=('git' 'yarn' 'npm' 'electron-builder')
+makedepends=('git' 'yarn' 'npm')
 provides=('fvtt-player-client')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/theripper93/${pkgname}/archive/${pkgver}.tar.gz"
+source=("$pkgname-${pkgver//_/-}.tar.gz::https://github.com/theripper93/${pkgname}/archive/${pkgver}.tar.gz"
         fvtt-desktop-client.desktop
 		fvtt-desktop-client
-		improve-button.patch
-		f5reload.patch)
-sha256sums=('3f867ade10d9168e6fd8fa4ef557471132e1cb49ed4ab5e13fd3433a8484603e'
+		)
+sha256sums=('412698fa201314332827ee5c7acf0c70a23d73ce5a0a137bf0223c1ce1c38298'
             'f23835dbdc669c2915ba44c650973a00c9606912c421fc36ff72092658df8b4a'
-            'db5c0491dad5e13a153b488a7a08229d8002a82b5471d26a0c98da285ed6fd9b'
-            '4357ab2161a20fa6db1241eea2b3b8ab2db1cf30256c2ec47a7af5385e362ed8'
-            '2cd6fc4b88acf9fd0b143e777b6cfd3e64f4d94959154fdb158eae822d4ad28b')
+            '91fdedeca016f05254f4b88b6cebb11f6d5961846df6579e9f28f8ea4dd67474')
 prepare() {
-  cd "$pkgname-$pkgver"
-  patch --binary -p1 -i "$srcdir/improve-button.patch"
-  patch --binary -p1 -i "$srcdir/f5reload.patch"
+  cd "${pkgname}-${pkgver//_/-}"
   yarn install
 }
 
 build() {
-  cd "$pkgname-$pkgver"
-  electron-builder --linux --x64 --dir $dist -c.electronDist=/usr/lib/electron -c.electronVersion=$(cat /usr/lib/electron/version)
+  cd "${pkgname}-${pkgver//_/-}"
+  yarn version --no-git-tag-version --new-version ${pkgver//_/-}
+  yarn run electron-forge make --platform linux --targets '@electron-forge/maker-zip'
 }
 package() {
   install -Dm644 -t "$pkgdir/usr/share/applications" fvtt-desktop-client.desktop
   install -Dm755 -t "$pkgdir/usr/bin" fvtt-desktop-client
-  cd "$pkgname-$pkgver"
+  cd "${pkgname}-${pkgver//_/-}"
   install -dm755 "$pkgdir/usr/lib/fvtt-desktop-client"
 
-  cp -rt "$pkgdir/usr/lib/fvtt-desktop-client" dist/linux-unpacked/*
+  cp -rt "$pkgdir/usr/lib/fvtt-desktop-client" out/vtt-desktop-client-linux-x64/*
 }
diff --git a/f5reload.patch b/f5reload.patch
deleted file mode 100644
index 6573789faef2..000000000000
--- a/f5reload.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/main.js b/main.js
-index 22e514a..7b84f69 100644
---- a/main.js
-+++ b/main.js
-@@ -37,6 +37,12 @@ app.whenReady().then(() => {
-         if (input.key === 'F12') {

-             win.webContents.toggleDevTools();

-           event.preventDefault();

-+        } else  if (input.key === 'F5') {

-+            win.webContents.reload()

-+            event.preventDefault();

-+        } else  if (input.key === 'F5' && input.control) {

-+            win.webContents.reloadIgnoringCache()

-+            event.preventDefault();

-         }

-     });

-     win.webContents.on("did-finish-load", () => {

diff --git a/fvtt-desktop-client b/fvtt-desktop-client
index ed72828fa3f6..40b3c464608d 100644
--- a/fvtt-desktop-client
+++ b/fvtt-desktop-client
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/fvtt-desktop-client/vtt-desktop-client "$@"
+/usr/lib/fvtt-desktop-client/vtt-desktop-client --password-store="gnome" "$@"
diff --git a/improve-button.patch b/improve-button.patch
deleted file mode 100644
index 4f61dcad3ec5..000000000000
--- a/improve-button.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/renderer.js b/renderer.js

-index 7e222fd..c45f689 100644

---- a/renderer.js

-+++ b/renderer.js

-@@ -30,13 +30,11 @@ async function createGameList() {

-     gameListJson.forEach((game) => {

-         const li = document.createElement("li");

-         li.classList.add("game-item");

--        li.innerHTML = `<div class="game-title-bar"><a>${game.name}</a> <button data-game-id="${game.id}" class="configure-game"><i class="fa-solid fa-gear"></i></button><div>`;

--        li.querySelector("a").onmousedown = (e) => {

--            if (e.button === 0) {

--                window.api.send("open-game", game.id ?? game.name);

--                window.location.href = game.url;

--            }

--        };

-+  li.innerHTML = `<div class="game-title-bar"><button class="game-button"><a>${game.name}</a></button> <button data-game-id="${game.id}" class="configure-game"><i class="fa-solid fa-gear"/></button></div>`;

-+        li.querySelector(".game-button").addEventListener("click", (e) => {

-+            window.api.send("open-game", game.id ?? game.name);

-+            window.location.href = game.url;

-+        });

-         ul.appendChild(li);

-         li.querySelector(".configure-game").addEventListener("click", (e) => {

-             e.target.closest(".game-item").querySelector(".user-configuration").classList.toggle("hidden");

-diff --git a/style.css b/style.css

-index e9c941c..eaf9d66 100644

---- a/style.css

-+++ b/style.css

-@@ -91,7 +91,6 @@ button:hover {

-     justify-content: center;

-     align-items: center;

-     margin: 0.5rem 0;

--    padding: 0.5rem;

-     background-color: transparent;

-     border: 2px solid var(--color-text-primary);

-     color: var(--color-text-primary);

-@@ -127,6 +126,18 @@ button:hover {

-     transition: all 0.3s ease-in-out;

- }

- 

-+.game-button {

-+    cursor: pointer;

-+    flex-grow: 1;

-+    text-align: left;

-+    border: none;

-+    padding: 0.5rem;

-+    margin: 0;

-+}

-+.game-button:hover {

-+    border: none;

-+}

-+

- .game-title-bar{

-     display: flex;

-     width: 100%;

-@@ -140,8 +151,7 @@ button:hover {

-     font-size: 1rem;

-     font-weight: 700;

-     padding: 0.2rem;

--    margin: 0;

--    margin-left: auto;

-+    margin: 0 0.5rem 0 auto;

-     transition: all 0.3s ease-in-out;

-     cursor: pointer;

- }