Hello community, here is the log from the commit of package abiword for openSUSE:Factory checked in at 2014-01-07 17:18:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abiword (Old) and /work/SRC/openSUSE:Factory/.abiword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "abiword" Changes: -------- --- /work/SRC/openSUSE:Factory/abiword/abiword.changes 2013-09-23 14:13:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.abiword.new/abiword.changes 2014-01-07 17:18:10.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Jan 5 20:59:40 UTC 2014 - [email protected] + +- Add abiword-gcrypt-1.6.0.patch: Fix build with gcrypt 1.6.0. + +------------------------------------------------------------------- New: ---- abiword-gcrypt-1.6.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.O92r4d/_old 2014-01-07 17:18:11.000000000 +0100 +++ /var/tmp/diff_new_pack.O92r4d/_new 2014-01-07 17:18:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package abiword # -# 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 @@ -32,6 +32,8 @@ Patch1: abiword-glib-2.31.patch # PATCH-FIX-UPSTREAM abiword-libpng15.patch [email protected] -- build also with libpng15 Patch2: abiword-libpng15.patch +# PATCH-FIX-UPSTREAM abiword-gcrypt-1.6.0.patch http://bugzilla.abisource.com/show_bug.cgi?id=13589 [email protected] -- Fix build with gcrypt 1.6.0 +Patch3: abiword-gcrypt-1.6.0.patch BuildRequires: asio-devel BuildRequires: bison BuildRequires: boost-devel @@ -108,6 +110,7 @@ %patch0 -p1 %patch1 -p0 %patch2 -p0 +%patch3 -p1 %build # -fno-strict-aliasing added 2009-04-12. Still needed for 2.8.1. ++++++ abiword-gcrypt-1.6.0.patch ++++++ Index: abiword-2.8.6/plugins/collab/backends/service/xp/tls_tunnel.cpp =================================================================== --- abiword-2.8.6.orig/plugins/collab/backends/service/xp/tls_tunnel.cpp +++ abiword-2.8.6/plugins/collab/backends/service/xp/tls_tunnel.cpp @@ -123,11 +123,16 @@ static int gcry_tunnel_mutex_unlock(void return 0; } +#if GCRYPT_VERSION_NUMBER >= 0x010600 + GCRY_THREAD_OPTION_PTHREAD_IMPL; + static struct gcry_thread_cbs &gcry_threads_tunnel = gcry_threads_pthread; +#else static struct gcry_thread_cbs gcry_threads_tunnel = { GCRY_THREAD_OPTION_USER, NULL, gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; +#endif bool Proxy::tls_tunnel_init() { if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
