From 4630e6e462ab4b5800da6e989302e2d4919b62af Mon Sep 17 00:00:00 2001
From: horstderheld <github@bremsspur.org>
Date: Fri, 5 Nov 2021 18:13:31 +0100
Subject: [PATCH] initial commit

---
 .SRCINFO      | 30 ++++++++++++++++--------------
 PKGBUILD      |  6 +++---
 install.patch | 13 ++++++-------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a082081..4773f26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,32 +5,34 @@ pkgbase = edgetx-companion
 	url = https://edgetx.org/
 	arch = x86_64
 	license = GPL-2.0
-	makedepends = cmake
-	makedepends = gcc
-	makedepends = git
-	makedepends = xsd
-	makedepends = bc
-	makedepends = python
+	makedepends = arm-none-eabi-binutils
+	makedepends = arm-none-eabi-gcc
+	makedepends = arm-none-eabi-newlib
 	makedepends = avr-gcc
 	makedepends = avr-libc
-	makedepends = sed
-	makedepends = qt5-tools
-	makedepends = python-pyqt5
-	makedepends = arm-none-eabi-gcc
-	makedepends = arm-none-eabi-binutils
-	makedepends = arm-none-eabi-newlib
+	makedepends = bc
+	makedepends = cmake
 	makedepends = fox
+	makedepends = gcc
+	makedepends = git
+	makedepends = python
 	makedepends = python-pillow
+	makedepends = python-pyqt5
+	makedepends = qt5-svg
+	makedepends = qt5-tools
+	makedepends = qt5-translations
+	makedepends = sed
+	makedepends = xsd
+	depends = hicolor-icon-theme
 	depends = qt5-base
 	depends = qt5-multimedia
 	depends = sdl
-	depends = hicolor-icon-theme
 	optdepends = dfu-util: tool for flashing stm32 based radios
 	provides = companion
 	conflicts = companion
 	source = git+https://github.com/EdgeTX/edgetx.git#tag=v2.5.0
 	source = install.patch
 	sha256sums = SKIP
-	sha256sums = f156dfd0800251ea78ff01fb32704e5a5a826360d3f2da57b7d877521ba61a45
+	sha256sums = 36bf7c59adfe9221f8b03809e0ca0dc537328e239b2384829fb17290137e5005
 
 pkgname = edgetx-companion
diff --git a/PKGBUILD b/PKGBUILD
index e2f73c6..9a66a3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,9 +12,9 @@ pkgdesc="EEPROM Editor for EdgeTX RC transmitter firmwares"
 arch=('x86_64')
 url='https://edgetx.org/'
 license=('GPL-2.0')
-depends=('qt5-base' 'qt5-multimedia' 'sdl' 'hicolor-icon-theme')
+depends=('hicolor-icon-theme' 'qt5-base' 'qt5-multimedia' 'sdl')
 optdepends=('dfu-util: tool for flashing stm32 based radios')
-makedepends=('cmake' 'gcc' 'git' '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')
+makedepends=('arm-none-eabi-binutils' 'arm-none-eabi-gcc' 'arm-none-eabi-newlib' 'avr-gcc' 'avr-libc' 'bc' 'cmake' 'fox' 'gcc' 'git' 'python' 'python-pillow' 'python-pyqt5' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'sed' 'xsd')
 provides=('companion')
 conflicts=('companion')
 source=("git+https://github.com/EdgeTX/edgetx.git#tag=v${pkgver}"
@@ -22,7 +22,7 @@ source=("git+https://github.com/EdgeTX/edgetx.git#tag=v${pkgver}"
 
 )
 sha256sums=('SKIP'
-            'f156dfd0800251ea78ff01fb32704e5a5a826360d3f2da57b7d877521ba61a45')
+            '36bf7c59adfe9221f8b03809e0ca0dc537328e239b2384829fb17290137e5005')
 
 prepare() {
   cd ${_pkgbase}
diff --git a/install.patch b/install.patch
index f8d5ec1..7e48da5 100644
--- a/install.patch
+++ b/install.patch
@@ -1,16 +1,15 @@
-@@ -4,7 +4,10 @@
+@@ -4,7 +4,9 @@
  set -e
  set -x
  
 -if [ "$(uname)" = "Darwin" ]; then
-+if [[ ! -z "MAKEFLAGS" ]] 
-+then
-+    JOBS="${MAKEFLAGS:2}"
++if [[ ! -z "MAKEFLAGS" ]]; then
++  JOBS="${MAKEFLAGS:2}"
 +elif [ "$(uname)" = "Darwin" ]; then
    num_cpus=$(sysctl -n hw.ncpu)
    : "${JOBS:=$num_cpus}"
  else
-@@ -30,7 +33,7 @@
+@@ -30,7 +32,7 @@
  SRCDIR=$1
  OUTDIR=$2
  
@@ -19,7 +18,7 @@
  if [ "$(uname)" = "Darwin" ]; then
      COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
  elif [ "$(uname)" != "Linux" ]; then
-@@ -41,9 +44,9 @@
+@@ -41,9 +43,9 @@
    COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
  fi
  
@@ -32,7 +31,7 @@
  
  cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
  make -j${JOBS} libsimulator
-@@ -128,13 +131,3 @@
+@@ -128,13 +130,3 @@
  cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR}
  make -j${JOBS} libsimulator