upgpkg: keeweb 1.7.2

Signed-off-by: surefire <surefire@cryptomile.net>

5 files changed, 45 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8074ffc38f14..c17ab6512a94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,24 @@
 pkgbase = keeweb
 	pkgdesc = Desktop password manager compatible with KeePass databases.
-	pkgver = 1.6.3
-	pkgrel = 6
+	pkgver = 1.7.2
+	pkgrel = 1
 	url = https://github.com/keeweb/keeweb
 	arch = any
 	license = MIT
 	makedepends = asar
 	makedepends = npm
 	makedepends = libsass
-	depends = electron2
+	depends = electron
 	optdepends = xdotool: for auto-type
 	conflicts = keeweb-desktop
-	source = https://github.com/keeweb/keeweb/archive/v1.6.3.tar.gz
+	source = https://github.com/keeweb/keeweb/archive/v1.7.2.tar.gz
+	source = hide-menubar.patch
 	source = keeweb.sh
 	source = package.json.patch.js
-	sha1sums = 75c054b23aa4f0f6fd067174623549f65ebe740a
-	sha1sums = a8d1efc9faf9c9f38d1499ff3eda4e219c394eef
-	sha1sums = ad73331a8a701e83a77ab9aaf6a56dc5b768b678
+	sha1sums = 2526922e7f872cb17a775321b55788d1c5d48854
+	sha1sums = a55c2ed276c6073b7954452cdc88209633d51ace
+	sha1sums = a2ab033d06abfe7616d2615d8edf7931f29efc96
+	sha1sums = 6fef823604bfeac45bc6aa830c1f129c15a80fcf
 
 pkgname = keeweb
 
diff --git a/PKGBUILD b/PKGBUILD
index 9df53619a3a6..4d1ca9f4f7e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: surefire@cryptomile.net
 
 pkgname=keeweb
-pkgver=1.6.3
-pkgrel=6
+pkgver=1.7.2
+pkgrel=1
 pkgdesc="Desktop password manager compatible with KeePass databases."
 arch=('any')
 url="https://github.com/keeweb/keeweb"
 license=('MIT')
-depends=('electron2')
+depends=('electron')
 makedepends=(
 	'asar'
 	'npm'
@@ -17,41 +17,36 @@ optdepends=('xdotool: for auto-type')
 conflicts=('keeweb-desktop')
 source=(
 	"https://github.com/keeweb/keeweb/archive/v${pkgver}.tar.gz"
+	'hide-menubar.patch'
 	'keeweb.sh'
 	'package.json.patch.js'
 )
 
-sha1sums=('75c054b23aa4f0f6fd067174623549f65ebe740a'
-          'a8d1efc9faf9c9f38d1499ff3eda4e219c394eef'
-          'ad73331a8a701e83a77ab9aaf6a56dc5b768b678')
+sha1sums=('2526922e7f872cb17a775321b55788d1c5d48854'
+          'a55c2ed276c6073b7954452cdc88209633d51ace'
+          'a2ab033d06abfe7616d2615d8edf7931f29efc96'
+          '6fef823604bfeac45bc6aa830c1f129c15a80fcf')
 
 prepare() {
 	cd "${pkgname}-${pkgver}"
 
+	patch -Np1 -i ../hide-menubar.patch
+
 	# remove extra dependencies
 	node ../package.json.patch.js
 
 	sed -i \
-		-e "/electronVersion/           d" \
-		-e "/loader: 'babel-loader'/,+2 d" \
-		-e "/loader: 'uglify-loader'/   d" \
-		-e "/'eslint',/                 d" \
-		-e "/'uglify',/                 d" \
+		-e "/const electronVersion/       s/pkg.dependencies.electron/'$(</usr/lib/electron/version)'/" \
 	Gruntfile.js
 
-	# hide electron menu
 	sed -i \
-		-e '/mainWindow = new electron\.BrowserWindow({$/ a \        autoHideMenuBar: true,' \
-	desktop/app.js
+		-e "/'eslint',/                 d" \
+		-e "/'uglify',/                 d" \
+	grunt.tasks.js
 
 	sed -i \
 		-e '/Exec=/ c \Exec=keeweb %u' \
 	package/deb/usr/share/applications/keeweb.desktop
-
-	# downgrade broken bower package https://github.com/eligrey/FileSaver.js/issues/409
-	sed -i \
-		-e '/FileSaver.js/ s|eligrey/FileSaver.js|\0#1.3.4|' \
-	bower.json
 }
 
 build() {
@@ -60,8 +55,11 @@ build() {
 	export SKIP_SASS_BINARY_DOWNLOAD_FOR_CI=1
 	export LIBSASS_EXT=auto
 
-	npm install --no-package-lock
-	npx grunt --skip-sign build-web-app build-desktop-app-content
+	npm install
+
+	ln -fs normalize.css node_modules/normalize.css/normalize.scss
+
+	npx grunt build-web-app build-desktop-app-content
 
 	asar p tmp/desktop/app ../keeweb.asar
 }
diff --git a/hide-menubar.patch b/hide-menubar.patch
new file mode 100644
index 000000000000..92ebf9816468
--- /dev/null
+++ b/hide-menubar.patch
@@ -0,0 +1,12 @@
+diff --git a/desktop/app.js b/desktop/app.js
+index 75737e1..c75f793 100644
+--- a/desktop/app.js
++++ b/desktop/app.js
+@@ -137,6 +137,7 @@ function readAppSettings() {
+ function createMainWindow() {
+     const appSettings = readAppSettings();
+     const windowOptions = {
++        autoHideMenuBar: true,
+         show: false,
+         width: 1000, height: 700, minWidth: 700, minHeight: 400,
+         titleBarStyle: appSettings ? appSettings.titlebarStyle : undefined,
diff --git a/keeweb.sh b/keeweb.sh
index d4838903546f..c5b1095b84e4 100644
--- a/keeweb.sh
+++ b/keeweb.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/sh
 
-exec electron2 /usr/lib/keeweb/keeweb.asar --disable-updater "$@"
+exec electron /usr/lib/keeweb/keeweb.asar --disable-updater "$@"
diff --git a/package.json.patch.js b/package.json.patch.js
index 93f197de2e83..45b103df1353 100644
--- a/package.json.patch.js
+++ b/package.json.patch.js
@@ -7,27 +7,20 @@ const data = JSON.parse(fs.readFileSync(PATCHABLE_FILE));
 
 // remove extra dependencies
 const removePkg = [
-	/^babel-/,
 	/^electron$/,
 	/^eslint/,
-	/^grunt-appdmg$/,
-	/^grunt-concurrent$/,
 	/^grunt-contrib-compress$/,
 	/^grunt-contrib-deb$/,
-	/^grunt-contrib-uglify$/,
 	/^grunt-contrib-watch$/,
+	/^grunt-contrib-uglify$/,
 	/^grunt-electron$/,
 	/^grunt-eslint$/,
-	/^uglify-loader$/,
 	/^webpack-dev-server/,
 ];
 
-Object.keys(data.devDependencies).forEach(dep => {
-	if (removePkg.some(reg => reg.test(dep)))
-		delete data.devDependencies[dep];
+Object.keys(data.dependencies).forEach(dep => {
+	if (removePkg.some(re => re.test(dep)))
+		delete data.dependencies[dep];
 });
 
-// upgrade node-sass
-data.devDependencies['node-sass'] = '4.10.0';
-
 fs.writeFileSync(PATCHABLE_FILE, JSON.stringify(data, null, '\t'));