use included .desktop, fix conflicts
This commit is contained in:
7
.SRCINFO
7
.SRCINFO
@@ -1,7 +1,7 @@
|
|||||||
pkgbase = orion
|
pkgbase = orion
|
||||||
pkgdesc = QML/C++-written desktop client for Twitch.tv
|
pkgdesc = QML/C++-written desktop client for Twitch.tv
|
||||||
pkgver = 1.5.1rc
|
pkgver = 1.5.1rc
|
||||||
pkgrel = 2
|
pkgrel = 3
|
||||||
url = https://github.com/alamminsalo/orion/
|
url = https://github.com/alamminsalo/orion/
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
arch = i686
|
arch = i686
|
||||||
@@ -10,14 +10,11 @@ pkgbase = orion
|
|||||||
depends = qt5-svg
|
depends = qt5-svg
|
||||||
depends = qt5-quickcontrols
|
depends = qt5-quickcontrols
|
||||||
depends = qt5-quickcontrols2
|
depends = qt5-quickcontrols2
|
||||||
depends = hicolor-icon-theme
|
|
||||||
depends = gst-libav
|
depends = gst-libav
|
||||||
provides = orion
|
provides = orion
|
||||||
conflicts = orion
|
conflicts = orion-git
|
||||||
source = https://github.com/alamminsalo/orion/archive/1.5.1-rc.tar.gz
|
source = https://github.com/alamminsalo/orion/archive/1.5.1-rc.tar.gz
|
||||||
source = Orion.desktop
|
|
||||||
sha256sums = 8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f
|
sha256sums = 8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f
|
||||||
sha256sums = 8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3
|
|
||||||
|
|
||||||
pkgname = orion
|
pkgname = orion
|
||||||
|
|
||||||
|
@@ -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
|
|
27
PKGBUILD
27
PKGBUILD
@@ -5,20 +5,16 @@
|
|||||||
pkgname=orion
|
pkgname=orion
|
||||||
pkgver=1.5.1rc
|
pkgver=1.5.1rc
|
||||||
_dversion=1.5.1-rc
|
_dversion=1.5.1-rc
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc="QML/C++-written desktop client for Twitch.tv"
|
pkgdesc="QML/C++-written desktop client for Twitch.tv"
|
||||||
arch=('x86_64' 'i686')
|
arch=('x86_64' 'i686')
|
||||||
url="https://github.com/alamminsalo/orion/"
|
url="https://github.com/alamminsalo/orion/"
|
||||||
license=('GPL')
|
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}")
|
provides=("${pkgname}")
|
||||||
conflicts=("${pkgname%-git}")
|
conflicts=("$pkgname-git")
|
||||||
source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz"
|
source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz")
|
||||||
"Orion.desktop"
|
sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f')
|
||||||
)
|
|
||||||
|
|
||||||
sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f'
|
|
||||||
'8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3')
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$srcdir/${pkgname}-${_dversion}"
|
cd "$srcdir/${pkgname}-${_dversion}"
|
||||||
@@ -27,12 +23,11 @@ build() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
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}"
|
cd "$srcdir/${pkgname}-${_dversion}"
|
||||||
cp "distfiles/orion.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
|
|
||||||
cp "../Orion.desktop" "$pkgdir/usr/share/applications/"
|
sed -e "s|Icon=/usr/local/share/icons/orion.svg|Icon=orion|" -i distfiles/Orion.desktop
|
||||||
cp "orion" "$pkgdir/usr/bin/"
|
|
||||||
|
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
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user