[arch-commits] Commit in pokerth/trunk (3 files)

[Evangelos Foutras]

    Date: Thursday, October 15, 2015 @ 18:55:08
  Author: foutrelis
Revision: 144183

Fix build with Qt 5.5

Added:
  pokerth/trunk/0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
Modified:
  pokerth/trunk/PKGBUILD
Deleted:
  pokerth/trunk/gcrypt16.patch

---------------------------------------------------+
 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch |   24 ++++++++
 PKGBUILD                                          |   15 ++++-
 gcrypt16.patch                                    |   57 --------------------
 3 files changed, 36 insertions(+), 60 deletions(-)

Added: 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
===================================================================
--- 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch	                        (rev 0)
+++ 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch	2015-10-15 16:55:08 UTC (rev 144183)
@@ -0,0 +1,24 @@
+From 731f5f05f54065a67fa7c9f9bc8fe992390cb979 Mon Sep 17 00:00:00 2001
+From: Felix Hammer <f.hammer at web.de>
+Date: Fri, 7 Aug 2015 00:57:51 +0200
+Subject: [PATCH] Qt 5.5.0 patch for qtsingleapplication
+
+---
+ src/third_party/qtsingleapplication/qtlocalpeer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/third_party/qtsingleapplication/qtlocalpeer.cpp b/src/third_party/qtsingleapplication/qtlocalpeer.cpp
+index 43e6bf4..e0ddc07 100644
+--- a/src/third_party/qtsingleapplication/qtlocalpeer.cpp
++++ b/src/third_party/qtsingleapplication/qtlocalpeer.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include <QCoreApplication>
+ #include <QTime>
++#include <QDataStream>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QLibrary>
+-- 
+2.5.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-15 16:45:25 UTC (rev 144182)
+++ PKGBUILD	2015-10-15 16:55:08 UTC (rev 144183)
@@ -16,12 +16,21 @@
 depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' 'libxkbcommon-x11'
          'qt5-base' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
-source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2")
-md5sums=('a7f76f95782099f966e5f2b6809f502a')
+source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2"
+        '0001-Qt-5.5.0-patch-for-qtsingleapplication.patch')
+md5sums=('a7f76f95782099f966e5f2b6809f502a'
+         'f4ecab0a6435f1b3b0654145b75d6e7c')
 
+prepare() {
+  cd "$srcdir/$_realname-$pkgver-src"
+
+  # https://github.com/pokerth/pokerth/commit/731f5f05f540
+  patch -Np1 -i ../0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
+}
+
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
-  
+
   qmake-qt5 "$pkgname.pro"
   make
 }

Deleted: gcrypt16.patch
===================================================================
--- gcrypt16.patch	2015-10-15 16:45:25 UTC (rev 144182)
+++ gcrypt16.patch	2015-10-15 16:55:08 UTC (rev 144183)
@@ -1,57 +0,0 @@
-From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001
-From: lotodore <pokerth at lotharmay.de>
-Date: Thu, 19 Dec 2013 12:28:35 +0100
-Subject: [PATCH] Fix for libgcrypt 1.6.0 compile error #247 (supported only on
- Linux because libgcrypt does not yet support native Windows threads).
-
----
- src/net/common/socket_startup.cpp | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/net/common/socket_startup.cpp b/src/net/common/socket_startup.cpp
-index 12e8604..59ffc4f 100644
---- a/src/net/common/socket_startup.cpp
-+++ b/src/net/common/socket_startup.cpp
-@@ -37,6 +37,10 @@
- 
- #ifndef HAVE_OPENSSL
- 
-+// With libgcrypt 1.6.0, it is no longer supported to provide thread callbacks.
-+// Use the default thread implementation instead, and cross fingers that it works with boost thread...
-+#if GCRYPT_VERSION_NUMBER < 0x010600
-+
- extern "C" {
- 
- 	int gcry_bthread_init()
-@@ -64,12 +68,15 @@
- 		return 0;
- 	}
- 
--	struct gcry_thread_cbs gcry_threads_boost = {
-+	static struct gcry_thread_cbs gcry_threads_boost = {
- 		GCRY_THREAD_OPTION_USER, gcry_bthread_init, gcry_bmutex_init,
- 		gcry_bmutex_destroy, gcry_bmutex_lock, gcry_bmutex_unlock,
- 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
- 	};
- }
-+
-+#endif // GCRYPT_VERSION_NUMBER < 0x010600
-+
- #endif // not HAVE_OPENSSL
- 
- bool
-@@ -78,8 +85,10 @@
- #ifdef HAVE_OPENSSL
- 	return SSL_library_init() == 1;
- #else
--	gcry_check_version(NULL);
-+#if GCRYPT_VERSION_NUMBER < 0x010600
- 	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_boost);
-+#endif
-+	gcry_check_version(NULL);
- 	gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
- 	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
- 	return true;
--- 
-1.8.5.1
-