summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorConor Anderson2018-09-20 16:29:27 -0400
committerConor Anderson2018-09-20 16:29:27 -0400
commit38de0c1b3f8079b00dcb41d22be54859f0913148 (patch)
treea6b90dea949cc6d3fc90b98fe898d3e25939e269
parent7758d17ff60a00d7777d86b3aa9ce80c470ae3d1 (diff)
downloadaur-38de0c1b3f8079b00dcb41d22be54859f0913148.tar.gz
Remove patch
-rwxr-xr-x.SRCINFO5
-rw-r--r--Gruntfile.patch30
-rwxr-xr-xPKGBUILD11
3 files changed, 5 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c19fa4ab0e74..60809042ac5b 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wire-desktop-git
pkgdesc = Modern, private messenger
- pkgver = 3.3.2872.r4.g2090b80
+ pkgver = 3.3.2872.r14.ge602498
pkgrel = 1
url = https://wire.com/
arch = x86_64
@@ -8,7 +8,6 @@ pkgbase = wire-desktop-git
license = GPL3
makedepends = cargo
makedepends = npm
- makedepends = patch
makedepends = python2
depends = alsa-lib
depends = gconf
@@ -25,10 +24,8 @@ 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
deleted file mode 100644
index 88f6f44123bd..000000000000
--- a/Gruntfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 0e203b724829..7c2db28a2b07 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Conor Anderson <conor@conr.ca>
pkgname=wire-desktop-git
_pkgname=${pkgname%-git}
-pkgver=3.3.2872.r4.g2090b80
+pkgver=3.3.2872.r14.ge602498
pkgrel=1
pkgdesc='Modern, private messenger'
arch=('x86_64' 'i686')
@@ -9,17 +9,15 @@ 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' 'patch' 'python2')
+makedepends=('cargo' 'npm' '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"
- Gruntfile.patch)
+ "wire-desktop.desktop")
sha256sums=('SKIP'
- 'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea'
- '0ab8a14a961502b1333d62e3cb0444e04d1b54c7ca1b36820c1d1d9dba0474a3')
+ 'cc9056cecff2aa49a9ce9c8376d57ec8c7c2cb8174f7966b5cdccbeb2e3751ea')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -28,7 +26,6 @@ pkgver() {
build() {
cd "${srcdir}/${_pkgname}"
- patch -p0 < $startdir/Gruntfile.patch
npm install
$(npm bin)/grunt 'linux-other'
}