summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD49
-rwxr-xr-xxperia-flashtool3
-rw-r--r--xperia-flashtool.desktop15
3 files changed, 37 insertions, 30 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0f9f3c031261..c53c04997c01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,35 +6,40 @@
# Contributor: laguCool <NONE>
# Maintainer: Martin Stibor <martin.von.reichenberg@proton.me>
-pkgname=xperia-flashtool
-_pkgname=Flashtool
+pkgname=xperia-flashtool-bin
+_pkgname=xperia-flashtool
+__pkgname=Flashtool
pkgver=0.9.36.0
-pkgrel=4
+pkgrel=1
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=('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=("${_pkgname}-${pkgver}.tar.bz2::https://github.com/Androxyde/Flashtool/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.bz2"
- "${pkgname}" "${pkgname}.desktop" "${pkgname}.png")
+depends=('systemd-libs' 'bash' 'glib2' 'glibc' 'alsa-lib' 'mono' 'java-runtime-common' 'java-environment-common'
+ 'libx11' 'gcc-libs' 'libxrender' 'freetype2' 'libxext' 'libxtst' 'libxi' 'zlib')
+makedepends=('tar' 'fdupes' 'desktop-file-utils')
+provides=("xperia-flashtool=${pkgver}" 'adb' 'bin2elf' 'bin2sin' 'fastboot' 'unyaffs' 'libusbx-1.0.so.0.2.0')
+conflicts=("xperia-flashtool")
+source=("${__pkgname}-${pkgver}.tar.bz2::https://github.com/Androxyde/Flashtool/releases/download/${pkgver}/${__pkgname}-${pkgver}.tar.bz2"
+ "${_pkgname}" "${_pkgname}.desktop" "${_pkgname}.png")
md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
options=('!strip')
-build() {
- tar -xf "${srcdir}/${_pkgname}-${pkgver}.tar.bz2"
-}
-
package() {
- # Install program files
- install -dm644 "${pkgdir}/opt/${pkgname}"
- cp -a "${srcdir}/${_pkgname}/." -t "${pkgdir}/opt/${pkgname}"
- chmod 0755 "${pkgdir}/opt/${pkgname}/FlashTool"
- install -dm755 "${pkgdir}/usr/bin/"
- install -Dm755 "${srcdir}/${pkgname}" -t "${pkgdir}/usr/bin/"
- install -Dm644 "${srcdir}/${pkgname}.png" -t "${pkgdir}/usr/share/icons/"
- install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
- install -Dm644 "${srcdir}/${_pkgname}/x10flasher_native/udev/libusbx-1.0.so.0.2.0" \
- "${pkgdir}/usr/lib/${pkgname}/x10flasher_native/udev/libusbx-1.0.so.0.2.0"
+ mkdir -p "${pkgdir}/opt/"
+ tar -xf "${srcdir}/${__pkgname}-${pkgver}.tar.bz2" -C "${pkgdir}/opt/"
+
+ mv -f "${pkgdir}/opt/${__pkgname}/" "${pkgdir}/opt/${_pkgname}/"
+ chmod -f -R 0755 "${pkgdir}/opt/${_pkgname}/"
+
+ install -Dm755 "${srcdir}/${_pkgname}" -t "${pkgdir}/usr/bin/"
+ install -Dm644 "${srcdir}/${_pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
+ install -Dm644 "${srcdir}/${_pkgname}.png" -t "${pkgdir}/usr/share/icons/"
+
+ mkdir -p "${pkgdir}/usr/lib/"
+ cp -a "${pkgdir}/opt/${_pkgname}/x10flasher_native/udev/libusbx-1.0.so.0.2.0" -t "${pkgdir}/usr/lib/"
+ ln -s /opt/${_pkgname}/x10flasher_native/{adb,bin2elf,bin2sin,fastboot,unyaffs} -t "${pkgdir}/usr/bin/"
+
+ fdupes -r -s "${pkgdir}/"
+ desktop-file-validate "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
}
diff --git a/xperia-flashtool b/xperia-flashtool
index 228e072429b1..e1654d2d2c05 100755
--- a/xperia-flashtool
+++ b/xperia-flashtool
@@ -1,6 +1,3 @@
#!/usr/bin/bash
-
-export JAVA_HOME="/usr/lib/jvm/$(archlinux-java get)"
-
pkexec env "DISPLAY=$DISPLAY" "XAUTHORITY=$XAUTHORITY" "/opt/xperia-flashtool/FlashTool" "$@"
diff --git a/xperia-flashtool.desktop b/xperia-flashtool.desktop
index aef3f59a0363..986f99760d5c 100644
--- a/xperia-flashtool.desktop
+++ b/xperia-flashtool.desktop
@@ -1,9 +1,14 @@
[Desktop Entry]
Type=Application
-Version=1.0
+Version=1.5
Name=Xperia Flashtool
-GenericName=Flashing Utility for Android Phones
-Comment=A S1 protocol flashing software for Sony Xperia phones
-Icon=/usr/share/icons/xperia-flashtool.png
-Exec=/usr/bin/xperia-flashtool
+GenericName=Flashing Utility for SONY Xperia Android Phones
+Comment=A S1 protocol flashing software for SONY Xperia phones
+Icon=xperia-flashtool
+TryExec=xperia-flashtool
+Exec=xperia-flashtool
+Path=/opt/xperia-flashtool/
Categories=Utility
+Keywords=S1; Flash; Flashing; Protocol; SIN; BIN; ADB; FastBoot Mode; Flash Mode; Xperi-Firm; Firmware; Extract; Xperia Home; Android; SmartPhone; USB; Cable; Connection;
+SingleMainWindow=true
+StartupWMClass=Flashtool