[Pkg-xfce-commits] r8571 - in /goodies/trunk/xfce4-mailwatch-plugin/debian: changelog control patches/01_port-gcrypt20.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sat Sep  6 13:29:21 2014
New Revision: 8571

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8571
Log:
  - add build-dep on libgcrypt20-dev.
* debian/patches:
  - 01_port-gcrypt20 added, remove threads callback definitions since it's
    obsolete in gcrypt 1.6+.

Added:
    goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_port-gcrypt20.patch
    goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
Modified:
    goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
    goodies/trunk/xfce4-mailwatch-plugin/debian/control

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/debian/changelog?rev=8571&op=diff
==============================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	Sat Sep  6 13:29:21 2014
@@ -2,7 +2,11 @@
 
   * debian/control:
     - build against libgnutls28-dev.                            closes: #753168
+    - add build-dep on libgcrypt20-dev.
     - update standards version to 3.9.5.
+  * debian/patches:
+    - 01_port-gcrypt20 added, remove threads callback definitions since it's
+      obsolete in gcrypt 1.6+.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 30 Jun 2014 08:08:30 +0200
 

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/debian/control?rev=8571&op=diff
==============================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/control	(original)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/control	Sat Sep  6 13:29:21 2014
@@ -7,7 +7,7 @@
  Lionel Le Folgoc <lionel at lefolgoc.net>
 Build-Depends: debhelper (>= 9), libgtk2.0-dev, xfce4-panel-dev,
   libgnutls28-dev, libxml-parser-perl, libxfce4util-dev, libxfce4ui-1-dev,
-  libexo-1-dev, intltool, autotools-dev
+  libexo-1-dev, intltool, autotools-dev, libgcrypt20-dev
 Standards-Version: 3.9.5
 Homepage: http://spuriousinterrupt.org/projects/mailwatch
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/

Added: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_port-gcrypt20.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_port-gcrypt20.patch?rev=8571&op=file
==============================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_port-gcrypt20.patch	(added)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_port-gcrypt20.patch	Sat Sep  6 13:29:21 2014
@@ -0,0 +1,34 @@
+Author: Yves-Alexis Perez <corsac at debian.org>
+Description: Port to gnutls28/gcrypt20
+Forwarded: https://bugzilla.xfce.org/show_bug.cgi?id=11142
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753168
+--- a/libmailwatch-core/mailwatch-net-conn.c
++++ b/libmailwatch-core/mailwatch-net-conn.c
+@@ -133,7 +133,8 @@ typedef enum
+ 
+ #define GNUTLS_CA_FILE           "ca.pem"
+     
+-/* stuff to support 'gthreads' with gcrypt */
++#if GCRYPT_VERSION_NUMBER < 0x010600
++/* stuff to support 'gthreads' with gcrypt < 1.6 */
+ static int my_g_mutex_init(void **priv);
+ static int my_g_mutex_destroy(void **priv);
+ static int my_g_mutex_lock(void **priv);
+@@ -195,6 +196,7 @@ my_g_mutex_unlock(void **priv)
+     g_mutex_unlock(*gmx);
+     return 0;
+ }
++#endif /* GCRYPT_VERSION_NUMBER < 0x010600 */
+ 
+ #endif  /* defined(HAVE_SSL_SUPPORT) */
+ 
+@@ -365,7 +367,9 @@ xfce_mailwatch_net_conn_init(void)
+ 
+     if(!__inited) {
+ #ifdef HAVE_SSL_SUPPORT
++#if GCRYPT_VERSION_NUMBER < 0x010600
+         gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_gthread);
++#endif
+         gnutls_global_init();
+ #endif
+         __inited = TRUE;

Added: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series?rev=8571&op=file
==============================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series	(added)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series	Sat Sep  6 13:29:21 2014
@@ -0,0 +1 @@
+01_port-gcrypt20.patch