patched package to use system libs

3 files changed, 35 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd81d50e1da9..a551353dac41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = labrador
 	pkgdesc = EspoTek Labrador transforms your PC or smartphone into a fully-featured electronics lab
 	pkgver = 1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://espotek.com
 	arch = x86_64
 	license = GPL3
@@ -11,10 +11,12 @@ pkgbase = labrador
 	source = 68-labrador.rules
 	source = labrador.desktop
 	source = labrador.png
+	source = use_system_libs.patch
 	sha256sums = 028aa7de4c46e10d4c00355fb294d7e29bc735a15ba12e257150b5c45ee32755
 	sha256sums = 221e149de8e24a98da38ca8586d5dda7c08bf4a26b649ac2d55e4b25aada154d
 	sha256sums = 708d2e142931c6c6b190155b0833b296d5562cd8de758a137dd356577e5077a6
 	sha256sums = a4d11834978d31526d388723b695c618c2c23962a10d45f66c8ef3238bfa0b63
+	sha256sums = 18e4d82337fa2cde887cb133190f62613b56230279392a9fe013ee6639fa2b20
 
 pkgname = labrador
 
diff --git a/PKGBUILD b/PKGBUILD
index 8f6a4656a718..4a337e0ec8db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Deon Spengler <deon[at]spengler[dot]co[dot]za>
+# Maintainer: Deon Spengler <deon at spengler dot co dot za>
 pkgname=labrador
 pkgdesc="EspoTek Labrador transforms your PC or smartphone into a fully-featured electronics lab"
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://espotek.com"
 license=('GPL3')
@@ -10,11 +10,19 @@ depends=('qt5-base' 'libdfuprog')
 source=("https://github.com/EspoTek/Labrador/archive/${pkgver}.tar.gz"
         '68-labrador.rules'
         'labrador.desktop'
-        'labrador.png')
+        'labrador.png'
+        'use_system_libs.patch')
 sha256sums=('028aa7de4c46e10d4c00355fb294d7e29bc735a15ba12e257150b5c45ee32755'
             '221e149de8e24a98da38ca8586d5dda7c08bf4a26b649ac2d55e4b25aada154d'
             '708d2e142931c6c6b190155b0833b296d5562cd8de758a137dd356577e5077a6'
-            'a4d11834978d31526d388723b695c618c2c23962a10d45f66c8ef3238bfa0b63')
+            'a4d11834978d31526d388723b695c618c2c23962a10d45f66c8ef3238bfa0b63'
+            '18e4d82337fa2cde887cb133190f62613b56230279392a9fe013ee6639fa2b20')
+
+prepare() {
+  cd "${srcdir}/Labrador-${pkgver}/Desktop_Interface"
+  patch -Np0 -i ../../use_system_libs.patch
+}
+
 build() {
   cd "${srcdir}/Labrador-${pkgver}/Desktop_Interface"
   qmake -makefile Labrador.pro
diff --git a/use_system_libs.patch b/use_system_libs.patch
new file mode 100644
index 000000000000..bf0a33b646d1
--- /dev/null
+++ b/use_system_libs.patch
@@ -0,0 +1,20 @@
+--- Labrador.pro.bak	2018-02-16 08:08:07.556303267 +0200
++++ Labrador.pro	2018-02-16 08:41:00.881835660 +0200
+@@ -141,14 +141,11 @@
+         } else {
+             message("Building for Linux (x64)")
+             #libusb include
+-            unix:!android:!macx:LIBS += -Lbuild_linux/libusb -lusb-1.0  ##I suspect the -L here does nothing!
+-            unix:!android:!macx:INCLUDEPATH += build_linux/libusb
+-            unix:!android:!macx:DEPENDPATH += build_linux/libusb
++            unix:!android:!macx:LIBS += -lusb-1.0
++            unix:!android:!macx:INCLUDEPATH += /usr/include/libusb-1.0
+ 
+             #libdfuprog include
+-            unix:!android:!macx:LIBS += -L$$PWD/build_linux/libdfuprog/lib/x64 -ldfuprog-0.9
+-            unix:!android:!macx:INCLUDEPATH += $$PWD/build_linux/libdfuprog/include
+-            unix:!android:!macx:DEPENDPATH += $$PWD/build_linux/libdfuprog/include
++            unix:!android:!macx:LIBS += -ldfuprog-0.9
+         }
+     }
+ }