summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD38
-rw-r--r--fix-icon-name_use_target_dir.patch25
3 files changed, 49 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59916f5db1bd..a8f4dbac6a54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rocketchat-desktop
pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
pkgver = 2.12.1
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/RocketChat/Rocket.Chat.Electron
arch = i686
arch = x86_64
@@ -17,7 +17,9 @@ pkgbase = rocketchat-desktop
depends = gtk3
depends = glibc
conflicts = rocketchat-client-bin
+ source = fix-icon-name_use_target_dir.patch
source = rocketchat-desktop-2.12.1.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.12.1.tar.gz
+ sha512sums = a56502c1c5604326ef98363caefb6f353375df18260aee731462caa120b49fa2334797eca9915e4d57839f194a3c2274d492734bf63576ebc4f59ebb564db309
sha512sums = 12c94d53d04748fd7876b6ffd2552d62ae10acdc07b49b928b0587b3421a9557f922d3595b3c431dc1cae44a5d5d2ab91e4ded8f3c2b5807d6598d428191d244
pkgname = rocketchat-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 793e6a61c7b0..c018ce1f0d16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=rocketchat-desktop
pkgver=2.12.1
_srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=2
+pkgrel=3
pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
arch=('i686' 'x86_64')
url="https://github.com/RocketChat/Rocket.Chat.Electron"
@@ -11,8 +11,10 @@ license=('MIT')
depends=('nss' 'libxss' 'gconf' 'gtk3' 'glibc')
makedepends=('sed' 'yarn>=0.21.3' 'nodejs>=7.0.0' 'node-gyp' 'python2')
conflicts=('rocketchat-client-bin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/$pkgver.tar.gz")
-sha512sums=('12c94d53d04748fd7876b6ffd2552d62ae10acdc07b49b928b0587b3421a9557f922d3595b3c431dc1cae44a5d5d2ab91e4ded8f3c2b5807d6598d428191d244')
+source=(fix-icon-name_use_target_dir.patch
+ "$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/$pkgver.tar.gz")
+sha512sums=('a56502c1c5604326ef98363caefb6f353375df18260aee731462caa120b49fa2334797eca9915e4d57839f194a3c2274d492734bf63576ebc4f59ebb564db309'
+ '12c94d53d04748fd7876b6ffd2552d62ae10acdc07b49b928b0587b3421a9557f922d3595b3c431dc1cae44a5d5d2ab91e4ded8f3c2b5807d6598d428191d244')
if [[ $CARCH == "i686" ]]; then
_releasename="release:linux-ia32"
_distname="linux-ia32-unpacked"
@@ -20,23 +22,25 @@ else
_releasename="release:linux-x64"
_distname="linux-unpacked"
fi
+
prepare() {
- sed -i 's/"tar.gz",/"dir"/' "$srcdir/$_srcname/package.json"
- sed -i '/"deb",/d' "$srcdir/$_srcname/package.json"
- sed -i '/"rpm",/d' "$srcdir/$_srcname/package.json"
- sed -i '/"snap"/d' "$srcdir/$_srcname/package.json"
- sed -i 's|${SNAP}/meta/gui/icon.png|rocketchat-desktop|' "$srcdir/$_srcname/snap/gui/$pkgname.desktop"
+ # NOTE(matthias.lisin): "tar.gz" was re-added in a newer commit:
+ # https://github.com/RocketChat/Rocket.Chat.Electron/commit/5c8cb8b61b1f2f4f7221533ae6b003ace3df9b4a
+ # Adjust the patch on next update!
+ patch -p1 -d "$_srcname" < fix-icon-name_use_target_dir.patch
}
+
build() {
- cd "$srcdir/$_srcname"
- yarn install --non-interactive --pure-lockfile --cache-folder "$srcdir/yarn-cache"
- yarn build --env=production "$_releasename"
+ cd "$srcdir/$_srcname"
+ yarn install --non-interactive --pure-lockfile --cache-folder "$srcdir/yarn-cache"
+ yarn build --env=production "$_releasename"
}
+
package() {
- install -Dm644 "$srcdir/$_srcname/snap/gui/icon.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
- install -Dm644 "$srcdir/$_srcname/snap/gui/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname/$pkgname.desktop"
- install -Dm644 "$srcdir/$_srcname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- mkdir -p "$pkgdir"/{usr/bin,opt}
- cp -rf "$srcdir/$_srcname/dist/$_distname" "$pkgdir/opt/$pkgname"
- ln -sf /opt/$pkgname/rocketchat "$pkgdir/usr/bin/$pkgname"
+ install -d "$pkgdir"/{usr/bin,opt}
+ install -Dm644 "$srcdir/$_srcname/snap/gui/icon.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
+ install -Dm644 "$srcdir/$_srcname/snap/gui/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "$srcdir/$_srcname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ cp -r "$srcdir/$_srcname/dist/$_distname" "$pkgdir/opt/$pkgname"
+ ln -sf /opt/$pkgname/rocketchat "$pkgdir/usr/bin/$pkgname"
}
diff --git a/fix-icon-name_use_target_dir.patch b/fix-icon-name_use_target_dir.patch
new file mode 100644
index 000000000000..f08642a35548
--- /dev/null
+++ b/fix-icon-name_use_target_dir.patch
@@ -0,0 +1,25 @@
+diff -ura package.orig/package.json package.new/package.json
+--- package.orig/package.json 2018-08-17 12:03:28.681824081 +0200
++++ package.new/package.json 2018-08-17 12:03:46.091941868 +0200
+@@ -59,9 +59,7 @@
+ },
+ "category": "GNOME;GTK;Network;InstantMessaging",
+ "target": [
+- "deb",
+- "rpm",
+- "snap"
++ "dir"
+ ]
+ },
+ "publish": [
+diff -ura package.orig/snap/gui/rocketchat-desktop.desktop package.new/snap/gui/rocketchat-desktop.desktop
+--- package.orig/snap/gui/rocketchat-desktop.desktop 2018-08-17 12:03:28.748491198 +0200
++++ package.new/snap/gui/rocketchat-desktop.desktop 2018-08-17 12:04:03.495393068 +0200
+@@ -4,6 +4,6 @@
+ Exec=rocketchat-desktop
+ Terminal=false
+ Type=Application
+-Icon=${SNAP}/meta/gui/icon.png
++Icon=rocketchat-desktop
+ Categories=GNOME;GTK;Network;InstantMessaging
+ StartupWMClass=Rocket.Chat+