openbazaar-git: removed icon patch (merged fix)

3 files changed, 4 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b79d8f55268f..9cd38750db80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Nov 16 17:26:15 UTC 2017
+# Tue Nov 21 12:35:35 UTC 2017
 pkgbase = openbazaar-git
 	pkgdesc = Front-end Electron application for talking with the OpenBazaar daemon (Latest devel version)
-	pkgver = v2.0.17.r21.g84c4a95a
+	pkgver = v2.0.17.r44.g4e26c5c3
 	pkgrel = 1
 	url = http://openbazaar.org
 	install = openbazaar.install
@@ -16,11 +16,9 @@ pkgbase = openbazaar-git
 	source = openbazaar::git+https://github.com/OpenBazaar/openbazaar-desktop.git
 	source = openbazaar.js
 	source = openbazaar.desktop
-	source = icons.patch
 	md5sums = SKIP
 	md5sums = 446ad1e41acd07468c3750a9027dc8f8
 	md5sums = 43c9c9ef1d3ca873eea6b6343ca072e8
-	md5sums = c8d61887729b1326c611aafba89e0df1
 
 pkgname = openbazaar-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 602882f18cc0..c6ec00bcfd30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=openbazaar
 pkgname=${_pkgname}-git
-pkgver=v2.0.17.r21.g84c4a95a
+pkgver=v2.0.17.r44.g4e26c5c3
 pkgrel=1
 pkgdesc="Front-end Electron application for talking with the OpenBazaar daemon (Latest devel version)" 
 arch=(any)
@@ -15,14 +15,12 @@ source=(
 	"${_pkgname}::git+https://github.com/OpenBazaar/openbazaar-desktop.git"
 	"${_pkgname}.js"
     "${_pkgname}.desktop"
-    icons.patch
 )
 install=${_pkgname}.install
 options=('!strip')
 
 build(){
   cd $srcdir/${_pkgname}
-  patch -Np1 -i ../icons.patch
   npm install
   npm run build
   rm -rf {.eslint*,.travis*}
@@ -53,5 +51,4 @@ pkgver() {
 
 md5sums=('SKIP'
          '446ad1e41acd07468c3750a9027dc8f8'
-         '43c9c9ef1d3ca873eea6b6343ca072e8'
-         'c8d61887729b1326c611aafba89e0df1')
+         '43c9c9ef1d3ca873eea6b6343ca072e8')
diff --git a/icons.patch b/icons.patch
deleted file mode 100644
index c183db1b1a83..000000000000
--- a/icons.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/main.js b/main.js
-index 69b9bd8c2..545bbe7e1 100644
---- a/main.js
-+++ b/main.js
-@@ -378,8 +378,12 @@ function createWindow() {
-   });
- 
-   // put logic here to set tray icon based on OS
--  const osTrayIcon = 'openbazaar-mac-system-tray.png';
--
-+  if (process.platform === 'linux') {
-+    var osTrayIcon = 'icon.png';
-+  } else {
-+    var osTrayIcon = 'openbazaar-mac-system-tray.png';
-+  }
-+  
-   trayMenu = new Tray(`${__dirname}/imgs/${osTrayIcon}`);
- 
-   let trayTemplate = [];
-@@ -455,7 +459,7 @@ function createWindow() {
-     center: true,
-     title: 'OpenBazaar',
-     frame: false,
--    icon: 'imgs/openbazaar-icon.png',
-+    icon: `${__dirname}/imgs/icon.png`,
-   });
- 
-   // and load the index.html of the app.
-