Patch Gruntfile

3 files changed, 41 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09dd2b9f9e0f..c19fa4ab0e74 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wire-desktop-git
 	pkgdesc = Modern, private messenger
-	pkgver = 3.0.2816.r14.g79e044a
+	pkgver = 3.3.2872.r4.g2090b80
 	pkgrel = 1
 	url = https://wire.com/
 	arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = wire-desktop-git
 	license = GPL3
 	makedepends = cargo
 	makedepends = npm
+	makedepends = patch
 	makedepends = python2
 	depends = alsa-lib
 	depends = gconf
@@ -24,8 +25,10 @@ pkgbase = wire-desktop-git
 	conflicts = wire-desktop
 	source = git://github.com/wireapp/wire-desktop.git
 	source = wire-desktop.desktop
+	source = Gruntfile.patch
 	sha256sums = SKIP
 	sha256sums = cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea
+	sha256sums = 0ab8a14a961502b1333d62e3cb0444e04d1b54c7ca1b36820c1d1d9dba0474a3
 
 pkgname = wire-desktop-git
 
diff --git a/Gruntfile.patch b/Gruntfile.patch
new file mode 100644
index 000000000000..88f6f44123bd
--- /dev/null
+++ b/Gruntfile.patch
@@ -0,0 +1,30 @@
+--- Gruntfile.js	2018-09-17 16:49:19.630048059 -0400
++++ Gruntfile.js	2018-09-17 16:43:27.178277541 -0400
+@@ -28,8 +28,6 @@
+ const INFO_JSON = 'info.json';
+
+ const LINUX_SETTINGS = {
+-  afterInstall: 'bin/deb/after-install.tpl',
+-  afterRemove: 'bin/deb/after-remove.tpl',
+   category: 'Network',
+   desktop: {
+     Version: '<%= info.version %>.<%= buildNumber %>',
+@@ -39,7 +37,7 @@
+     Keywords: 'chat;encrypt;e2e;messenger;videocall',
+     StartupWMClass: '<%= info.name %>',
+   },
+-  fpm: ['--name', 'wire-desktop'],
++  executableName: 'wire-desktop'
+ };
+
+ module.exports = function(grunt) {
+@@ -200,8 +198,7 @@
+         options: {
+           arch: grunt.option('arch') || process.arch,
+           linux: {
+-            ...LINUX_SETTINGS,
+-            fpm: ['--name', 'wire-desktop'],
++            ...LINUX_SETTINGS
+           },
+           targets: [grunt.option('target') || 'dir'],
+         },
diff --git a/PKGBUILD b/PKGBUILD
index 7ada6022d467..0e203b724829 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Conor Anderson <conor@conr.ca>
 pkgname=wire-desktop-git
 _pkgname=${pkgname%-git}
-pkgver=3.0.2816.r14.g79e044a
+pkgver=3.3.2872.r4.g2090b80
 pkgrel=1
 pkgdesc='Modern, private messenger'
 arch=('x86_64' 'i686')
@@ -9,15 +9,17 @@ url='https://wire.com/'
 license=('GPL3')
 conflicts=('wire-desktop-bin' 'wire-desktop')
 depends=('alsa-lib' 'gconf' 'gtk2' 'libxss' 'libxtst' 'nss' 'xdg-utils')
-makedepends=('cargo' 'npm' 'python2')
+makedepends=('cargo' 'npm' 'patch' 'python2')
 optdepends=('hunspell-en: for English spellcheck support'
             'noto-fonts-emoji: for colorful emoji made by Google'
             'ttf-emojione: for colorful emoji made by EmojiOne')
 provides=('wire-desktop')
 source=("git://github.com/wireapp/wire-desktop.git"
-        "wire-desktop.desktop")
+        "wire-desktop.desktop"
+        Gruntfile.patch)
 sha256sums=('SKIP'
-            'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea')
+            'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea'
+            '0ab8a14a961502b1333d62e3cb0444e04d1b54c7ca1b36820c1d1d9dba0474a3')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -26,6 +28,7 @@ pkgver() {
 
 build() {
   cd "${srcdir}/${_pkgname}"
+  patch -p0 < $startdir/Gruntfile.patch
   npm install
   $(npm bin)/grunt 'linux-other'
 }