Changed the program according to the upstream changes of the provided binary Linux package, more dependencies added; a new GUI launching desktop icon created. Enjoy ...

4 files changed, 30 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c171edf2d0dc..15dcd3993aa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = xperia-flashtool
 	pkgdesc = A S1 protocol flashing software for Sony Xperia phones
 	pkgver = 0.9.36.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.flashtool.net/
 	arch = x86_64
 	license = GPL3
+	makedepends = base-devel
 	depends = libselinux
 	depends = libsystemd
 	depends = glib2
@@ -13,7 +14,9 @@ pkgbase = xperia-flashtool
 	depends = java-environment-common
 	options = !strip
 	source = https://github.com/Androxyde/Flashtool/releases/download/0.9.36.0/Flashtool-0.9.36.0.tar.bz2
-	source = xperia-flashtool.sh
+	source = xperia-flashtool.desktop
+	source = xperia-flashtool.png
+	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 8893659ba5c5..76fa79faeaa5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,35 @@
 pkgname=xperia-flashtool
 _pkgname=Flashtool
 pkgver=0.9.36.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A S1 protocol flashing software for Sony Xperia phones"
 arch=('x86_64')
 url="http://www.flashtool.net/"
 license=('GPL3')
 depends=('libselinux' 'libsystemd' 'glib2' 'mono' 'jre-openjdk' 'java-environment-common')
+makedepends=('base-devel')
 # ${source} obtained from upstream project ${url}
 source=("https://github.com/Androxyde/Flashtool/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.bz2"
-        "${pkgname}.sh")
+        "${pkgname}.desktop"
+        "${pkgname}.png")
 # Upstream archive and launcher script
 md5sums=('SKIP'
+         'SKIP'
          'SKIP')
 options=('!strip')
 
+build() {
+  tar -xf ${_pkgname}-${pkgver}.tar.bz2
+}
+
 package() {
   # Install program files
-  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
-  cp -rt "${pkgdir}/usr/lib/${pkgname}" Flashtool/*
-  # Install launcher scripts
-  install -m 755 -d "${pkgdir}/usr/bin"
-  install -m 755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -m 644 -d "${pkgdir}"/opt/"${pkgname}"
+  cp -a "${_pkgname}"/. "${pkgdir}"/opt/"${pkgname}"
+  chmod 755 "${pkgdir}"/opt/"${pkgname}"
+  install -m 755 -d "${pkgdir}"/usr/bin/
+  ln -s "${pkgdir}"/opt/"${pkgname}"/FlashTool "${pkgdir}"/usr/bin/"${pkgname}"
+  install -Dm644 "${pkgname}".png "${pkgdir}"/usr/share/icons/xperia-flashtool.png
+  install -Dm644 "${pkgname}".desktop "${pkgdir}"/usr/share/applications/xperia-flashtool.desktop
+  install -Dm644 "${_pkgname}"/x10flasher_native/udev/libusbx-1.0.so.0.2.0 "${pkgdir}"/usr/lib/xperia-flashtool/x10flasher_native/udev/libusbx-1.0.so.0.2.0
 }
diff --git a/xperia-flashtool.desktop b/xperia-flashtool.desktop
new file mode 100644
index 000000000000..c9642737bc7a
--- /dev/null
+++ b/xperia-flashtool.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=0.9.36.0
+Type=Application
+Name=Xperia Flashtool
+Comment=A S1 protocol flashing software for Sony Xperia phones
+Icon=/usr/share/icons/xperia-flashtool.png
+Exec=pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY /usr/bin/xperia-flashtool
+Categories=Utility
diff --git a/xperia-flashtool.png b/xperia-flashtool.png
new file mode 100644
index 000000000000..6687a2b62a11
--- /dev/null
+++ b/xperia-flashtool.png