Date: Thursday, January 16, 2014 @ 07:37:17 Author: svenstaro Revision: 104126
archrelease: copy trunk to community-i686, community-x86_64 Added: pokerth/repos/community-i686/PKGBUILD (from rev 104125, pokerth/trunk/PKGBUILD) pokerth/repos/community-i686/gcrypt16.patch (from rev 104125, pokerth/trunk/gcrypt16.patch) pokerth/repos/community-x86_64/PKGBUILD (from rev 104125, pokerth/trunk/PKGBUILD) pokerth/repos/community-x86_64/gcrypt16.patch (from rev 104125, pokerth/trunk/gcrypt16.patch) Deleted: pokerth/repos/community-i686/PKGBUILD pokerth/repos/community-i686/gcrypt16.patch pokerth/repos/community-x86_64/PKGBUILD pokerth/repos/community-x86_64/gcrypt16.patch ---------------------------------+ /PKGBUILD | 72 ++++++++++++++++++++++++ /gcrypt16.patch | 114 ++++++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 36 ------------ community-i686/gcrypt16.patch | 57 ------------------- community-x86_64/PKGBUILD | 36 ------------ community-x86_64/gcrypt16.patch | 57 ------------------- 6 files changed, 186 insertions(+), 186 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-01-16 06:37:05 UTC (rev 104125) +++ community-i686/PKGBUILD 2014-01-16 06:37:17 UTC (rev 104126) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Mateusz Herych <heni...@gmail.com> -# Contributor: Bartłomiej Piotrowski <barthal...@gmail.com> -# Contributor: Vasco Costa <vasco.co...@meiodigital.com> -# Contributor: Federico Cinelli <cine...@aur.archlinux.org> - -pkgname=pokerth -_realname=PokerTH -pkgver=1.1 -pkgrel=1 -pkgdesc="Poker game written in C++/Qt4" -arch=('i686' 'x86_64') -url="http://www.pokerth.net/" -license=('GPL' 'custom') -depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' - 'qt5-base' 'sdl_mixer' 'libircclient' 'tinyxml') -makedepends=('boost') -source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2") -md5sums=('7f577fdb04c697ac7227c1a0d4311ffc') - -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-i686/PKGBUILD (from rev 104125, pokerth/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-01-16 06:37:17 UTC (rev 104126) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Bartłomiej Piotrowski <barthal...@gmail.com> +# Contributor: Vasco Costa <vasco.co...@meiodigital.com> +# Contributor: Federico Cinelli <cine...@aur.archlinux.org> + +pkgname=pokerth +_realname=PokerTH +pkgver=1.1.1 +pkgrel=1 +pkgdesc="Poker game written in C++/Qt4" +arch=('i686' 'x86_64') +url="http://www.pokerth.net/" +license=('GPL' 'custom') +depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' + '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" +} Deleted: community-i686/gcrypt16.patch =================================================================== --- community-i686/gcrypt16.patch 2014-01-16 06:37:05 UTC (rev 104125) +++ community-i686/gcrypt16.patch 2014-01-16 06:37:17 UTC (rev 104126) @@ -1,57 +0,0 @@ -From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001 -From: lotodore <poke...@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-i686/gcrypt16.patch (from rev 104125, pokerth/trunk/gcrypt16.patch) =================================================================== --- community-i686/gcrypt16.patch (rev 0) +++ community-i686/gcrypt16.patch 2014-01-16 06:37:17 UTC (rev 104126) @@ -0,0 +1,57 @@ +From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001 +From: lotodore <poke...@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 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-01-16 06:37:05 UTC (rev 104125) +++ community-x86_64/PKGBUILD 2014-01-16 06:37:17 UTC (rev 104126) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Mateusz Herych <heni...@gmail.com> -# Contributor: Bartłomiej Piotrowski <barthal...@gmail.com> -# Contributor: Vasco Costa <vasco.co...@meiodigital.com> -# Contributor: Federico Cinelli <cine...@aur.archlinux.org> - -pkgname=pokerth -_realname=PokerTH -pkgver=1.1 -pkgrel=1 -pkgdesc="Poker game written in C++/Qt4" -arch=('i686' 'x86_64') -url="http://www.pokerth.net/" -license=('GPL' 'custom') -depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' - 'qt5-base' 'sdl_mixer' 'libircclient' 'tinyxml') -makedepends=('boost') -source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2") -md5sums=('7f577fdb04c697ac7227c1a0d4311ffc') - -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-x86_64/PKGBUILD (from rev 104125, pokerth/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-01-16 06:37:17 UTC (rev 104126) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Bartłomiej Piotrowski <barthal...@gmail.com> +# Contributor: Vasco Costa <vasco.co...@meiodigital.com> +# Contributor: Federico Cinelli <cine...@aur.archlinux.org> + +pkgname=pokerth +_realname=PokerTH +pkgver=1.1.1 +pkgrel=1 +pkgdesc="Poker game written in C++/Qt4" +arch=('i686' 'x86_64') +url="http://www.pokerth.net/" +license=('GPL' 'custom') +depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' + '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" +} Deleted: community-x86_64/gcrypt16.patch =================================================================== --- community-x86_64/gcrypt16.patch 2014-01-16 06:37:05 UTC (rev 104125) +++ community-x86_64/gcrypt16.patch 2014-01-16 06:37:17 UTC (rev 104126) @@ -1,57 +0,0 @@ -From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001 -From: lotodore <poke...@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-x86_64/gcrypt16.patch (from rev 104125, pokerth/trunk/gcrypt16.patch) =================================================================== --- community-x86_64/gcrypt16.patch (rev 0) +++ community-x86_64/gcrypt16.patch 2014-01-16 06:37:17 UTC (rev 104126) @@ -0,0 +1,57 @@ +From aa22d39d7753acc56813171e654fa9fa1f0ca759 Mon Sep 17 00:00:00 2001 +From: lotodore <poke...@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 +