From e7b366bcbb2d4a3673f79f75528b629f34ad58be Mon Sep 17 00:00:00 2001 From: skv Date: Mon, 14 Feb 2005 13:29:55 +0000 Subject: * fix build with newest gmime * add workaround for set_content() Note that issue with pthread still unresolved. --- mail/p5-MIME-Fast/Makefile | 1 + mail/p5-MIME-Fast/files/patch-Part.xs | 30 ++++++++++++++++++++++ .../p5-MIME-Fast/files/patch-gmime-stream-perlio.h | 19 ++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 mail/p5-MIME-Fast/files/patch-Part.xs create mode 100644 mail/p5-MIME-Fast/files/patch-gmime-stream-perlio.h diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile index de0c9561627b..6efd62daf98d 100644 --- a/mail/p5-MIME-Fast/Makefile +++ b/mail/p5-MIME-Fast/Makefile @@ -7,6 +7,7 @@ PORTNAME= MIME-Fast PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= MIME diff --git a/mail/p5-MIME-Fast/files/patch-Part.xs b/mail/p5-MIME-Fast/files/patch-Part.xs new file mode 100644 index 000000000000..fdb5d88f7d58 --- /dev/null +++ b/mail/p5-MIME-Fast/files/patch-Part.xs @@ -0,0 +1,30 @@ +--- Fast/Part.xs.orig 2004-12-20 17:59:39.603786200 +0300 ++++ Fast/Part.xs 2004-12-27 18:05:31.374875000 +0300 +@@ -48,7 +48,6 @@ + XSINTERFACE_FUNC_MIMEFAST_PART_SET + INTERFACE: + set_content_description +- set_content_md5 + set_content_location + set_content_disposition + set_filename +@@ -240,6 +239,9 @@ + g_mime_part_set_content_object(mime_part, mime_data_wrapper); + + g_mime_stream_unref(mime_stream); ++ } else if (SvPOKp(svval)) { ++ data = (char *)SvPV(svval, len); ++ g_mime_part_set_content(mime_part, data, len); + } else if (svvaltype == SVt_PVMG) { // possible STDIN/STDOUT etc. + int fd0 = (int)SvIV( svval ); + int fd; +@@ -256,9 +258,6 @@ + g_mime_part_set_content_object(mime_part, mime_data_wrapper); + + g_mime_stream_unref(mime_stream); +- } else if (SvPOK(svval)) { +- data = (char *)SvPV(svval, len); +- g_mime_part_set_content(mime_part, data, len); + } else { + croak("mime_set_content: Unknown type: %d", (int)svvaltype); + } diff --git a/mail/p5-MIME-Fast/files/patch-gmime-stream-perlio.h b/mail/p5-MIME-Fast/files/patch-gmime-stream-perlio.h new file mode 100644 index 000000000000..32c1f527a57b --- /dev/null +++ b/mail/p5-MIME-Fast/files/patch-gmime-stream-perlio.h @@ -0,0 +1,19 @@ +--- gmime-stream-perlio.h.orig Thu Dec 16 23:28:51 2004 ++++ gmime-stream-perlio.h Sat Feb 12 19:26:52 2005 +@@ -36,11 +36,11 @@ + #include + + #define GMIME_TYPE_STREAM_PERLIO (g_mime_stream_perlio_get_type ()) +-#define GMIME_STREAM_PERLIO(obj) (GMIME_CHECK_CAST ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIO)) +-#define GMIME_STREAM_PERLIO_CLASS(klass) (GMIME_CHECK_CLASS_CAST ((klass), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass)) +-#define GMIME_IS_STREAM_PERLIO(obj) (GMIME_CHECK_TYPE ((obj), GMIME_TYPE_STREAM_PERLIO)) +-#define GMIME_IS_STREAM_PERLIO_CLASS(klass) (GMIME_CHECK_CLASS_TYPE ((klass), GMIME_TYPE_STREAM_PERLIO)) +-#define GMIME_STREAM_PERLIO_GET_CLASS(obj) (GMIME_CHECK_GET_CLASS ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass)) ++#define GMIME_STREAM_PERLIO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIO)) ++#define GMIME_STREAM_PERLIO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass)) ++#define GMIME_IS_STREAM_PERLIO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GMIME_TYPE_STREAM_PERLIO)) ++#define GMIME_IS_STREAM_PERLIO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GMIME_TYPE_STREAM_PERLIO)) ++#define GMIME_STREAM_PERLIO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GMIME_TYPE_STREAM_PERLIO, GMimeStreamPerlIOClass)) + + typedef struct _GMimeStreamPerlIO GMimeStreamPerlIO; + typedef struct _GMimeStreamPerlIOClass GMimeStreamPerlIOClass; -- cgit