From b5dfe6d8a7825b5e74b73df0c4c7f63bfa64aefa1228322507e06d4965d1ef13 Mon Sep 17 00:00:00 2001
From: Dinar Valeev <k0da@opensuse.org>
Date: Mon, 6 Jan 2014 12:47:35 +0000
Subject: [PATCH] Accepting request 212911 from devel:ARM:Factory

- add libgcrypt-1.6.diff: Fix build with libgcrypt-1.6

OBS-URL: https://build.opensuse.org/request/show/212911
OBS-URL: https://build.opensuse.org/package/show/network:telephony/ccrtp?expand=0&rev=16
---
 ccrtp.changes      |  5 +++++
 ccrtp.spec         |  4 +++-
 libgcrypt-1.6.diff | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 libgcrypt-1.6.diff

diff --git a/ccrtp.changes b/ccrtp.changes
index 8a88708..58f0c91 100644
--- a/ccrtp.changes
+++ b/ccrtp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  6 12:45:33 UTC 2014 - dmueller@suse.com
+
+- add libgcrypt-1.6.diff: Fix build with libgcrypt-1.6 
+
 -------------------------------------------------------------------
 Thu Jun 13 21:32:27 UTC 2013 - jengelh@inai.de
 
diff --git a/ccrtp.spec b/ccrtp.spec
index a27a494..00f1857 100644
--- a/ccrtp.spec
+++ b/ccrtp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ccrtp
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,7 @@ Source:         ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz
 Source2:        ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz.sig
 Source3:        %name.keyring
 Patch1:         0001-build-properly-use-autotools.patch
+Patch2:         libgcrypt-1.6.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  doxygen
@@ -92,6 +93,7 @@ files, html browsable.
 %{?gpg_verify: %gpg_verify %{S:2}}
 %setup -q
 %patch -P 1 -p1
+%patch2
 
 %build
 # Got patches to .am
diff --git a/libgcrypt-1.6.diff b/libgcrypt-1.6.diff
new file mode 100644
index 0000000..2d06c8b
--- /dev/null
+++ b/libgcrypt-1.6.diff
@@ -0,0 +1,43 @@
+--- src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
++++ src/ccrtp/crypto/gcrypt/InitializeGcrypt.cpp
+@@ -22,6 +22,7 @@
+ #include <errno.h>
+ #include <gcrypt.h>
+ 
++#if GCRYPT_VERSION_NUMBER < 0x010600
+ /*
+  * The following macro was copied from gcrypt.h and modified to explicitly
+  * cast the pointer types to keep the compiler happy.
+@@ -60,8 +61,6 @@
+  *
+  */
+ 
+-static int initialized = 0;
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -70,13 +69,23 @@
+ }
+ #endif
+ 
++#else
++GCRY_THREAD_OPTION_PTHREAD_IMPL;
++#endif
++
++
++static int initialized = 0;
++
++
+ int initializeGcrypt ()
+ {
+ 
+     if (initialized) {
+ 	return 1;
+     }
++#if GCRYPT_VERSION_NUMBER < 0x010600
+     gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
++#endif
+     gcry_check_version(NULL);
+     gcry_control(GCRYCTL_DISABLE_SECMEM);
+     initialized = 1;