[arch-commits] Commit in pokerth/repos (6 files)

Evangelos Foutras foutrelis at archlinux.org
Wed Nov 5 01:38:21 UTC 2014


    Date: Wednesday, November 5, 2014 @ 02:38:21
  Author: foutrelis
Revision: 121910

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  pokerth/repos/community-staging-i686/
  pokerth/repos/community-staging-i686/PKGBUILD
    (from rev 121909, pokerth/trunk/PKGBUILD)
  pokerth/repos/community-staging-i686/gcrypt16.patch
    (from rev 121909, pokerth/trunk/gcrypt16.patch)
  pokerth/repos/community-staging-x86_64/
  pokerth/repos/community-staging-x86_64/PKGBUILD
    (from rev 121909, pokerth/trunk/PKGBUILD)
  pokerth/repos/community-staging-x86_64/gcrypt16.patch
    (from rev 121909, pokerth/trunk/gcrypt16.patch)

-----------------------------------------+
 community-staging-i686/PKGBUILD         |   36 ++++++++++++++++++
 community-staging-i686/gcrypt16.patch   |   57 ++++++++++++++++++++++++++++++
 community-staging-x86_64/PKGBUILD       |   36 ++++++++++++++++++
 community-staging-x86_64/gcrypt16.patch |   57 ++++++++++++++++++++++++++++++
 4 files changed, 186 insertions(+)

Copied: pokerth/repos/community-staging-i686/PKGBUILD (from rev 121909, pokerth/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2014-11-05 01:38:21 UTC (rev 121910)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: Vasco Costa <vasco.costa at meiodigital.com>
+# Contributor: Federico Cinelli <cinelli at aur.archlinux.org>
+
+pkgname=pokerth
+_realname=PokerTH
+pkgver=1.1.1
+pkgrel=5
+pkgdesc="Open source Texas Hold'em Poker simulator"
+arch=('i686' 'x86_64')
+url="http://www.pokerth.net/"
+license=('GPL' 'custom')
+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')
+
+build() {
+  cd "$srcdir/$_realname-$pkgver-src"
+  
+  qmake-qt5 "$pkgname.pro"
+  make
+}
+
+package() {
+  cd "$srcdir/$_realname-$pkgver-src"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  install -Dm644 "docs/pokerth.1" "$pkgdir/usr/share/man/man1/pokerth.1"
+  install -Dm644 "data/data-copyright.txt" "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
+}

Copied: pokerth/repos/community-staging-i686/gcrypt16.patch (from rev 121909, pokerth/trunk/gcrypt16.patch)
===================================================================
--- community-staging-i686/gcrypt16.patch	                        (rev 0)
+++ community-staging-i686/gcrypt16.patch	2014-11-05 01:38:21 UTC (rev 121910)
@@ -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
+

Copied: pokerth/repos/community-staging-x86_64/PKGBUILD (from rev 121909, pokerth/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2014-11-05 01:38:21 UTC (rev 121910)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
+# Contributor: Vasco Costa <vasco.costa at meiodigital.com>
+# Contributor: Federico Cinelli <cinelli at aur.archlinux.org>
+
+pkgname=pokerth
+_realname=PokerTH
+pkgver=1.1.1
+pkgrel=5
+pkgdesc="Open source Texas Hold'em Poker simulator"
+arch=('i686' 'x86_64')
+url="http://www.pokerth.net/"
+license=('GPL' 'custom')
+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')
+
+build() {
+  cd "$srcdir/$_realname-$pkgver-src"
+  
+  qmake-qt5 "$pkgname.pro"
+  make
+}
+
+package() {
+  cd "$srcdir/$_realname-$pkgver-src"
+
+  make INSTALL_ROOT="$pkgdir" install
+
+  install -Dm644 "docs/pokerth.1" "$pkgdir/usr/share/man/man1/pokerth.1"
+  install -Dm644 "data/data-copyright.txt" "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
+}

Copied: pokerth/repos/community-staging-x86_64/gcrypt16.patch (from rev 121909, pokerth/trunk/gcrypt16.patch)
===================================================================
--- community-staging-x86_64/gcrypt16.patch	                        (rev 0)
+++ community-staging-x86_64/gcrypt16.patch	2014-11-05 01:38:21 UTC (rev 121910)
@@ -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