Updated to 3.0.1

2 files changed, 46 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0afc0f1bd353..64e4811014ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Thomas McGrew <tjmcgrew@gmail.com>
 pkgname=dwrandomizer
-pkgver=3.0
+pkgver=3.0.1
 pkgrel=1
 epoch=
 pkgdesc="A Randomizer for Dragon Warrior for NES"
@@ -8,21 +8,18 @@ arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="http://dwrandomizer.com"
 license=('MIT')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/mcgrew/dwrandomizer/archive/$pkgver.tar.gz" "patch.diff")
-sha256sums=('38667f5b6a919cc374c5dc797c432693ae9e9cde0609598907a99a65e867c7f4'
-            '43e3fd5030229360217ce57bdab608c2a414ed3126b9da7082643a70dacf3275')
+sha256sums=('6b100cc6fe7877e7c4d2961ed9743eded1a7021aea8a1d616f2ba47a04031c70'
+            '32e5b51493fee5a8e0791c5e654753743b3f35b0549dad29c824471dddabd273')
 depends=('electron')
 makedepends=('emscripten' 'ed')
 
 prepare() {
     cd "$pkgname-$pkgver"
     mkdir build cli-build
+    patch -p1 < ../patch.diff
 }
 
 build() {
-#     cd "$srcdir/$pkgname-$pkgver"
-#     mv CMakeLists.txt tmp
-#     echo 'set (CMAKE_EXE_LINKER_FLAGS -Wl -O1 -z relro -z now)' > CMakeLists.txt
-#     cat tmp >> CMakeLists.txt
     cd "$srcdir/$pkgname-$pkgver/build"
     CFLAGS="${CFLAGS} -fno-stack-protector" LDFLAGS="-Wl,-O1,-z,relro,-z,now" cmake -DRELEASE=1 -DCMAKE_TOOLCHAIN_FILE=/usr/lib/emscripten/cmake/Modules/Platform/Emscripten.cmake ..
     make
@@ -34,8 +31,6 @@ build() {
 package() {
     mkdir -p $pkgdir/usr/share/dwrandomizer
     mkdir -p $pkgdir/usr/bin/
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -p1 < ../patch.diff
     cd "$srcdir/$pkgname-$pkgver/electron"
     cp -Lr * $pkgdir/usr/share/dwrandomizer
     echo -e '#!/bin/sh\n\nelectron /usr/share/dwrandomizer' > $pkgdir/usr/bin/dwrandomizer
diff --git a/patch.diff b/patch.diff
index 971f92f60280..6699563d846c 100644
--- a/patch.diff
+++ b/patch.diff
@@ -1,25 +1,44 @@
-diff --git a/electron/main.js b/electron/main.js
-index b81d974..6132e29 100644
---- a/electron/main.js
-+++ b/electron/main.js
-@@ -1,7 +1,6 @@
- // Modules to control application life and create native browser window
- const {app, BrowserWindow, Menu} = require('electron')
- const path = require('path')
--require('@electron/remote/main').initialize()
+diff --git a/webui/index.css b/webui/index.css
+index c01e9e8..bebf340 100644
+--- a/webui/index.css
++++ b/webui/index.css
+@@ -70,6 +70,10 @@ input[type=number] {
+   -moz-appearance: textfield;
+ }
+ 
++.modal {
++    background-color: #fff;
++}
++
+ .invalid {
+     border-color: red;
+ }
+@@ -113,4 +117,8 @@ div.description {
+         color: #888;
+     }
  
- function createWindow () {
-     // Create the browser window.
-diff --git a/electron/package.json b/electron/package.json
-index 21097e0..82b0c0a 100644
---- a/electron/package.json
-+++ b/electron/package.json
-@@ -44,8 +44,5 @@
-   "devDependencies": {
-     "electron": "^15.3.0",
-     "electron-builder": "^22.11.7"
--  },
--  "dependencies": {
--    "@electron/remote": "^2.0.1"
-   }
++    .modal {
++        background-color: #333;
++    }
++
  }
+diff --git a/webui/modal.js b/webui/modal.js
+index ac87b3c..796c532 100644
+--- a/webui/modal.js
++++ b/webui/modal.js
+@@ -33,7 +33,6 @@ class Modal {
+             'outline': '1px solid black',
+             'font-weight': 'bold',
+             'text-align': 'center',
+-            'background-color': 'white',
+             'margin': 'auto',
+             'position': 'relative',
+             'margin-top': dialogOffset + 'px',
+@@ -41,6 +40,7 @@ class Modal {
+             'height': height + 'px',
+             'z-index': '3'
+         });
++        this.dialog.classList.add('modal');
+         this.main.prepend(this.dialog);
+         if (title) {
+             let heading = this.create('h3', title);