Add patch for lockup issue

3 files changed, 78 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2aa2daa0653..8c89caf297c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 14:15:59 UTC 2016
+# Mo Feb  1 08:40:04 UTC 2016
 pkgbase = yacreader
-	pkgdesc = A comic reader for cross-platform reading and managing your digital comic collection.b
+	pkgdesc = A comic reader for cross-platform reading and managing your digital comic collection.
 	pkgver = 8.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.yacreader.com
 	install = yacreader.install
 	arch = i686
@@ -23,8 +23,10 @@ pkgbase = yacreader
 	conflicts = yacreader-bin
 	source = https://bitbucket.org/luisangelsm/yacreader/downloads/yacreader-8.0-src.tar.xz
 	source = logger.patch
+	source = checkversion.patch
 	sha256sums = 579ea8f37e986e7d34306a4382d56916004035b03ae8742ebc7d43516e63dad8
 	sha256sums = 9fee8b4da9a49b86b5de54fd37434fe46d772c92e3b3324cc748bf926c533484
+	sha256sums = 183c4348b60a73553369220ab560eb2942c93ab8cb71e83af516028db05500b1
 
 pkgname = yacreader
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b9a14cb82c0..28b122673fe1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Felix Kauselmann <licorn at gmail dot com>
 pkgname=yacreader
 pkgver=8.0
-pkgrel=3
-pkgdesc="A comic reader for cross-platform reading and managing your digital comic collection."b
+pkgrel=4
+pkgdesc="A comic reader for cross-platform reading and managing your digital comic collection."
 arch=('i686' 'x86_64')
 url="http://www.yacreader.com"
 license=('GPL3')
@@ -14,13 +14,18 @@ optdepends=(
 conflicts=('yacreader-bin')
 install='yacreader.install'
 source=( "https://bitbucket.org/luisangelsm/yacreader/downloads/yacreader-8.0-src.tar.xz" 
-		'logger.patch' )
+		'logger.patch'
+		'checkversion.patch')
 sha256sums=('579ea8f37e986e7d34306a4382d56916004035b03ae8742ebc7d43516e63dad8'
-            '9fee8b4da9a49b86b5de54fd37434fe46d772c92e3b3324cc748bf926c533484')
+            '9fee8b4da9a49b86b5de54fd37434fe46d772c92e3b3324cc748bf926c533484'
+            '183c4348b60a73553369220ab560eb2942c93ab8cb71e83af516028db05500b1')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver/YACReaderLibrary/server/lib/bfLogging
-  patch -p0 < $srcdir/logger.patch
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 -i ../checkversion.patch
+  cd YACReaderLibrary/server/lib/bfLogging
+  patch -p0 -i $srcdir/logger.patch
+  
 }
 
 build() {
diff --git a/checkversion.patch b/checkversion.patch
new file mode 100644
index 000000000000..2b70ef70c076
--- /dev/null
+++ b/checkversion.patch
@@ -0,0 +1,62 @@
+--- common/check_new_version.cpp	2015-07-06 22:36:39.000000000 +0200
++++ check_new_version.cpp	2016-01-30 15:42:09.306675200 +0100
+@@ -1,5 +1,5 @@
+ #include "check_new_version.h"

+-#include <QMessageBox>

++

+ #include <QUrl>

+ #include <QtGlobal>

+ #include <QStringList>

+@@ -10,10 +10,10 @@
+ #include <QNetworkRequest>

+ #include <QNetworkReply>

+ 

+-#define PREVIOUS_VERSION "6.0.0"

++#define PREVIOUS_VERSION_TESTING "6.0.0"

+ 

+ HttpVersionChecker::HttpVersionChecker()

+-		:HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home")

++    :HttpWorker("https://bitbucket.org/luisangelsm/yacreader/wiki/Home")

+ {

+ 	connect(this,SIGNAL(dataReady(const QByteArray &)),this,SLOT(checkNewVersion(const QByteArray &)));

+ }

+@@ -26,15 +26,15 @@
+ bool HttpVersionChecker::checkNewVersion(QString sourceContent)

+ {

+ #ifdef Q_OS_WIN32

+-	QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32.*");

++    QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32");

+ #endif

+ 

+ #if defined  Q_OS_UNIX && !defined Q_OS_MAC

+-	QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11.*");

++    QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11");

+ #endif

+ 

+ #ifdef  Q_OS_MAC

+-	QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac.*");

++    QRegExp rx("YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac");

+ #endif

+ 	

+ 	int index = 0;

+@@ -42,9 +42,9 @@
+ 	bool sameVersion = true;

+ 	//bool currentVersionIsNewer = false;

+ #ifdef QT_DEBUG

+-	QString version(PREVIOUS_VERSION);

++    QString version(PREVIOUS_VERSION_TESTING);

+ #else

+-	QString version(VERSION);

++    QString version(VERSION);

+ #endif

+ 	QStringList sl = version.split(".");

+ 	if((index = rx.indexIn(sourceContent))!=-1)

+@@ -68,8 +68,6 @@
+ 			if((sl.size()==3)&&(rx.cap(4)!=""))

+ 				newVersion = true;

+ 		}

+-

+-

+ 	}

+ 

+ 	if(newVersion == true)