Update from official package

4 files changed, 43 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8b4fecf21db..1be7c6e2a5cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
 pkgbase = heimdall-git
-	pkgdesc = A cross-platform open-source utility to flash firmware (aka ROMs) onto Samsung Galaxy S devices.
-	pkgver = 1.4.2.r5.g5377b62
+	pkgdesc = Tool suite used to flash firmware (ROMs) onto Samsung Galaxy S devices
+	pkgver = 1.4.2.r7.ga2cfdaa
 	pkgrel = 1
-	url = http://www.glassechidna.com.au/products/heimdall/
+	url = https://glassechidna.com.au/heimdall/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = cmake
 	makedepends = git
-	depends = libusb
 	depends = qt5-base
-	optdepends = android-udev: Udev rules to connect Android devices to you linux box
+	optdepends = android-udev: Udev rules to connect Android devices to your linux box
 	provides = heimdall
 	conflicts = heimdall
-	source = heimdall::git+https://gitlab.com/BenjaminDobell/Heimdall.git
+	source = Heimdall::git+https://gitlab.com/BenjaminDobell/Heimdall.git
 	source = heimdall.desktop
-	source = BridgeManager.patch
-	md5sums = SKIP
-	md5sums = 6c4de9e74c0d9e7ab4d50af21303b78a
-	md5sums = 8fce869eb9539b6b410b1a52370c3824
+	sha256sums = SKIP
+	sha256sums = 439cea1a8976b9b589ffe4030a084243bcc5e937dcb9c571cdb94d3ff08b4fb4
 
 pkgname = heimdall-git
 
diff --git a/BridgeManager.patch b/BridgeManager.patch
deleted file mode 100644
index 8b7cd9131d32..000000000000
--- a/BridgeManager.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/heimdall/source/BridgeManager.cpp	2015-03-15 18:28:01.469153580 -0500
-+++ b/heimdall/source/BridgeManager.cpp	2015-03-15 18:30:00.234516719 -0500
-@@ -231,7 +231,8 @@
- {
- 	Interface::Print("Claiming interface...\n");
- 
--	int result = libusb_claim_interface(deviceHandle, interfaceIndex);
-+    int result = libusb_detach_kernel_driver(deviceHandle, interfaceIndex);
-+    result = libusb_claim_interface(deviceHandle, interfaceIndex);
- 
- #ifdef OS_LINUX
- 
diff --git a/PKGBUILD b/PKGBUILD
index 776370cf384d..736f8627e7f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,59 +4,51 @@
 # Contributor: Lari Tikkanen
 # Maintainer:  Tim Schumacher
 
-pkgname=('heimdall-git')
-_gitname="heimdall"
-pkgver=1.4.2.r5.g5377b62
+pkgname=heimdall-git
+_pkgname=Heimdall
+pkgver=1.4.2.r7.ga2cfdaa
 pkgrel=1
-pkgdesc="A cross-platform open-source utility to flash firmware (aka ROMs) onto Samsung Galaxy S devices."
-arch=('i686' 'x86_64')
-url="http://www.glassechidna.com.au/products/heimdall/"
-license=('MIT')
-depends=('libusb' 'qt5-base')      
-makedepends=('cmake' 'git')
-optdepends=('android-udev: Udev rules to connect Android devices to you linux box')
-conflicts=('heimdall')
-provides=('heimdall')
-source=("$_gitname::git+https://gitlab.com/BenjaminDobell/Heimdall.git"
-        "heimdall.desktop"
-        "BridgeManager.patch")
-md5sums=('SKIP'
-         '6c4de9e74c0d9e7ab4d50af21303b78a'
-         '8fce869eb9539b6b410b1a52370c3824')
+pkgdesc="Tool suite used to flash firmware (ROMs) onto Samsung Galaxy S devices"
+arch=("i686" "x86_64")
+url="https://glassechidna.com.au/heimdall/"
+license=("MIT")
+depends=("qt5-base")
+makedepends=("cmake" "git")
+optdepends=("android-udev: Udev rules to connect Android devices to your linux box")
+conflicts=("heimdall")
+provides=("heimdall")
+source=(
+	"$_pkgname::git+https://gitlab.com/BenjaminDobell/Heimdall.git"
+	"heimdall.desktop"
+)
+sha256sums=(
+	"SKIP"
+	"439cea1a8976b9b589ffe4030a084243bcc5e937dcb9c571cdb94d3ff08b4fb4"
+)
 
 pkgver() {
-  cd $_gitname
+  cd $_pkgname
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd ${srcdir}/heimdall/
-  patch -Np1 -i ${srcdir}/BridgeManager.patch
-}
-
 build() {
-  cd ${srcdir}/heimdall/
+	cd "$srcdir/$_pkgname"
 
-  if [ -d build ] ; then
-    rm -rf build
-  fi
-
-  mkdir build
-  cd build
-  
-  cmake -DCMAKE_BUILD_TYPE=Release ..
-  make
+	cmake . -DCMAKE_INSTALL_PREFIX="/usr"
+	make
 }
 
 package() {
-  cd ${srcdir}/$_gitname
-
-  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/$_gitname/LICENSE"
+	cd "$srcdir/$_pkgname"
 
-  cd build
+	# Install desktop file
+	install -m644 -D "$srcdir/heimdall.desktop" "$pkgdir/usr/share/applications/heimdall.desktop"
 
-  install -m755 -D bin/heimdall "${pkgdir}/usr/bin/heimdall"
+	# Install license file
+	install -m644 -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-  install -m755 bin/heimdall-frontend "${pkgdir}/usr/bin/heimdall-frontend"
-  install -m644 -D "${srcdir}/heimdall.desktop" "${pkgdir}/usr/share/applications/heimdall.desktop"
+	# Install heimdall command line tool
+	install -d "$pkgdir"/usr/bin
+	install -Dm755 bin/* "$pkgdir"/usr/bin/
+	install -Dm644 heimdall/60-heimdall.rules "$pkgdir"/usr/lib/udev/rules.d/60-heimdall.rules
 }
diff --git a/heimdall.desktop b/heimdall.desktop
index 2501e1e2c74d..ca2d125c1f60 100644
--- a/heimdall.desktop
+++ b/heimdall.desktop
@@ -2,9 +2,8 @@
 Version=1.0
 Name=Heimdall
 Type=Application
-Comment=Samsung Galaxy Firmware Flasher
+Comment=Firmware flasher for Samsung mobile devices
 Terminal=false
 Exec=heimdall-frontend
-Icon=heimdall
-Categories=System;
-GenericName=Firmware Flasher
+Icon=phone
+Categories=Development;