[arch-commits] Commit in pokerth/trunk (PKGBUILD gcrypt16.patch)
Sven-Hendrik Haase
svenstaro at nymeria.archlinux.org
Thu Dec 19 18:19:30 UTC 2013
Date: Thursday, December 19, 2013 @ 19:19:30
Author: svenstaro
Revision: 102779
upgpkg: pokerth 1.0.1-4
gcrypt 1.6 rebuild
Added:
pokerth/trunk/gcrypt16.patch
Modified:
pokerth/trunk/PKGBUILD
----------------+
PKGBUILD | 10 ++++++---
gcrypt16.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-19 17:41:26 UTC (rev 102778)
+++ PKGBUILD 2013-12-19 18:19:30 UTC (rev 102779)
@@ -8,7 +8,7 @@
pkgname=pokerth
_realname=PokerTH
pkgver=1.0.1
-pkgrel=3
+pkgrel=4
pkgdesc="Poker game written in C++/Qt4"
arch=('i686' 'x86_64')
url="http://www.pokerth.net/"
@@ -16,12 +16,16 @@
depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf'
'qt4' 'sdl_mixer' 'libircclient' 'tinyxml')
makedepends=('boost')
-source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2")
-md5sums=('c6dcf0ed68ab50af91371348ffad5d00')
+source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2"
+ gcrypt16.patch)
+md5sums=('c6dcf0ed68ab50af91371348ffad5d00'
+ '9354bade599d395c1cc86abd062472cd')
build() {
cd "$srcdir/$_realname-$pkgver-src"
+ patch -Np1 < $srcdir/gcrypt16.patch
+
qmake-qt4 "$pkgname.pro"
make
}
Added: gcrypt16.patch
===================================================================
--- gcrypt16.patch (rev 0)
+++ gcrypt16.patch 2013-12-19 18:19:30 UTC (rev 102779)
@@ -0,0 +1,57 @@
+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
+
More information about the arch-commits
mailing list