diff options
| author | Giovanni Harting | 2017-06-19 05:57:49 +0200 |
|---|---|---|
| committer | Giovanni Harting | 2017-06-19 06:06:40 +0200 |
| commit | 55c140320daa3238d80918b41d6f636ad810e017 (patch) | |
| tree | bf265f561d5e8a3f1a760f62cdb61b3737514b00 | |
| parent | c97594f856d9fa1d08fcb398dc09833093a454cc (diff) | |
| download | aur-55c140320daa3238d80918b41d6f636ad810e017.tar.gz | |
use included .desktop, fix conflicts
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | Orion.desktop | 10 | ||||
| -rw-r--r-- | PKGBUILD | 27 |
3 files changed, 13 insertions, 31 deletions
@@ -1,7 +1,7 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.5.1rc - pkgrel = 2 + pkgrel = 3 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 @@ -10,14 +10,11 @@ pkgbase = orion depends = qt5-svg depends = qt5-quickcontrols depends = qt5-quickcontrols2 - depends = hicolor-icon-theme depends = gst-libav provides = orion - conflicts = orion + conflicts = orion-git source = https://github.com/alamminsalo/orion/archive/1.5.1-rc.tar.gz - source = Orion.desktop sha256sums = 8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f - sha256sums = 8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3 pkgname = orion diff --git a/Orion.desktop b/Orion.desktop deleted file mode 100644 index 8065f215fde2..000000000000 --- a/Orion.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Orion -Icon=orion -Exec=orion -Comment=Seek and watch streams on Twitch -Categories=Games; -Terminal=false -StartupWMClass=orion @@ -5,20 +5,16 @@ pkgname=orion pkgver=1.5.1rc _dversion=1.5.1-rc -pkgrel=2 +pkgrel=3 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') -depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'hicolor-icon-theme' 'gst-libav') +depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'gst-libav') provides=("${pkgname}") -conflicts=("${pkgname%-git}") -source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz" - "Orion.desktop" -) - -sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f' - '8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3') +conflicts=("$pkgname-git") +source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz") +sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f') build() { cd "$srcdir/${pkgname}-${_dversion}" @@ -27,12 +23,11 @@ build() { } package() { - mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps/" - mkdir -p "$pkgdir/usr/share/applications" - mkdir -p "$pkgdir/usr/bin" - cd "$srcdir/${pkgname}-${_dversion}" - cp "distfiles/orion.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/" - cp "../Orion.desktop" "$pkgdir/usr/share/applications/" - cp "orion" "$pkgdir/usr/bin/" + + sed -e "s|Icon=/usr/local/share/icons/orion.svg|Icon=orion|" -i distfiles/Orion.desktop + + install -Dm644 distfiles/orion.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/orion.svg + install -Dm644 distfiles/Orion.desktop ${pkgdir}/usr/share/applications/Orion.desktop + install -Dm755 orion ${pkgdir}/usr/bin/orion } |