summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinze Zwerver2018-07-30 15:29:10 +0200
committerMinze Zwerver2018-07-30 15:29:10 +0200
commitcfa17019287bd41ff67ec7d07750af0be886d080 (patch)
treeae9c81f905e42e3a7ba46b160d86191c07c803ae
parent20c398d091af8971143b331890e3aa1d73253dd0 (diff)
downloadaur-cfa17019287bd41ff67ec7d07750af0be886d080.tar.gz
quick update to 2.2.2
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD18
2 files changed, 14 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2bd86a9ae55..d59d075427e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = opentx-companion
pkgdesc = EEPROM Editor for OpenTX RC transmitter firmwares
- pkgver = 2.2.1
- pkgrel = 3
+ pkgver = 2.2.2
+ pkgrel = 1
url = http://www.open-tx.org/
arch = x86_64
license = GPL
@@ -18,6 +18,7 @@ pkgbase = opentx-companion
makedepends = arm-none-eabi-binutils
makedepends = arm-none-eabi-newlib
makedepends = fox
+ makedepends = python-pillow
depends = qt5-base
depends = qt5-multimedia
depends = qt5-svg
@@ -27,12 +28,10 @@ pkgbase = opentx-companion
provides = companion
conflicts = companion
conflicts = companion9x-svn
- source = https://github.com/opentx/opentx/archive/2.2.1.tar.gz
+ source = https://github.com/opentx/opentx/archive/2.2.2.tar.gz
source = installprefix.patch
- source = qt5_modules.patch
- sha256sums = 626e8f6c48d686b41311b633326811cab6788bb667185cb0e3ec0f0d627390af
+ sha256sums = 234c2cec0ad0f6804e233bd63081b2f81a1d4f780eb9f15d13df7861115cb078
sha256sums = 9d669cf723e98b7be5463538b0590ae7776b3b866a423cceeb30ba9840748c64
- sha256sums = 30fd1396a47bfc250780786e52447547aafcf934c6fe1775e4301fa3c7185be2
pkgname = opentx-companion
diff --git a/PKGBUILD b/PKGBUILD
index b43f4862272..1d21f423f62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,37 @@
# Previous Maintainer: Jeff Youdontneedtoknow <jeffpublicjr at gmail dot com>
# Contributer: Arnaud
pkgname=('opentx-companion')
-pkgver=2.2.1
-pkgrel=3
+pkgver=2.2.2
+pkgrel=1
pkgdesc="EEPROM Editor for OpenTX RC transmitter firmwares"
arch=('x86_64')
url="http://www.open-tx.org/"
license=('GPL')
depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'sdl' 'hicolor-icon-theme')
optdepends=('dfu-util: tool for flashing stm32 based radios')
-makedepends=('cmake' 'xsd' 'bc' 'python' 'avr-gcc' 'avr-libc' 'sed' 'qt5-tools' 'python-pyqt5' 'arm-none-eabi-gcc' 'arm-none-eabi-binutils' 'arm-none-eabi-newlib' 'fox')
+makedepends=('cmake' 'xsd' 'bc' 'python' 'avr-gcc' 'avr-libc' 'sed' 'qt5-tools' 'python-pyqt5' 'arm-none-eabi-gcc' 'arm-none-eabi-binutils' 'arm-none-eabi-newlib' 'fox' 'python-pillow')
provides=('companion')
conflicts=('companion' 'companion9x-svn')
source=("https://github.com/opentx/opentx/archive/$pkgver.tar.gz"
"installprefix.patch"
-"qt5_modules.patch"
)
+#"qt5_modules.patch"
sha256sums=(
- '626e8f6c48d686b41311b633326811cab6788bb667185cb0e3ec0f0d627390af'
+ '234c2cec0ad0f6804e233bd63081b2f81a1d4f780eb9f15d13df7861115cb078'
'9d669cf723e98b7be5463538b0590ae7776b3b866a423cceeb30ba9840748c64'
- '30fd1396a47bfc250780786e52447547aafcf934c6fe1775e4301fa3c7185be2'
)
+ #'30fd1396a47bfc250780786e52447547aafcf934c6fe1775e4301fa3c7185be2'
build() {
patch $srcdir/opentx-$pkgver/tools/build-companion-release.sh $startdir/installprefix.patch
- cd $srcdir/opentx-$pkgver
- patch -t -p 1 < $startdir/qt5_modules.patch
+# cd $srcdir/opentx-$pkgver
+# patch -t -p 1 < $startdir/qt5_modules.patch
$srcdir/opentx-$pkgver/tools/build-companion-release.sh $srcdir/opentx-$pkgver dummy
}
package() {
- cd $srcdir/opentx-$pkgver/build
+ cd $srcdir/build
make -j`nproc` DESTDIR=$pkgdir/ install
cd $pkgdir/usr/share/applications
sed -i -e 's/Categories=Application/Categories=Development;/' companion22.desktop