From 0b25ee1dab8dfbcd5319005d23bf8bda29399be5 Mon Sep 17 00:00:00 2001 From: David McInnis Date: Mon, 12 Sep 2016 13:18:45 -0700 Subject: [PATCH 01/21] first commit --- .SRCINFO | 24 ++++++++++++++++++++++++ Orion.desktop | 10 ++++++++++ PKGBUILD | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 .SRCINFO create mode 100644 Orion.desktop create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..6c5914c --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,24 @@ +# Generated by mksrcinfo v8 +# Mon Sep 12 20:18:33 UTC 2016 +pkgbase = orion + pkgdesc = QML/C++-written desktop client for Twitch.tv + pkgver = 1.3.0 + pkgrel = 1 + url = https://github.com/alamminsalo/orion/ + arch = x86_64 + arch = x86 + license = GPL + makedepends = qmake + makedepends = libcommuni + makedepends = mpv + makedepends = qt5-webengine + makedepends = qt5-svg + provides = orion + conflicts = orion + source = https://github.com/alamminsalo/orion/archive/v1.3.0.tar.gz + source = Orion.desktop + sha256sums = b7da580dc0c0c28978b5bf2a84a839a517503c98005616e1690c177867d0c148 + sha256sums = a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44 + +pkgname = orion + diff --git a/Orion.desktop b/Orion.desktop new file mode 100644 index 0000000..e16a621 --- /dev/null +++ b/Orion.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Orion +Icon=/usr/share/icons/orion.svg +Exec=/usr/bin/orion +Comment=Seek and watch streams on Twitch +Categories=Games; +Terminal=false +StartupWMClass=orion diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..f4df317 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: David McInnis +# Contributor: HabarNam + +pkgname=orion +pkgver=1.3.0 +pkgrel=1 +pkgdesc="QML/C++-written desktop client for Twitch.tv" +arch=('x86_64' 'x86') +url="https://github.com/alamminsalo/orion/" +license=('GPL') +groups=() +depends=() +makedepends=('qmake' 'libcommuni' 'mpv' 'qt5-webengine' 'qt5-svg') +provides=("${pkgname}") +conflicts=("${pkgname%-git}") +source=("https://github.com/alamminsalo/orion/archive/v${pkgver}.tar.gz" + "Orion.desktop" +) + +sha256sums=('b7da580dc0c0c28978b5bf2a84a839a517503c98005616e1690c177867d0c148' + 'a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + qmake + make +} + +package() { + mkdir -p "$pkgdir/usr/share/icons" + mkdir -p "$pkgdir/usr/share/applications" + mkdir -p "$pkgdir/usr/bin" + + cd "$srcdir/${pkgname}-${pkgver}" + cp "orion.svg" "$pkgdir/usr/share/icons/" + cp "../Orion.desktop" "$pkgdir/usr/share/applications/" + cp "orion" "$pkgdir/usr/bin/" +} From 665d1cdf3cfb47b982bc418f756a55bf144c22d9 Mon Sep 17 00:00:00 2001 From: David McInnis Date: Mon, 12 Sep 2016 13:20:13 -0700 Subject: [PATCH 02/21] fixed qmake dependency --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6c5914c..879af7a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Mon Sep 12 20:18:33 UTC 2016 +# Mon Sep 12 20:19:58 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.3.0 @@ -8,7 +8,7 @@ pkgbase = orion arch = x86_64 arch = x86 license = GPL - makedepends = qmake + makedepends = qtchooser makedepends = libcommuni makedepends = mpv makedepends = qt5-webengine diff --git a/PKGBUILD b/PKGBUILD index f4df317..b421f8d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() depends=() -makedepends=('qmake' 'libcommuni' 'mpv' 'qt5-webengine' 'qt5-svg') +makedepends=('qtchooser' 'libcommuni' 'mpv' 'qt5-webengine' 'qt5-svg') provides=("${pkgname}") conflicts=("${pkgname%-git}") source=("https://github.com/alamminsalo/orion/archive/v${pkgver}.tar.gz" From b4dbb4fb60f71d3697fd786d0f608aad36e73663 Mon Sep 17 00:00:00 2001 From: David McInnis Date: Mon, 12 Sep 2016 20:59:31 -0700 Subject: [PATCH 03/21] fixed for i686 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 879af7a..67d117f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,12 @@ # Generated by mksrcinfo v8 -# Mon Sep 12 20:19:58 UTC 2016 +# Tue Sep 13 03:59:16 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.3.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/alamminsalo/orion/ arch = x86_64 - arch = x86 + arch = i686 license = GPL makedepends = qtchooser makedepends = libcommuni diff --git a/PKGBUILD b/PKGBUILD index b421f8d..7f2cab5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,9 +3,9 @@ pkgname=orion pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="QML/C++-written desktop client for Twitch.tv" -arch=('x86_64' 'x86') +arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() From 3669fa729e04ded41136b0cc8660fb9488271486 Mon Sep 17 00:00:00 2001 From: David McInnis Date: Thu, 15 Sep 2016 17:16:55 -0700 Subject: [PATCH 04/21] version bump --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 67d117f..ec9e7a3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,23 +1,23 @@ # Generated by mksrcinfo v8 -# Tue Sep 13 03:59:16 UTC 2016 +# Fri Sep 16 00:16:46 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.3.0 - pkgrel = 2 + pkgver = 1.3.1 + pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 license = GPL makedepends = qtchooser makedepends = libcommuni - makedepends = mpv - makedepends = qt5-webengine - makedepends = qt5-svg + depends = mpv + depends = qt5-webengine + depends = qt5-svg provides = orion conflicts = orion - source = https://github.com/alamminsalo/orion/archive/v1.3.0.tar.gz + source = https://github.com/alamminsalo/orion/archive/v1.3.1.tar.gz source = Orion.desktop - sha256sums = b7da580dc0c0c28978b5bf2a84a839a517503c98005616e1690c177867d0c148 + sha256sums = d51976e066dc942b20a2596cb68a8cf60206cb61836586bb56dbd7c05368c1c5 sha256sums = a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 7f2cab5..e8992d8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,22 +2,22 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() -depends=() -makedepends=('qtchooser' 'libcommuni' 'mpv' 'qt5-webengine' 'qt5-svg') +depends=('mpv' 'qt5-webengine' 'qt5-svg') +makedepends=('qtchooser' 'libcommuni') provides=("${pkgname}") conflicts=("${pkgname%-git}") source=("https://github.com/alamminsalo/orion/archive/v${pkgver}.tar.gz" "Orion.desktop" ) -sha256sums=('b7da580dc0c0c28978b5bf2a84a839a517503c98005616e1690c177867d0c148' +sha256sums=('d51976e066dc942b20a2596cb68a8cf60206cb61836586bb56dbd7c05368c1c5' 'a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44') build() { From c710a365cb275ac77d358ab781fb0f72a31fcd64 Mon Sep 17 00:00:00 2001 From: David McInnis Date: Fri, 16 Sep 2016 17:49:52 -0700 Subject: [PATCH 05/21] added dependency --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ec9e7a3..44aa865 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Sep 16 00:16:46 UTC 2016 +# Sat Sep 17 00:49:29 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.3.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 @@ -13,6 +13,7 @@ pkgbase = orion depends = mpv depends = qt5-webengine depends = qt5-svg + depends = qt5-quickcontrols provides = orion conflicts = orion source = https://github.com/alamminsalo/orion/archive/v1.3.1.tar.gz diff --git a/PKGBUILD b/PKGBUILD index e8992d8..456e2cb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,13 +3,13 @@ pkgname=orion pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() -depends=('mpv' 'qt5-webengine' 'qt5-svg') +depends=('mpv' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols') makedepends=('qtchooser' 'libcommuni') provides=("${pkgname}") conflicts=("${pkgname%-git}") From ba454755d0aa1b65c8e93318c0bfc9336fcb867b Mon Sep 17 00:00:00 2001 From: David McInnis Date: Fri, 23 Sep 2016 08:23:29 -0700 Subject: [PATCH 06/21] version bump --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 44aa865..2a7e2a3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Sep 17 00:49:29 UTC 2016 +# Fri Sep 23 15:23:20 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.3.1 - pkgrel = 2 + pkgver = 1.3.2 + pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 @@ -16,9 +16,9 @@ pkgbase = orion depends = qt5-quickcontrols provides = orion conflicts = orion - source = https://github.com/alamminsalo/orion/archive/v1.3.1.tar.gz + source = https://github.com/alamminsalo/orion/archive/v1.3.2.tar.gz source = Orion.desktop - sha256sums = d51976e066dc942b20a2596cb68a8cf60206cb61836586bb56dbd7c05368c1c5 + sha256sums = 80a80b50ffcfc17da14aaeb527902f9659bfb1cf9e2286b259e7bcdbf1155a32 sha256sums = a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 456e2cb..6babc71 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" @@ -17,7 +17,7 @@ source=("https://github.com/alamminsalo/orion/archive/v${pkgver}.tar.gz" "Orion.desktop" ) -sha256sums=('d51976e066dc942b20a2596cb68a8cf60206cb61836586bb56dbd7c05368c1c5' +sha256sums=('80a80b50ffcfc17da14aaeb527902f9659bfb1cf9e2286b259e7bcdbf1155a32' 'a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44') build() { From cce02cf1d816346539e56a5be371874e300cbcac Mon Sep 17 00:00:00 2001 From: David McInnis Date: Sat, 15 Oct 2016 12:48:10 -0700 Subject: [PATCH 07/21] version bump --- .SRCINFO | 14 ++++++++------ Orion.desktop | 4 ++-- PKGBUILD | 14 ++++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2a7e2a3..dfdbeb6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,25 +1,27 @@ # Generated by mksrcinfo v8 -# Fri Sep 23 15:23:20 UTC 2016 +# Sat Oct 15 19:46:30 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.3.2 + pkgver = 1.3.5 pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 license = GPL - makedepends = qtchooser + makedepends = qt5-declarative makedepends = libcommuni depends = mpv depends = qt5-webengine depends = qt5-svg depends = qt5-quickcontrols + optdepends = qtav: alternate video output + optdepends = qt5-multimedia: alternate video output provides = orion conflicts = orion - source = https://github.com/alamminsalo/orion/archive/v1.3.2.tar.gz + source = https://github.com/alamminsalo/orion/archive/v1.3.5.tar.gz source = Orion.desktop - sha256sums = 80a80b50ffcfc17da14aaeb527902f9659bfb1cf9e2286b259e7bcdbf1155a32 - sha256sums = a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44 + sha256sums = 0094b3202a7cfe0bc5139fd30e0cd371fce76abad3eb019d355dce67b715c8c6 + sha256sums = 8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3 pkgname = orion diff --git a/Orion.desktop b/Orion.desktop index e16a621..8065f21 100644 --- a/Orion.desktop +++ b/Orion.desktop @@ -2,8 +2,8 @@ Version=1.0 Type=Application Name=Orion -Icon=/usr/share/icons/orion.svg -Exec=/usr/bin/orion +Icon=orion +Exec=orion Comment=Seek and watch streams on Twitch Categories=Games; Terminal=false diff --git a/PKGBUILD b/PKGBUILD index 6babc71..d1c93f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.3.2 +pkgver=1.3.5 pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') @@ -10,15 +10,17 @@ url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() depends=('mpv' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols') -makedepends=('qtchooser' 'libcommuni') +makedepends=('qt5-declarative' 'libcommuni') +optdepends=('qtav: alternate video output' + 'qt5-multimedia: alternate video output') provides=("${pkgname}") conflicts=("${pkgname%-git}") source=("https://github.com/alamminsalo/orion/archive/v${pkgver}.tar.gz" "Orion.desktop" ) -sha256sums=('80a80b50ffcfc17da14aaeb527902f9659bfb1cf9e2286b259e7bcdbf1155a32' - 'a0bb773176dd7ec448ecd5702da9c32b35da27ea3070b23496fe51abb15d8d44') +sha256sums=('0094b3202a7cfe0bc5139fd30e0cd371fce76abad3eb019d355dce67b715c8c6' + '8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -27,12 +29,12 @@ build() { } package() { - mkdir -p "$pkgdir/usr/share/icons" + mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps/" mkdir -p "$pkgdir/usr/share/applications" mkdir -p "$pkgdir/usr/bin" cd "$srcdir/${pkgname}-${pkgver}" - cp "orion.svg" "$pkgdir/usr/share/icons/" + cp "distfiles/orion.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/" cp "../Orion.desktop" "$pkgdir/usr/share/applications/" cp "orion" "$pkgdir/usr/bin/" } From f2f5c38409cad2ec5502d4e799aecea5ba86e490 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 5 Apr 2017 14:50:06 +0200 Subject: [PATCH 08/21] v1.4.0; dropped some deps; switched to qt5-multimedia for playback --- .SRCINFO | 15 +++++---------- PKGBUILD | 13 +++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dfdbeb6..b14701b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,26 +1,21 @@ -# Generated by mksrcinfo v8 -# Sat Oct 15 19:46:30 UTC 2016 pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.3.5 + pkgver = 1.4.0 pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 license = GPL - makedepends = qt5-declarative - makedepends = libcommuni - depends = mpv + depends = qt5-multimedia depends = qt5-webengine depends = qt5-svg depends = qt5-quickcontrols - optdepends = qtav: alternate video output - optdepends = qt5-multimedia: alternate video output + depends = qt5-quickcontrols2 provides = orion conflicts = orion - source = https://github.com/alamminsalo/orion/archive/v1.3.5.tar.gz + source = https://github.com/alamminsalo/orion/archive/1.4.0.tar.gz source = Orion.desktop - sha256sums = 0094b3202a7cfe0bc5139fd30e0cd371fce76abad3eb019d355dce67b715c8c6 + sha256sums = 4adb8ff6a3c24aed14a31d9c17474ee88df52b3cde5d5d1b48b41b4f7a0ae4a0 sha256sums = 8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index d1c93f4..394a34d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,29 +2,26 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.3.5 +pkgver=1.4.0 pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() -depends=('mpv' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols') -makedepends=('qt5-declarative' 'libcommuni') -optdepends=('qtav: alternate video output' - 'qt5-multimedia: alternate video output') +depends=('qt5-multimedia' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2') provides=("${pkgname}") conflicts=("${pkgname%-git}") -source=("https://github.com/alamminsalo/orion/archive/v${pkgver}.tar.gz" +source=("https://github.com/alamminsalo/orion/archive/${pkgver}.tar.gz" "Orion.desktop" ) -sha256sums=('0094b3202a7cfe0bc5139fd30e0cd371fce76abad3eb019d355dce67b715c8c6' +sha256sums=('4adb8ff6a3c24aed14a31d9c17474ee88df52b3cde5d5d1b48b41b4f7a0ae4a0' '8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3') build() { cd "$srcdir/${pkgname}-${pkgver}" - qmake + qmake CONFIG+=multimedia make } From e8c19a3e1ade62c78ba4befe53ed8b69f1e5bc91 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sat, 29 Apr 2017 20:02:54 +0200 Subject: [PATCH 09/21] v1.5.1rc; removed qt5-webengine from deps --- .SRCINFO | 7 +++---- PKGBUILD | 13 +++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b14701b..89bbd32 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,21 +1,20 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.4.0 + pkgver = 1.5.1rc pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 license = GPL depends = qt5-multimedia - depends = qt5-webengine depends = qt5-svg depends = qt5-quickcontrols depends = qt5-quickcontrols2 provides = orion conflicts = orion - source = https://github.com/alamminsalo/orion/archive/1.4.0.tar.gz + source = https://github.com/alamminsalo/orion/archive/1.5.1-rc.tar.gz source = Orion.desktop - sha256sums = 4adb8ff6a3c24aed14a31d9c17474ee88df52b3cde5d5d1b48b41b4f7a0ae4a0 + sha256sums = 8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f sha256sums = 8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 394a34d..cad69a8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,25 +2,26 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.4.0 +pkgver=1.5.1rc +_dversion=1.5.1-rc pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') groups=() -depends=('qt5-multimedia' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2') +depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'hicolor-icon-theme') provides=("${pkgname}") conflicts=("${pkgname%-git}") -source=("https://github.com/alamminsalo/orion/archive/${pkgver}.tar.gz" +source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz" "Orion.desktop" ) -sha256sums=('4adb8ff6a3c24aed14a31d9c17474ee88df52b3cde5d5d1b48b41b4f7a0ae4a0' +sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f' '8bb70253fa24734bc612e602cb347f629bc59f3c0d83b1c7b59e0cbafdd91ea3') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/${pkgname}-${_dversion}" qmake CONFIG+=multimedia make } @@ -30,7 +31,7 @@ package() { mkdir -p "$pkgdir/usr/share/applications" mkdir -p "$pkgdir/usr/bin" - cd "$srcdir/${pkgname}-${pkgver}" + 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/" From 673afff021efc93f15b78d95384d08e0948d12ec Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 12 Jun 2017 00:34:52 +0200 Subject: [PATCH 10/21] added missing gst-libav for multimedia --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index cad69a8..56c4a8c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,16 +1,16 @@ -# Maintainer: David McInnis +# Maintainer: Giovanni Harting <539@idlegandalf.com> +# Contributor: David McInnis # Contributor: HabarNam pkgname=orion pkgver=1.5.1rc _dversion=1.5.1-rc -pkgrel=1 +pkgrel=2 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') url="https://github.com/alamminsalo/orion/" license=('GPL') -groups=() -depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'hicolor-icon-theme') +depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'hicolor-icon-theme' 'gst-libav') provides=("${pkgname}") conflicts=("${pkgname%-git}") source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz" From c97594f856d9fa1d08fcb398dc09833093a454cc Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 12 Jun 2017 00:48:59 +0200 Subject: [PATCH 11/21] updated .srcinfo --- .SRCINFO | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 89bbd32..4a95dfe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.5.1rc - pkgrel = 1 + pkgrel = 2 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 @@ -10,6 +10,8 @@ pkgbase = orion depends = qt5-svg depends = qt5-quickcontrols depends = qt5-quickcontrols2 + depends = hicolor-icon-theme + depends = gst-libav provides = orion conflicts = orion source = https://github.com/alamminsalo/orion/archive/1.5.1-rc.tar.gz From 55c140320daa3238d80918b41d6f636ad810e017 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 19 Jun 2017 05:57:49 +0200 Subject: [PATCH 12/21] use included .desktop, fix conflicts --- .SRCINFO | 7 ++----- Orion.desktop | 10 ---------- PKGBUILD | 27 +++++++++++---------------- 3 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 Orion.desktop diff --git a/.SRCINFO b/.SRCINFO index 4a95dfe..78299ab 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -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 8065f21..0000000 --- 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 diff --git a/PKGBUILD b/PKGBUILD index 56c4a8c..5abd936 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -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 } From d80f18e2764c055a55caee98694337a6eacc62de Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 27 Jun 2017 12:25:05 +0200 Subject: [PATCH 13/21] v1.6.0-beta --- .SRCINFO | 9 ++++----- PKGBUILD | 15 +++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 78299ab..bbaedb1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,20 +1,19 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.5.1rc - pkgrel = 3 + pkgver = 1.6.0_beta + pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 license = GPL depends = qt5-multimedia depends = qt5-svg - depends = qt5-quickcontrols depends = qt5-quickcontrols2 depends = gst-libav provides = orion conflicts = orion-git - source = https://github.com/alamminsalo/orion/archive/1.5.1-rc.tar.gz - sha256sums = 8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f + source = https://github.com/alamminsalo/orion/archive/v1.6.0-beta.tar.gz + sha256sums = d7ad6670285ca75c53fe899215f0f847e0cda86b7b32a55cdaa3470a750fa77f pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 5abd936..1a6a420 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,27 +3,26 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.5.1rc -_dversion=1.5.1-rc -pkgrel=3 +pkgver=1.6.0_beta +pkgrel=1 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' 'gst-libav') +depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols2' 'gst-libav') provides=("${pkgname}") conflicts=("$pkgname-git") -source=("https://github.com/alamminsalo/orion/archive/${_dversion}.tar.gz") -sha256sums=('8c4e311b6667ca76b121655bf6f9891adc70b9344d3d1bce7adf1664adadc30f') +source=("https://github.com/alamminsalo/orion/archive/v${pkgver//_/\-}.tar.gz") +sha256sums=('d7ad6670285ca75c53fe899215f0f847e0cda86b7b32a55cdaa3470a750fa77f') build() { - cd "$srcdir/${pkgname}-${_dversion}" + cd $srcdir/${pkgname}-${pkgver//_/\-} qmake CONFIG+=multimedia make } package() { - cd "$srcdir/${pkgname}-${_dversion}" + cd $srcdir/${pkgname}-${pkgver//_/\-} sed -e "s|Icon=/usr/local/share/icons/orion.svg|Icon=orion|" -i distfiles/Orion.desktop From 08d8b05a03fda8ce6ca611b908139eb385f6c7e5 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 7 Jul 2017 16:59:23 +0200 Subject: [PATCH 14/21] v1.6.1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bbaedb1..7e81d4a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.6.0_beta + pkgver = 1.6.1 pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 @@ -12,8 +12,8 @@ pkgbase = orion depends = gst-libav provides = orion conflicts = orion-git - source = https://github.com/alamminsalo/orion/archive/v1.6.0-beta.tar.gz - sha256sums = d7ad6670285ca75c53fe899215f0f847e0cda86b7b32a55cdaa3470a750fa77f + source = https://github.com/alamminsalo/orion/archive/v1.6.1.tar.gz + sha256sums = eaa8ace822d3381a1915db82c4203d4ce4e56ec324d4ee18544bd68b00bce749 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 1a6a420..3f42e04 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.6.0_beta +pkgver=1.6.1 pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ depends=('qt5-multimedia' 'qt5-svg' 'qt5-quickcontrols2' 'gst-libav') provides=("${pkgname}") conflicts=("$pkgname-git") source=("https://github.com/alamminsalo/orion/archive/v${pkgver//_/\-}.tar.gz") -sha256sums=('d7ad6670285ca75c53fe899215f0f847e0cda86b7b32a55cdaa3470a750fa77f') +sha256sums=('eaa8ace822d3381a1915db82c4203d4ce4e56ec324d4ee18544bd68b00bce749') build() { cd $srcdir/${pkgname}-${pkgver//_/\-} From cdc852f77527c7c1e29862124e8316a924725d54 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 12 Jul 2017 13:35:05 +0200 Subject: [PATCH 15/21] 1.6.1-2: switched to mpv as player backend --- .SRCINFO | 5 ++--- PKGBUILD | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7e81d4a..8722e18 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,14 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.6.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 license = GPL - depends = qt5-multimedia + depends = mpv depends = qt5-svg depends = qt5-quickcontrols2 - depends = gst-libav provides = orion conflicts = orion-git source = https://github.com/alamminsalo/orion/archive/v1.6.1.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3f42e04..81a2fb8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,12 +4,12 @@ pkgname=orion pkgver=1.6.1 -pkgrel=1 +pkgrel=2 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-quickcontrols2' 'gst-libav') +depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2') provides=("${pkgname}") conflicts=("$pkgname-git") source=("https://github.com/alamminsalo/orion/archive/v${pkgver//_/\-}.tar.gz") @@ -17,7 +17,7 @@ sha256sums=('eaa8ace822d3381a1915db82c4203d4ce4e56ec324d4ee18544bd68b00bce749') build() { cd $srcdir/${pkgname}-${pkgver//_/\-} - qmake CONFIG+=multimedia + qmake CONFIG+=mpv make } From 3a1600b83ffbcef2a86f0647908a130c74c8fff7 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sun, 23 Jul 2017 10:05:34 +0200 Subject: [PATCH 16/21] v1.6.1-3, added missing deps --- .SRCINFO | 4 +++- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8722e18..c8d893c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.6.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/alamminsalo/orion/ arch = x86_64 arch = i686 @@ -9,6 +9,8 @@ pkgbase = orion depends = mpv depends = qt5-svg depends = qt5-quickcontrols2 + depends = qt5-quickcontrols + depends = qt5-graphicaleffects provides = orion conflicts = orion-git source = https://github.com/alamminsalo/orion/archive/v1.6.1.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 81a2fb8..70e9e74 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,12 +4,12 @@ pkgname=orion pkgver=1.6.1 -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=('mpv' 'qt5-svg' 'qt5-quickcontrols2') +depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphicaleffects') provides=("${pkgname}") conflicts=("$pkgname-git") source=("https://github.com/alamminsalo/orion/archive/v${pkgver//_/\-}.tar.gz") From 7bcd249824ba97ffae7ee1f9c29e79b90210bf99 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 5 Mar 2018 00:26:52 +0100 Subject: [PATCH 17/21] v1.6.5 --- .SRCINFO | 9 ++++----- PKGBUILD | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c8d893c..53452db 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,10 +1,9 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.6.1 - pkgrel = 3 + pkgver = 1.6.5 + pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 - arch = i686 license = GPL depends = mpv depends = qt5-svg @@ -13,8 +12,8 @@ pkgbase = orion depends = qt5-graphicaleffects provides = orion conflicts = orion-git - source = https://github.com/alamminsalo/orion/archive/v1.6.1.tar.gz - sha256sums = eaa8ace822d3381a1915db82c4203d4ce4e56ec324d4ee18544bd68b00bce749 + source = https://github.com/alamminsalo/orion/archive/1.6.5.tar.gz + sha256sums = 6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 70e9e74..7b36e68 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.6.1 -pkgrel=3 +pkgver=1.6.5 +pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" -arch=('x86_64' 'i686') +arch=('x86_64') url="https://github.com/alamminsalo/orion/" license=('GPL') depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphicaleffects') provides=("${pkgname}") conflicts=("$pkgname-git") -source=("https://github.com/alamminsalo/orion/archive/v${pkgver//_/\-}.tar.gz") -sha256sums=('eaa8ace822d3381a1915db82c4203d4ce4e56ec324d4ee18544bd68b00bce749') +source=("https://github.com/alamminsalo/orion/archive/${pkgver//_/\-}.tar.gz") +sha256sums=('6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853') build() { cd $srcdir/${pkgname}-${pkgver//_/\-} From e03643fe7fefc5801b70f46c05cce8ee5d5efa3f Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 7 May 2018 02:11:43 +0200 Subject: [PATCH 18/21] 1.6.5-2: removed pkgname from provides --- .SRCINFO | 3 +-- PKGBUILD | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 53452db..a43547c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.6.5 - pkgrel = 1 + pkgrel = 2 url = https://github.com/alamminsalo/orion/ arch = x86_64 license = GPL @@ -10,7 +10,6 @@ pkgbase = orion depends = qt5-quickcontrols2 depends = qt5-quickcontrols depends = qt5-graphicaleffects - provides = orion conflicts = orion-git source = https://github.com/alamminsalo/orion/archive/1.6.5.tar.gz sha256sums = 6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853 diff --git a/PKGBUILD b/PKGBUILD index 7b36e68..07b10b7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,12 @@ pkgname=orion pkgver=1.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64') url="https://github.com/alamminsalo/orion/" license=('GPL') depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphicaleffects') -provides=("${pkgname}") conflicts=("$pkgname-git") source=("https://github.com/alamminsalo/orion/archive/${pkgver//_/\-}.tar.gz") sha256sums=('6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853') From 4367d84346accd1ac05b7d37b3662c1f803ffda5 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 25 May 2018 20:10:33 +0200 Subject: [PATCH 19/21] 1.6.5-3: further improvements (thanks to sum01) --- .SRCINFO | 7 +++---- PKGBUILD | 21 +++++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a43547c..fba822a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,17 +1,16 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.6.5 - pkgrel = 2 + pkgrel = 3 url = https://github.com/alamminsalo/orion/ arch = x86_64 - license = GPL + license = GPL3 depends = mpv depends = qt5-svg depends = qt5-quickcontrols2 depends = qt5-quickcontrols depends = qt5-graphicaleffects - conflicts = orion-git - source = https://github.com/alamminsalo/orion/archive/1.6.5.tar.gz + source = orion-1.6.5.tar.gz::https://github.com/alamminsalo/orion/archive/1.6.5.tar.gz sha256sums = 6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 07b10b7..889ad02 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,31 +1,28 @@ # Maintainer: Giovanni Harting <539@idlegandalf.com> +# Contributor: sum01 # Contributor: David McInnis # Contributor: HabarNam pkgname=orion pkgver=1.6.5 -pkgrel=2 +pkgrel=3 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64') url="https://github.com/alamminsalo/orion/" -license=('GPL') +license=('GPL3') depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphicaleffects') -conflicts=("$pkgname-git") -source=("https://github.com/alamminsalo/orion/archive/${pkgver//_/\-}.tar.gz") +source=("$pkgname-$pkgver.tar.gz::https://github.com/alamminsalo/orion/archive/${pkgver}.tar.gz") sha256sums=('6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853') build() { - cd $srcdir/${pkgname}-${pkgver//_/\-} + cd "$srcdir/${pkgname}-${pkgver}" qmake CONFIG+=mpv make } package() { - cd $srcdir/${pkgname}-${pkgver//_/\-} - - 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 + cd "$srcdir/${pkgname}-${pkgver}" + 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" } From 9da0873cb25e1312f0374a5f2d9a328c028187d5 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 17 Oct 2018 10:09:06 +0200 Subject: [PATCH 20/21] 1.6.6-1 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fba822a..e7ce07f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv - pkgver = 1.6.5 - pkgrel = 3 + pkgver = 1.6.6 + pkgrel = 1 url = https://github.com/alamminsalo/orion/ arch = x86_64 license = GPL3 @@ -10,8 +10,8 @@ pkgbase = orion depends = qt5-quickcontrols2 depends = qt5-quickcontrols depends = qt5-graphicaleffects - source = orion-1.6.5.tar.gz::https://github.com/alamminsalo/orion/archive/1.6.5.tar.gz - sha256sums = 6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853 + source = orion-1.6.6.tar.gz::https://github.com/alamminsalo/orion/archive/1.6.6.tar.gz + sha256sums = 3c8750555e9302e49904c43f35f2c2870a0224a231304c63301b9112471575e1 pkgname = orion diff --git a/PKGBUILD b/PKGBUILD index 889ad02..f99d294 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: HabarNam pkgname=orion -pkgver=1.6.5 -pkgrel=3 +pkgver=1.6.6 +pkgrel=1 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64') url="https://github.com/alamminsalo/orion/" license=('GPL3') depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphicaleffects') source=("$pkgname-$pkgver.tar.gz::https://github.com/alamminsalo/orion/archive/${pkgver}.tar.gz") -sha256sums=('6ec51b063b7025e7cc0aaf09e8a6f9943d0d0a44ba768d2bb2bbd0e6ee60f853') +sha256sums=('3c8750555e9302e49904c43f35f2c2870a0224a231304c63301b9112471575e1') build() { cd "$srcdir/${pkgname}-${pkgver}" From dfe7057edb0f0fe6d39c2b3173334451d9d1404b Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 17 Oct 2018 10:37:23 +0200 Subject: [PATCH 21/21] 1.6.6-2: workaround for build failure #253 --- .SRCINFO | 2 +- PKGBUILD | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e7ce07f..96c0577 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = orion pkgdesc = QML/C++-written desktop client for Twitch.tv pkgver = 1.6.6 - pkgrel = 1 + pkgrel = 2 url = https://github.com/alamminsalo/orion/ arch = x86_64 license = GPL3 diff --git a/PKGBUILD b/PKGBUILD index f99d294..a83cf07 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=orion pkgver=1.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="QML/C++-written desktop client for Twitch.tv" arch=('x86_64') url="https://github.com/alamminsalo/orion/" @@ -14,6 +14,13 @@ depends=('mpv' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-graphical source=("$pkgname-$pkgver.tar.gz::https://github.com/alamminsalo/orion/archive/${pkgver}.tar.gz") sha256sums=('3c8750555e9302e49904c43f35f2c2870a0224a231304c63301b9112471575e1') +prepare() { + cd "$srcdir/${pkgname}-${pkgver}" + + # Fix for https://github.com/alamminsalo/orion/issues/253 + sed -i 's/c++11/c++14/g' orion.pro +} + build() { cd "$srcdir/${pkgname}-${pkgver}" qmake CONFIG+=mpv