Updated the PKGBUILD file to match Arch Linux' official packaging guidelines - getting things into a proper order ++ Updated DEPENDENCIES to 'make sure' nothing is missing.

3 files changed, 33 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15dcd3993aa7..10cf2ca1eed2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,30 @@
 pkgbase = xperia-flashtool
-	pkgdesc = A S1 protocol flashing software for Sony Xperia phones
+	pkgdesc = Flashtool is a S1 protocol flashing software that can be used to flash firmwares for Sony Xperia smartphones
 	pkgver = 0.9.36.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.flashtool.net/
-	arch = x86_64
+	arch = any
 	license = GPL3
 	makedepends = base-devel
-	depends = libselinux
-	depends = libsystemd
+	depends = systemd
+	depends = systemd-libs
+	depends = bash
 	depends = glib2
+	depends = glibc
+	depends = alsa-lib
 	depends = mono
 	depends = jre-openjdk
 	depends = java-environment-common
+	depends = libx11
+	depends = gcc-libs
+	depends = libxrender
+	depends = freetype2
+	depends = libxext
+	depends = libxtst
+	depends = libxi
+	depends = zlib
+	depends = lib32-gcc-libs
+	depends = lib32-glibc
 	options = !strip
 	source = https://github.com/Androxyde/Flashtool/releases/download/0.9.36.0/Flashtool-0.9.36.0.tar.bz2
 	source = xperia-flashtool.desktop
diff --git a/PKGBUILD b/PKGBUILD
index a594eac6d71f..6b3580377534 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,30 @@
-# Maintainer: Martin Stibor <martin.von.reichenberg@proton.me>
-# Contributor: BrLi <hidden>
-# Contributor: philacs <yue.liu@mail.com>
+# Author:       Androxyde <NONE>
+# Contributor:  Bin4ry <NONE>
+# Contributor:  DooMLoRD <NONE>
+# Contributor:  [NUT] <NONE>
+# Contributor:  DevShaft <NONE>
+# Contributor:  laguCool <NONE>
+# Maintainer:   Martin Stibor <martin.von.reichenberg@proton.me>
 
 pkgname=xperia-flashtool
 _pkgname=Flashtool
 pkgver=0.9.36.0
-pkgrel=2
-pkgdesc="A S1 protocol flashing software for Sony Xperia phones"
-arch=('x86_64')
+pkgrel=3
+pkgdesc="Flashtool is a S1 protocol flashing software that can be used to flash firmwares for Sony Xperia smartphones"
+arch=('any')
 url="http://www.flashtool.net/"
 license=('GPL3')
-depends=('libselinux' 'libsystemd' 'glib2' 'mono' 'jre-openjdk' 'java-environment-common')
+depends=('systemd' 'systemd-libs' 'bash' 'glib2' 'glibc' 'alsa-lib' 'mono' 'jre-openjdk' 'java-environment-common'
+         'libx11' 'gcc-libs' 'libxrender' 'freetype2' 'libxext' 'libxtst' 'libxi' 'zlib' 'lib32-gcc-libs' 'lib32-glibc')
 makedepends=('base-devel')
-# ${source} obtained from upstream project ${url}
 source=("https://github.com/Androxyde/Flashtool/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop"
-        "${pkgname}.png")
+        "$pkgname.desktop" "$pkgname.png")
 # Upstream archive and launcher script
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP')
+md5sums=('SKIP' 'SKIP' 'SKIP')
 options=('!strip')
 
 build() {
-  tar -xf ${_pkgname}-${pkgver}.tar.bz2
+  tar -xf "${_pkgname}"-"${pkgver}".tar.bz2
 }
 
 package() {
diff --git a/xperia-flashtool.sh b/xperia-flashtool.sh
deleted file mode 100755
index fb569f5893c6..000000000000
--- a/xperia-flashtool.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-  APP_CMD='FlashTool'
-else
-  case "$1" in
-    -c|--console)
-      APP_CMD='FlashToolConsole'
-      shift
-      ;;
-    -g|--graphical)
-      APP_CMD='FlashTool'
-      shift
-      ;;
-    *)
-      cat << EOF
-Usage: $0 [OPTIONS]
-
-Options are:
-    -h, --help                       : show this help
-    -c, --console                    : console mode usage
-    -g, --graphical                  : graphical mode usage
-EOF
-      exit 1
-      ;;
-  esac
-fi
-
-if [ -d "/usr/lib/xperia-flashtool/firmwares" ]
-then
-  mkdir -p "$HOME/.flashTool/firmwares"
-  mv /usr/lib/xperia-flashtool/firmwares/* "$HOME/.flashTool/firmwares"
-fi
-
-/usr/lib/xperia-flashtool/${APP_CMD} $@