gmime.patch 4.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. Index: MIME-Fast-1.6/Fast/Part.xs
  2. --- MIME-Fast-1.6/Fast/Part.xs.orig 2004-12-17 12:55:42.000000000 +0100
  3. +++ MIME-Fast-1.6/Fast/Part.xs 2011-12-24 10:15:09.000000000 +0100
  4. @@ -48,7 +48,6 @@
  5. XSINTERFACE_FUNC_MIMEFAST_PART_SET
  6. INTERFACE:
  7. set_content_description
  8. - set_content_md5
  9. set_content_location
  10. set_content_disposition
  11. set_filename
  12. @@ -240,6 +239,9 @@
  13. g_mime_part_set_content_object(mime_part, mime_data_wrapper);
  14. g_mime_stream_unref(mime_stream);
  15. + } else if (SvPOKp(svval)) {
  16. + data = (char *)SvPV(svval, len);
  17. + g_mime_part_set_content(mime_part, data, len);
  18. } else if (svvaltype == SVt_PVMG) { // possible STDIN/STDOUT etc.
  19. int fd0 = (int)SvIV( svval );
  20. int fd;
  21. @@ -256,9 +258,6 @@
  22. g_mime_part_set_content_object(mime_part, mime_data_wrapper);
  23. g_mime_stream_unref(mime_stream);
  24. - } else if (SvPOK(svval)) {
  25. - data = (char *)SvPV(svval, len);
  26. - g_mime_part_set_content(mime_part, data, len);
  27. } else {
  28. croak("mime_set_content: Unknown type: %d", (int)svvaltype);
  29. }
  30. Index: MIME-Fast-1.6/gmime-stream-perlio.h
  31. --- MIME-Fast-1.6/gmime-stream-perlio.h.orig 2004-12-16 21:28:51.000000000 +0100
  32. +++ MIME-Fast-1.6/gmime-stream-perlio.h 2011-12-24 10:15:09.000000000 +0100
  33. @@ -36,11 +36,11 @@
  34. #include <gmime/gmime-stream.h>
  35. #define GMIME_TYPE_STREAM_PERLIO (g_mime_stream_perlio_get_type ())
  36. -#define GMIME_STREAM_PERLIO(obj) (GMIME_CHECK_CAST ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIO))
  37. -#define GMIME_STREAM_PERLIO_CLASS(klass) (GMIME_CHECK_CLASS_CAST ((klass), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass))
  38. -#define GMIME_IS_STREAM_PERLIO(obj) (GMIME_CHECK_TYPE ((obj), GMIME_TYPE_STREAM_PERLIO))
  39. -#define GMIME_IS_STREAM_PERLIO_CLASS(klass) (GMIME_CHECK_CLASS_TYPE ((klass), GMIME_TYPE_STREAM_PERLIO))
  40. -#define GMIME_STREAM_PERLIO_GET_CLASS(obj) (GMIME_CHECK_GET_CLASS ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass))
  41. +#define GMIME_STREAM_PERLIO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIO))
  42. +#define GMIME_STREAM_PERLIO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass))
  43. +#define GMIME_IS_STREAM_PERLIO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GMIME_TYPE_STREAM_PERLIO))
  44. +#define GMIME_IS_STREAM_PERLIO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GMIME_TYPE_STREAM_PERLIO))
  45. +#define GMIME_STREAM_PERLIO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass))
  46. typedef struct _GMimeStreamPerlIO GMimeStreamPerlIO;
  47. typedef struct _GMimeStreamPerlIOClass GMimeStreamPerlIOClass;
  48. Index: gmime/gmime-gpg-context.c
  49. --- gmime/gmime-gpg-context.c.orig 2011-06-12 21:01:30.000000000 +0200
  50. +++ gmime/gmime-gpg-context.c 2011-12-24 10:15:09.000000000 +0100
  51. @@ -34,6 +34,7 @@
  52. #include <string.h>
  53. #include <sys/time.h>
  54. #include <sys/types.h>
  55. +#include <sys/select.h>
  56. #include <sys/ioctl.h>
  57. #include <sys/stat.h>
  58. #include <sys/wait.h>
  59. Index: util/list.h
  60. --- util/list.h.orig 2011-03-05 03:18:09.000000000 +0100
  61. +++ util/list.h 2011-12-24 10:15:09.000000000 +0100
  62. @@ -25,6 +25,15 @@
  63. #include <glib.h>
  64. #include <string.h>
  65. +#define list_init gmime_list_init
  66. +#define list_is_empty gmime_list_is_empty
  67. +#define list_length gmime_list_length
  68. +#define list_unlink_head gmime_list_unlink_head
  69. +#define list_unlink_tail gmime_list_unlink_tail
  70. +#define list_prepend_node gmime_list_prepend_node
  71. +#define list_append_node gmime_list_append_node
  72. +#define list_node_unlink gmime_list_node_unlink
  73. +
  74. G_BEGIN_DECLS
  75. typedef struct _ListNode {
  76. Index: zentimer.h
  77. --- zentimer.h.orig 2011-04-23 17:57:00.000000000 +0200
  78. +++ zentimer.h 2011-12-24 10:15:09.000000000 +0100
  79. @@ -39,6 +39,8 @@
  80. #include <stdint.h>
  81. #elif HAVE_INTTYPES_H
  82. #include <inttypes.h>
  83. +#elif !defined(__linux__)
  84. +#include <sys/types.h>
  85. #else
  86. typedef unsigned char uint8_t;
  87. typedef unsigned long int uint32_t;