STILL GRADLE BUILD PROBLEMS -- Not fixed upstream yet, patches welcome; Please use the pre-built binary `xperia-flashtool` package instead . . .

3 files changed, 21 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c90248a728dc..aae4ddba0812 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xperia-flashtool-git
 	pkgdesc = A S1 protocol flashing software for Sony Xperia phones
-	pkgver = 0.9.24.2.r151.g7529dce
-	pkgrel = 1
+	pkgver = 0.9.36.0.r7.g7529dce
+	pkgrel = 2
 	url = http://www.flashtool.net/
 	arch = x86_64
 	license = GPL3+
@@ -14,8 +14,7 @@ pkgbase = xperia-flashtool-git
 	depends = glib2
 	depends = mono
 	depends = java-environment-common
-	options = !strip
-	source = Flashtool::git+https://github.com/Androxyde/Flashtool#branch=master
+	source = Flashtool-0.9.36.0.r7.g7529dce::git+https://github.com/Androxyde/Flashtool#branch=master
 	source = xperia-flashtool.desktop
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 81aa1cb9ede9..9886711a9fe6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,28 @@
 pkgname=xperia-flashtool-git
 _pkgname=Flashtool
 __pkgname=xperia-flashtool
-pkgver=0.9.24.2.r151.g7529dce
-pkgrel=1
+pkgver=0.9.36.0.r7.g7529dce
+pkgrel=2
 pkgdesc='A S1 protocol flashing software for Sony Xperia phones'
 arch=('x86_64')
 license=('GPL3+')
 url="http://www.flashtool.net/"
 depends=('systemd-libs' 'glib2' 'mono' 'java-environment-common')
 makedepends=('git' 'base-devel' 'gradle' 'java-environment-common' 'mono-tools')
-source=('Flashtool::git+https://github.com/Androxyde/Flashtool#branch=master' 'xperia-flashtool.desktop')
+source=("${_pkgname}-${pkgver}::git+https://github.com/Androxyde/Flashtool#branch=master"
+        'xperia-flashtool.desktop')
 md5sums=('SKIP' 'SKIP')
-options=('!strip')
 
 pkgver() {
-  cd "${_pkgname}"
+  cd "${_pkgname}-${pkgver}/"
   ( set -o pipefail
-    git describe --long --abbrev=7 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
   )
 }
 
 build() {
-   cd "${srcdir}"/Flashtool
+   cd "${_pkgname}-${pkgver}/"
    export JAVA_HOME=$(find /usr/lib/jvm -name 'javac' | sed "s:/bin/javac::")
    export JAVA_HOME=/usr/lib/jvm/$(archlinux-java get)
    gradle
@@ -31,13 +31,11 @@ build() {
 
 package() {
   # Install program files
-  install -m 755 -d "${pkgdir}"/usr/bin
-  install -m 755 -d "${pkgdir}"/usr/lib
-  install -m 755 -d "${pkgdir}"/usr/share
-  install -m 755 -d "${pkgdir}"/usr/share/applications
-  mv "${srcdir}"/Deploy/"${_pkgname}" "${pkgdir}"/usr/lib/"${__pkgname}"
-  ln -s "${JAVA_HOME}" "${pkgdir}"/usr/lib/${_pkgname}/x10flasher_native/jre
-  ln -s /usr/lib/"${_pkgname}"/"${_pkgname}" "${pkgdir}"/usr/bin/"${__pkgname}"
-  install -Dm644 "${_pkgname}"/src/gui/ressources/icons/flash_512.png "${pkgdir}"/usr/share/icons/"${__pkgname}".png
-  install -Dm644 "${__pkgname}".desktop "${pkgdir}"/usr/share/applications/"${__pkgname}".desktop
+  install -dm755 "${pkgdir}/usr/bin/"
+  install -dm755 "${pkgdir}/usr/lib/"
+  install -Dm755 "${srcdir}/Deploy/${_pkgname}" "${pkgdir}/usr/lib/${__pkgname}"
+  ln -s "${JAVA_HOME}" "${pkgdir}/usr/lib/${_pkgname}/x10flasher_native/jre"
+  ln -s "/usr/lib/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${__pkgname}"
+  install -Dm644 "${_pkgname}/src/gui/ressources/icons/flash_512.png" "${pkgdir}/usr/share/icons/${__pkgname}.png"
+  install -Dm644 "${__pkgname}.desktop" "${pkgdir}/usr/share/applications/${__pkgname}.desktop"
 }
diff --git a/xperia-flashtool.desktop b/xperia-flashtool.desktop
index 5b74959fe135..aef3f59a0363 100755
--- a/xperia-flashtool.desktop
+++ b/xperia-flashtool.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Version=1.0
 Type=Application
+Version=1.0
 Name=Xperia Flashtool
+GenericName=Flashing Utility for Android Phones
 Comment=A S1 protocol flashing software for Sony Xperia phones
-Icon=/usr/share/icons/Flashtool.png
-Exec=pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY /usr/bin/xperia-flashtool
+Icon=/usr/share/icons/xperia-flashtool.png
+Exec=/usr/bin/xperia-flashtool
 Categories=Utility