Update to v2.3

5 files changed, 99 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 388d5b5fdb9a..e74ba3c83c9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr  2 03:03:12 UTC 2016
+# Mon Nov 21 23:23:55 UTC 2016
 pkgbase = lightscreen
 	pkgdesc = Simple tool to automate the tedious process of saving and cataloging screenshots
-	pkgver = 2.2
-	pkgrel = 3
+	pkgver = 2.3
+	pkgrel = 4
 	url = http://lightscreen.com.ar/
 	arch = i686
 	arch = x86_64
@@ -13,16 +13,14 @@ pkgbase = lightscreen
 	depends = qt5-xmlpatterns
 	depends = qt5-multimedia
 	depends = qt5-x11extras
-	source = lightscreen-2.2.tar.gz::https://github.com/ckaiser/Lightscreen/archive/v2.2.tar.gz
-	source = fix_optionsdialog_include.patch
-	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
+	source = lightscreen-2.3.tar.gz::https://github.com/ckaiser/Lightscreen/archive/v2.3.tar.gz
+	source = UGlobalHotkey-231b10.zip::https://github.com/ckaiser/UGlobalHotkey/archive/231b10144741b29037f0128bb7a1cd7176529f74.zip
+	source = SingleApplication-c6378e.zip::https://github.com/ckaiser/SingleApplication/archive/c6378eec45a5fdf699b4d27fb4be22a190b2a184.zip
+	source = screenshot_cpp_h_fix.patch
+	sha512sums = 42a8b9a30430e152b0686a14d0ddb9e511865fc73f0a8ed6b66f80460829148b889d5b53077162d45440e979648fb951dd598000ddc8c4a3256bce73d775cff9
+	sha512sums = 444486f71c6cee80fc2b7bbd0b75335c1eefc8b8c949fb83438d2761c28c89fb345ad99b0195f8726c03984e30c46bf4788168927c28725beb3b31d0349e0778
+	sha512sums = ca3ab82c9a98180218afb0936b87b8f156def8ef4d84926930c81ef3c12ae66807d4f27b403bd01b6c8b1def5507ac9b47017b38c44ce7e5dd3119bc0dcce17b
+	sha512sums = 67193adc30beee7e9fdb72bbcc5d06960ac2b4f7125f7924c9f4d43ea4459d8bf3a79db3f4f4fc2e0a888a298744a13030e1bc708b2693238aa9691ff7ee7e5f
 
 pkgname = lightscreen
 
diff --git a/PKGBUILD b/PKGBUILD
index 222c67c9ba3f..001a52c679dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Chris <christopher.r.mullins g-mail>
 
 pkgname=lightscreen
-pkgver=2.2
-pkgrel=3
+pkgver=2.3
+pkgrel=4
 pkgdesc='Simple tool to automate the tedious process of saving and cataloging screenshots'
 arch=('i686' 'x86_64')
 url='http://lightscreen.com.ar/'
@@ -13,24 +13,22 @@ 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"
-        "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')
+        "UGlobalHotkey-231b10.zip::https://github.com/ckaiser/UGlobalHotkey/archive/231b10144741b29037f0128bb7a1cd7176529f74.zip"
+	"SingleApplication-c6378e.zip::https://github.com/ckaiser/SingleApplication/archive/c6378eec45a5fdf699b4d27fb4be22a190b2a184.zip"
+	"screenshot_cpp_h_fix.patch")
+	
+sha512sums=('42a8b9a30430e152b0686a14d0ddb9e511865fc73f0a8ed6b66f80460829148b889d5b53077162d45440e979648fb951dd598000ddc8c4a3256bce73d775cff9'
+            '444486f71c6cee80fc2b7bbd0b75335c1eefc8b8c949fb83438d2761c28c89fb345ad99b0195f8726c03984e30c46bf4788168927c28725beb3b31d0349e0778'
+	    'ca3ab82c9a98180218afb0936b87b8f156def8ef4d84926930c81ef3c12ae66807d4f27b403bd01b6c8b1def5507ac9b47017b38c44ce7e5dd3119bc0dcce17b'
+	    '67193adc30beee7e9fdb72bbcc5d06960ac2b4f7125f7924c9f4d43ea4459d8bf3a79db3f4f4fc2e0a888a298744a13030e1bc708b2693238aa9691ff7ee7e5f')
 
 prepare() {
   cd "${srcdir}"/"Lightscreen-${pkgver}"
-  patch -Np0 -i ../fix_optionsdialog_include.patch
+  patch -Np0 -i ../screenshot_cpp_h_fix.patch
   cd "${srcdir}"
-  cp UGlobalHotkey-5dc7c1738c08b6bd3cc814923584ca3ea61465d3/* "${srcdir}"/"Lightscreen-${pkgver}/tools/UGlobalHotkey"  
-  cp SingleApplication-2a99832aee351919a04b8a28876fc9543d01f19f/* "${srcdir}"/"Lightscreen-${pkgver}/tools/SingleApplication"
+  cp UGlobalHotkey-231b10144741b29037f0128bb7a1cd7176529f74/* "${srcdir}"/"Lightscreen-${pkgver}/tools/UGlobalHotkey"  
+  cp SingleApplication-c6378eec45a5fdf699b4d27fb4be22a190b2a184/* "${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
deleted file mode 100644
index b527cfc2f58a..000000000000
--- a/fix_hotkeymap_h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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)
diff --git a/fix_optionsdialog_include.patch b/fix_optionsdialog_include.patch
deleted file mode 100644
index 3bb66819e671..000000000000
--- a/fix_optionsdialog_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dialogs/optionsdialog.ui	2016-03-02 15:33:30.949620295 -0500
-+++ dialogs/optionsdialog.ui	2016-03-02 15:34:02.076442579 -0500
-@@ -1386,7 +1386,7 @@
-   <customwidget>
-    <class>HotkeyWidget</class>
-    <extends>QPushButton</extends>
--   <header>../widgets/hotkeywidget.h</header>
-+   <header>widgets/hotkeywidget.h</header>
-   </customwidget>
-  </customwidgets>
-  <tabstops>
diff --git a/screenshot_cpp_h_fix.patch b/screenshot_cpp_h_fix.patch
new file mode 100644
index 000000000000..cb33cf34f7d4
--- /dev/null
+++ b/screenshot_cpp_h_fix.patch
@@ -0,0 +1,75 @@
+diff -Naurp src-orig/Lightscreen-2.3/lightscreenwindow.cpp src-fixed/Lightscreen-2.3/lightscreenwindow.cpp
+--- lightscreenwindow.cpp	2016-10-30 17:52:35.000000000 -0400
++++ lightscreenwindow.cpp	2016-11-21 18:16:57.486217211 -0500
+@@ -206,7 +206,7 @@ void LightscreenWindow::cleanup(Screensh
+     }

+ 

+     if (settings()->value("options/playSound", false).toBool()) {

+-        if (options.result == Screenshot::Success) {

++        if (options.result == Screenshot::Success_) {

+             QSound::play("sounds/ls.screenshot.wav");

+         } else {

+ #ifdef Q_OS_WIN

+@@ -220,7 +220,7 @@ void LightscreenWindow::cleanup(Screensh
+ 

+     updateStatus();

+ 

+-    if (options.result != Screenshot::Success) {

++    if (options.result != Screenshot::Success_) {

+         return;

+     }

+ 

+@@ -377,7 +377,7 @@ void LightscreenWindow::executeArguments
+ void LightscreenWindow::notify(const Screenshot::Result &result)

+ {

+     switch (result) {

+-    case Screenshot::Success:

++    case Screenshot::Success_:

+         mTrayIcon->setIcon(QIcon(":/icons/lightscreen.yes"));

+ 

+         if (mHasTaskbarButton) {

+@@ -645,7 +645,7 @@ void LightscreenWindow::showScreenshotMe
+     QString title;

+     QString message;

+ 

+-    if (result == Screenshot::Success) {

++    if (result == Screenshot::Success_) {

+         title = QFileInfo(fileName).fileName();

+ 

+         if (settings()->value("file/target").toString().isEmpty()) {

+diff -Naurp src-orig/Lightscreen-2.3/tools/screenshot.cpp src-fixed/Lightscreen-2.3/tools/screenshot.cpp
+--- tools/screenshot.cpp	2016-10-30 17:52:35.000000000 -0400
++++ tools/screenshot.cpp	2016-11-21 18:16:40.246217313 -0500
+@@ -244,7 +244,7 @@ void Screenshot::save()
+         QApplication::clipboard()->setPixmap(mPixmap, QClipboard::Clipboard);

+ 

+         if (!mOptions.file) {

+-            result = Screenshot::Success;

++            result = Screenshot::Success_;

+         }

+     }

+ 

+@@ -254,9 +254,9 @@ void Screenshot::save()
+         if (name.isEmpty()) {

+             result = Screenshot::Cancel;

+         } else if (mUnloaded) {

+-            result = (QFile::rename(mUnloadFilename, fileName)) ? Screenshot::Success : Screenshot::Failure;

++            result = (QFile::rename(mUnloadFilename, fileName)) ? Screenshot::Success_ : Screenshot::Failure;

+         } else if (mPixmap.save(fileName, 0, mOptions.quality)) {

+-            result = Screenshot::Success;

++            result = Screenshot::Success_;

+         } else {

+             result = Screenshot::Failure;

+         }

+diff -Naurp src-orig/Lightscreen-2.3/tools/screenshot.h src-fixed/Lightscreen-2.3/tools/screenshot.h
+--- tools/screenshot.h	2016-10-30 17:52:35.000000000 -0400
++++ tools/screenshot.h	2016-11-21 18:16:31.439550699 -0500
+@@ -55,7 +55,7 @@ public:
+ 

+     enum Result {

+         Failure = 0,

+-        Success = 1,

++        Success_ = 1,

+         Cancel = 2

+     };

+     Q_ENUM(Result)