Fix asset patch

3 files changed, 23 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8465e027d460..3887e8830a18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Jan  3 04:46:49 UTC 2016
 pkgbase = jstest-gtk-git
 	pkgdesc = A simple GTK2-based joystick tester and calibrator
-	pkgver = 0.1.0.r65.g9773e2b
+	pkgver = 0.1.0.r69.ge89ae8f
 	pkgrel = 1
 	url = https://github.com/Grumbel/jstest-gtk/
 	arch = i686
@@ -14,7 +16,7 @@ pkgbase = jstest-gtk-git
 	source = fix_asset_path.patch
 	sha1sums = SKIP
 	sha1sums = 4a8a3f5ac41b509fdfc0aec7cf017447e58ec973
-	sha1sums = 69df12f70712e68f5d2f75d24a5d2bff0a1e0a5e
+	sha1sums = 5db189b830755a5cf5424210ac08c0aaf9709a8b
 
 pkgname = jstest-gtk-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a3fe9e3e426..515da93de71b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: AdrianoML <adriano.lols@gmail.com>
 
 pkgname=jstest-gtk-git
-pkgver=0.1.0.r65.g9773e2b
+pkgver=0.1.0.r69.ge89ae8f
 pkgrel=1
 pkgdesc="A simple GTK2-based joystick tester and calibrator"
 arch=('i686' 'x86_64')
@@ -26,7 +26,7 @@ build() {
   cd "$srcdir/$_gitname"
 
   msg "Patching..."
-  patch -p2 < "$srcdir/fix_asset_path.patch"
+  patch -p0 < "$srcdir/fix_asset_path.patch"
 
   if [[ ! -e 'build' ]]; then
       mkdir build
@@ -46,3 +46,12 @@ package() {
   cp -r "${srcdir}/jstest-gtk/data" "${pkgdir}/usr/share/jstest-gtk/"
 }
 
+sha1sums=('SKIP'
+          '4a8a3f5ac41b509fdfc0aec7cf017447e58ec973'
+          'a278a643b2b9e12b6ca152cfb954e0b8f46e1388')
+sha1sums=('SKIP'
+          '4a8a3f5ac41b509fdfc0aec7cf017447e58ec973'
+          'c05ac388689f47338635fbf55a1620a8e9e0eacc')
+sha1sums=('SKIP'
+          '4a8a3f5ac41b509fdfc0aec7cf017447e58ec973'
+          '5db189b830755a5cf5424210ac08c0aaf9709a8b')
diff --git a/fix_asset_path.patch b/fix_asset_path.patch
index fe932dc4317e..5a753701eacb 100644
--- a/fix_asset_path.patch
+++ b/fix_asset_path.patch
@@ -1,11 +1,11 @@
---- src/jstest-gtk/src/joystick_list_widget.cpp	2015-03-29 21:14:20.241884909 -0600
-+++ src/jstest-gtk/src/joystick_list_widget.cpp	2015-03-29 21:21:27.835219758 -0600
-@@ -123,7 +123,7 @@
-   for(std::vector<JoystickDescription>::const_iterator i = joysticks.begin(); i != joysticks.end(); ++i)
-   {
-     Gtk::ListStore::iterator it = device_list->append();
--    (*it)[DeviceListColumns::instance().icon] = Gdk::Pixbuf::create_from_file(Main::current()->get_data_directory() + "generic.png");
-+    (*it)[DeviceListColumns::instance().icon] = Gdk::Pixbuf::create_from_file("/usr/share/jstest-gtk/data/generic.png");
+--- src/joystick_list_widget.cpp	2016-01-03 02:39:09.387377631 -0200
++++ src/joystick_list_widget.cpp	2016-01-03 02:38:52.483930756 -0200
+@@ -133,7 +133,7 @@
+ 	//General icon for the rest
+ 	else icon_filename = "generic.png";
+ 
+-	(*it)[DeviceListColumns::instance().icon] = Gdk::Pixbuf::create_from_file(Main::current()->get_data_directory() + icon_filename);
++    (*it)[DeviceListColumns::instance().icon] = Gdk::Pixbuf::create_from_file("/usr/share/jstest-gtk/data/" + icon_filename);
      (*it)[DeviceListColumns::instance().path] = i->filename;
  
      std::ostringstream out;