upgpkg: tradingview 2.7.1-3

2 files changed, 39 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62693a88f936..7784564cf1fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,16 @@
 pkgbase = tradingview
-	pkgdesc = TradingView is a charting platform for traders and investors
+	pkgdesc = A charting platform for traders and investors
 	pkgver = 2.7.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.tradingview.com/desktop/
 	arch = x86_64
 	license = custom:proprietary
 	makedepends = links
 	makedepends = squashfs-tools
+	source = tradingview-2.7.1.snap::https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_48.snap
+	b2sums = 979958b07225cb2cd0b132d98b7e8727cca2b6fca8fd5608b16f9c9daddbe39c21b9ea94ceac47447c79e97cb6ca15fab63bfe0fadbc8d221ba75cd71dc428f8
+
+pkgname = tradingview
 	depends = alsa-lib
 	depends = at-spi2-core
 	depends = cairo
@@ -32,7 +36,3 @@ pkgbase = tradingview
 	depends = nspr
 	depends = nss
 	depends = pango
-	source = tradingview-2.7.1.snap::https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_48.snap
-	b2sums = 979958b07225cb2cd0b132d98b7e8727cca2b6fca8fd5608b16f9c9daddbe39c21b9ea94ceac47447c79e97cb6ca15fab63bfe0fadbc8d221ba75cd71dc428f8
-
-pkgname = tradingview
diff --git a/PKGBUILD b/PKGBUILD
index 979fb52c6eca..78c75baf9911 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,11 @@
 
 pkgname=tradingview
 pkgver=2.7.1
-pkgrel=2
-pkgdesc='TradingView is a charting platform for traders and investors'
+pkgrel=3
+pkgdesc='A charting platform for traders and investors'
 arch=('x86_64')
 url='https://www.tradingview.com/desktop/'
 license=('custom:proprietary')
-depends=('alsa-lib'
-         'at-spi2-core'
-         'cairo'
-         'dbus'
-         'expat'
-         'gcc-libs'
-         'glib2'
-         'glibc'
-         'gtk3'
-         'hicolor-icon-theme'
-         'libcups'
-         'libdrm'
-         'libsecret'
-         'libx11'
-         'libxcb'
-         'libxcomposite'
-         'libxdamage'
-         'libxext'
-         'libxfixes'
-         'libxkbcommon'
-         'libxrandr'
-         'mesa'
-         'nspr'
-         'nss'
-         'pango')
 makedepends=('links'
              'squashfs-tools')
 source=("$pkgname-$pkgver.snap::https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_48.snap")
@@ -46,7 +21,7 @@ prepare() {
     ## Extract
     unsquashfs -q -f -d "$pkgname-$pkgver/" "$pkgname-$pkgver.snap"
 
-    mv "$pkgname-$pkgver/meta/gui/icon.png" "$srcdir/"
+    mv "$pkgname-$pkgver/meta/gui/icon.png" "$srcdir/$pkgname.png"
     mv "$pkgname-$pkgver/meta/gui/$pkgname.desktop" "$srcdir/"
     sed -n -e 's@${SNAP}/meta/gui/icon.png@'"$pkgname"'@g' \
         -e 's@^Categories=Finance;$@Categories=Office;Finance;@g' \
@@ -56,13 +31,39 @@ prepare() {
 }
 
 package() {
-    install -d "$pkgdir/opt/$pkgname"
-    cp -r "$srcdir/$pkgname-$pkgver/"* "$pkgdir/opt/$pkgname"
+    depends=('alsa-lib'
+             'at-spi2-core'
+             'cairo'
+             'dbus'
+             'expat'
+             'gcc-libs'
+             'glib2'
+             'glibc'
+             'gtk3'
+             'hicolor-icon-theme'
+             'libcups'
+             'libdrm'
+             'libsecret'
+             'libx11'
+             'libxcb'
+             'libxcomposite'
+             'libxdamage'
+             'libxext'
+             'libxfixes'
+             'libxkbcommon'
+             'libxrandr'
+             'mesa'
+             'nspr'
+             'nss'
+             'pango')
 
-    install -d "$pkgdir/usr/bin"
+    install -d "$pkgdir/opt/$pkgname/"
+    cp -r "$srcdir/$pkgname-$pkgver/"* "$pkgdir/opt/$pkgname/"
+
+    install -d "$pkgdir/usr/bin/"
     ln -s "/opt/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-    install -Dm644 "$srcdir/icon.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
+    install -Dm644 "$srcdir/$pkgname.png" -t "$pkgdir/usr/share/icons/hicolor/512x512/apps/"
     install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications/"
     install -Dm644 "$srcdir/EULA.txt" -t "$pkgdir/usr/share/licenses/$pkgname/"
 }