[Pkg-xfce-commits] r4698 - in goodies/branches/experimental/xfce4-mailwatch-plugin/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-11 21:25:37 +0000 (Sat, 11 Dec 2010)
New Revision: 4698

Added:
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch
Modified:
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog
   goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/series
Log:
* debian/patches:
  - 03_fix-implicit-dso-linking.patch: add missing -lgcrypt, fixes FTBFS with
    binutils-gold.
  - series: refreshed.

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog	2010-12-11 19:09:26 UTC (rev 4697)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/changelog	2010-12-11 21:25:37 UTC (rev 4698)
@@ -18,6 +18,10 @@
   [ Lionel Le Folgoc ]
   * debian/rules: clean up autogenerated files changed by xdt-autogen.
   * debian/control: add myself to Uploaders.
+  * debian/patches:
+    - 03_fix-implicit-dso-linking.patch: add missing -lgcrypt, fixes FTBFS with
+      binutils-gold.
+    - series: refreshed.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:16:29 +0100
 

Added: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/03_fix-implicit-dso-linking.patch	2010-12-11 21:25:37 UTC (rev 4698)
@@ -0,0 +1,38 @@
+Description: Link against libgcrypt
+Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=3271
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6969
+--- xfce4-mailwatch-plugin-1.1.0.orig/configure.ac
++++ xfce4-mailwatch-plugin-1.1.0/configure.ac
+@@ -81,7 +81,9 @@ dnl check for gnutls support
+ XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
+ 	[gnutls support for secure IMAP/POP3 connections], [yes])
+ if test "x$GNUTLS_FOUND" = "xyes"; then
+-	AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
++	AM_PATH_LIBGCRYPT([1.4.2], [AC_DEFINE([HAVE_SSL_SUPPORT], [1],
++                                [Define if SSL support is enabled])],
++                               [GNUTLS_FOUND = "no"])
+ fi
+ AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$GNUTLS_FOUND" = "xyes"])
+ 
+--- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.am
++++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am
+@@ -36,7 +36,8 @@ libmailwatch_la_LIBADD = \
+ 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
+ 	@GTHREAD_LIBS@ \
+ 	@XFCE4_PANEL_LIBS@ \
+-	@GNUTLS_LIBS@
++	@GNUTLS_LIBS@ \
++	@LIBGCRYPT_LIBS@
+ 
+ else
+ 
+@@ -62,7 +63,8 @@ xfce4_mailwatch_plugin_LDADD = \
+ 	@GTHREAD_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
+ 	@LIBXFCEGUI4_LIBS@ \
+-	@GNUTLS_LIBS@
++	@GNUTLS_LIBS@ \
++	@LIBGCRYPT_LIBS@
+ 
+ if HAVE_CYGWIN
+   xfce4_mailwatch_plugin_LDFLAGS = \

Modified: goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/series	2010-12-11 19:09:26 UTC (rev 4697)
+++ goodies/branches/experimental/xfce4-mailwatch-plugin/debian/patches/series	2010-12-11 21:25:37 UTC (rev 4698)
@@ -1,2 +1,3 @@
 01_fix-cpu-usage.diff
 02_link-with-libxfcegui4.patch
+03_fix-implicit-dso-linking.patch