Update to v2.2.

Includes a new patch to fix some typos, and downloads external
libraries used in v2.2: SingleApplication and UGlobalHotkey.2

3 files changed, 53 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a51b33fd4d8..388d5b5fdb9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar  2 20:50:49 UTC 2016
+# Sat Apr  2 03:03:12 UTC 2016
 pkgbase = lightscreen
 	pkgdesc = Simple tool to automate the tedious process of saving and cataloging screenshots
-	pkgver = 2.1
-	pkgrel = 2
+	pkgver = 2.2
+	pkgrel = 3
 	url = http://lightscreen.com.ar/
 	arch = i686
 	arch = x86_64
@@ -13,10 +13,16 @@ pkgbase = lightscreen
 	depends = qt5-xmlpatterns
 	depends = qt5-multimedia
 	depends = qt5-x11extras
-	source = lightscreen-2.1.tar.gz::https://github.com/ckaiser/Lightscreen/archive/v2.1.tar.gz
+	source = lightscreen-2.2.tar.gz::https://github.com/ckaiser/Lightscreen/archive/v2.2.tar.gz
 	source = fix_optionsdialog_include.patch
-	sha512sums = c824970c789c2d3ab3410522a95e773dd34689dc3b144a28e555e4a4e332730be5931d103dcae28292776b69137b33ddc937e98128a909c70580caeeed322e15
+	source = UGlobalHotkey-5dc7c1.zip::https://github.com/ckaiser/UGlobalHotkey/archive/5dc7c1738c08b6bd3cc814923584ca3ea61465d3.zip
+	source = SingleApplication-2a9983.zip::https://github.com/ckaiser/SingleApplication/archive/2a99832aee351919a04b8a28876fc9543d01f19f.zip
+	source = fix_hotkeymap_h.patch
+	sha512sums = 4a3056c5d7a91790db58ed14c7f264cca39ce4baf565684d3ae8cacf405dabfcb30d0547e4a5b69694507023424c827dc0ccf88fcfcebd01fb8d14a521e7b8f7
 	sha512sums = c4ea7c0be83b989c1b971eb8b73686ffe52467d0d2e6d21ebb6e700961626612388411d9984df8d0a1c0748196db0ec4f9da125b398d4668e97e0566a1b20606
+	sha512sums = 399d492607c8e259206e7e0acded769ec13ed405027c31e631e9a75691802fbd4d942c9f2ffd54a7d53d850e60cc1d8ad3a719fc8231a244cfea62b8c29a66a9
+	sha512sums = 6d2f6fd7cb3d8e8f90735f3b1752c167d80a19137a35f1a00635b56fa024bde3f4cd5af4b231687178979d4903ac6d9dcaa0ea7098967300db7c5ed08856c00a
+	sha512sums = 5b049eae8e9b883dd9d57893fb3ea053c461a9758e9b71042918c3d13802815c7ac66cc9ee6dfe6b978e7ed9f7a7f4fed71ea007c53b3cfef6309fb7d3c44bbc
 
 pkgname = lightscreen
 
diff --git a/PKGBUILD b/PKGBUILD
index 313ef9ad60cd..222c67c9ba3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Chris <christopher.r.mullins g-mail>
 
 pkgname=lightscreen
-pkgver=2.1
-pkgrel=2
+pkgver=2.2
+pkgrel=3
 pkgdesc='Simple tool to automate the tedious process of saving and cataloging screenshots'
 arch=('i686' 'x86_64')
 url='http://lightscreen.com.ar/'
@@ -13,13 +13,24 @@ depends=('qt5-base'
          'qt5-x11extras')
 license=('GPL')
 source=("lightscreen-$pkgver.tar.gz::https://github.com/ckaiser/Lightscreen/archive/v$pkgver.tar.gz"
-        "fix_optionsdialog_include.patch")
-sha512sums=('c824970c789c2d3ab3410522a95e773dd34689dc3b144a28e555e4a4e332730be5931d103dcae28292776b69137b33ddc937e98128a909c70580caeeed322e15'
-            'c4ea7c0be83b989c1b971eb8b73686ffe52467d0d2e6d21ebb6e700961626612388411d9984df8d0a1c0748196db0ec4f9da125b398d4668e97e0566a1b20606')
+        "fix_optionsdialog_include.patch"
+        "UGlobalHotkey-5dc7c1.zip::https://github.com/ckaiser/UGlobalHotkey/archive/5dc7c1738c08b6bd3cc814923584ca3ea61465d3.zip"
+        "SingleApplication-2a9983.zip::https://github.com/ckaiser/SingleApplication/archive/2a99832aee351919a04b8a28876fc9543d01f19f.zip"
+        "fix_hotkeymap_h.patch")
+sha512sums=('4a3056c5d7a91790db58ed14c7f264cca39ce4baf565684d3ae8cacf405dabfcb30d0547e4a5b69694507023424c827dc0ccf88fcfcebd01fb8d14a521e7b8f7'
+            'c4ea7c0be83b989c1b971eb8b73686ffe52467d0d2e6d21ebb6e700961626612388411d9984df8d0a1c0748196db0ec4f9da125b398d4668e97e0566a1b20606'
+            '399d492607c8e259206e7e0acded769ec13ed405027c31e631e9a75691802fbd4d942c9f2ffd54a7d53d850e60cc1d8ad3a719fc8231a244cfea62b8c29a66a9'
+            '6d2f6fd7cb3d8e8f90735f3b1752c167d80a19137a35f1a00635b56fa024bde3f4cd5af4b231687178979d4903ac6d9dcaa0ea7098967300db7c5ed08856c00a'
+            '5b049eae8e9b883dd9d57893fb3ea053c461a9758e9b71042918c3d13802815c7ac66cc9ee6dfe6b978e7ed9f7a7f4fed71ea007c53b3cfef6309fb7d3c44bbc')
 
 prepare() {
   cd "${srcdir}"/"Lightscreen-${pkgver}"
   patch -Np0 -i ../fix_optionsdialog_include.patch
+  cd "${srcdir}"
+  cp UGlobalHotkey-5dc7c1738c08b6bd3cc814923584ca3ea61465d3/* "${srcdir}"/"Lightscreen-${pkgver}/tools/UGlobalHotkey"  
+  cp SingleApplication-2a99832aee351919a04b8a28876fc9543d01f19f/* "${srcdir}"/"Lightscreen-${pkgver}/tools/SingleApplication"
+  cd "${srcdir}"/"Lightscreen-${pkgver}"
+  patch -Np0 -i ../fix_hotkeymap_h.patch
 }
 
 build() {
diff --git a/fix_hotkeymap_h.patch b/fix_hotkeymap_h.patch
new file mode 100644
index 000000000000..b527cfc2f58a
--- /dev/null
+++ b/fix_hotkeymap_h.patch
@@ -0,0 +1,26 @@
+--- tools/UGlobalHotkey/hotkeymap.h	2016-03-30 19:53:28.641258206 -0400
++++ tools/UGlobalHotkey/hotkeymap.h	2016-04-01 22:49:50.257090741 -0400
+@@ -137,7 +137,7 @@
+ {
+     UKeyData data = {0, 0};
+ 
+-    auto key = keySeq.GetSimpleKeys();
++    auto key = keySeq.getSimpleKeys();
+     if (key.size() > 0) {
+         data.key = key[0];
+     } else {
+@@ -153,12 +153,12 @@
+     } else if (data.key >= Qt::Key_Space && data.key <= Qt::Key_QuoteLeft) {
+         // conversion is not necessary, if the value in the range Qt::Key_Space - Qt::Key_QuoteLeft
+     } else {
+-        qWarning() << "Invalid hotkey: key conversion is not defined");
++        qWarning() << "Invalid hotkey: key conversion is not defined";
+         return data;
+     }
+ 
+     // Modifiers conversion
+-    auto mods = keySeq.GetModifiers();
++    auto mods = keySeq.getModifiers();
+ 
+     for (auto i : mods) {
+         if (i == Qt::Key_Shift)