Hello community, here is the log from the commit of package ccrtp for openSUSE:Factory checked in at 2014-01-06 17:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ccrtp (Old) and /work/SRC/openSUSE:Factory/.ccrtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ccrtp" Changes: -------- --- /work/SRC/openSUSE:Factory/ccrtp/ccrtp.changes 2013-06-14 15:43:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ccrtp.new/ccrtp.changes 2014-01-06 17:44:56.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 6 12:45:33 UTC 2014 - [email protected] + +- add libgcrypt-1.6.diff: Fix build with libgcrypt-1.6 + +------------------------------------------------------------------- New: ---- libgcrypt-1.6.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccrtp.spec ++++++ --- /var/tmp/diff_new_pack.5nyN9E/_old 2014-01-06 17:44:57.000000000 +0100 +++ /var/tmp/diff_new_pack.5nyN9E/_new 2014-01-06 17:44:57.000000000 +0100 @@ -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 @@ 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 @@ %{?gpg_verify: %gpg_verify %{S:2}} %setup -q %patch -P 1 -p1 +%patch2 %build # Got patches to .am ++++++ libgcrypt-1.6.diff ++++++ --- 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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
