nossl.patch 2.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. Upstream-Status: Inappropriate [disable feature]
  2. Index: git/camel/Makefile.am
  3. ===================================================================
  4. --- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
  5. +++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000
  6. @@ -80,7 +80,6 @@
  7. camel-store-summary.c \
  8. camel-store.c \
  9. camel-tcp-stream-raw.c \
  10. - camel-tcp-stream-ssl.c \
  11. camel-tcp-stream.c \
  12. camel-transport.c \
  13. camel-uid-cache.c \
  14. @@ -133,7 +132,6 @@
  15. camel-store-summary.h \
  16. camel-store.h \
  17. camel-tcp-stream-raw.h \
  18. - camel-tcp-stream-ssl.h \
  19. camel-tcp-stream.h \
  20. camel-transport.h \
  21. camel-uid-cache.h \
  22. Index: git/camel/camel.h
  23. ===================================================================
  24. --- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000
  25. +++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000
  26. @@ -122,7 +122,6 @@
  27. #include <camel/camel-string-utils.h>
  28. #include <camel/camel-tcp-stream.h>
  29. #include <camel/camel-tcp-stream-raw.h>
  30. -#include <camel/camel-tcp-stream-ssl.h>
  31. #include <camel/camel-text-index.h>
  32. #include <camel/camel-transport.h>
  33. #include <camel/camel-trie.h>
  34. Index: git/camel/providers/imap/camel-imap-store.c
  35. ===================================================================
  36. --- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000
  37. +++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000
  38. @@ -51,7 +51,6 @@
  39. #include "camel/camel-stream.h"
  40. #include "camel/camel-string-utils.h"
  41. #include "camel/camel-tcp-stream-raw.h"
  42. -#include "camel/camel-tcp-stream-ssl.h"
  43. #include "camel/camel-url.h"
  44. #include "camel/camel-utf8.h"
  45. Index: git/configure.ac
  46. ===================================================================
  47. --- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000
  48. +++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000
  49. @@ -1272,7 +1272,8 @@
  50. dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
  51. dnl libical is fixed, we have to work-around the buggy CFlags.
  52. dnl *****
  53. - LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
  54. + m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
  55. + LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
  56. LIBICAL_EXTRA_LIBS=""
  57. AC_SUBST(LIBICAL_EXTRA_CFLAGS)
  58. AC_SUBST(LIBICAL_EXTRA_LIBS)
  59. Index: git/calendar/libecal/libecal.pc.in
  60. ===================================================================
  61. --- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000
  62. +++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000
  63. @@ -12,4 +12,4 @@
  64. Version: @VERSION@
  65. Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1
  66. Libs: -L${libdir} -lecal-1.2
  67. -Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
  68. +Cflags: -I${privincludedir}