head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.2.2.1 OPENPKG_E1_FP:1.2.2.1 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.2.2.1 OPENPKG_2_STABLE_20060622:1.2 OPENPKG_2_STABLE:1.2.0.2 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_RELEASE:1.1 OPENPKG_2_5_SOLID:1.1.0.6 OPENPKG_2_5_SOLID_BP:1.1 OPENPKG_2_4_RELEASE:1.1 OPENPKG_2_4_SOLID:1.1.0.4 OPENPKG_2_4_SOLID_BP:1.1 OPENPKG_CW_FP:1.1 OPENPKG_2_3_RELEASE:1.1 OPENPKG_2_3_SOLID:1.1.0.2 OPENPKG_2_3_SOLID_BP:1.1; locks; strict; comment @# @; 1.5 date 2007.02.09.07.30.53; author rse; state Exp; branches; next 1.4; commitid ETVWOXzaf8aUQM5s; 1.4 date 2006.12.03.21.22.03; author rse; state Exp; branches; next 1.3; commitid 3V6WQvYx0STyD7Xr; 1.3 date 2006.08.03.07.48.05; author rse; state Exp; branches; next 1.2; commitid hCddfoCW9kbs3nHr; 1.2 date 2006.02.22.21.01.52; author rse; state Exp; branches 1.2.2.1; next 1.1; commitid oGP5cGUYkNwCECmr; 1.1 date 2005.01.12.14.56.27; author ms; state Exp; branches; next ; 1.2.2.1 date 2006.10.16.14.50.34; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @upgrading package: gmime 2.2.3 -> 2.2.4 @ text @Index: MIME-Fast-1.6/Fast/Part.xs --- MIME-Fast-1.6/Fast/Part.xs.orig 2004-12-17 12:55:42 +0100 +++ MIME-Fast-1.6/Fast/Part.xs 2007-02-09 08:15:50 +0100 @@@@ -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); } Index: MIME-Fast-1.6/gmime-stream-perlio.h --- MIME-Fast-1.6/gmime-stream-perlio.h.orig 2004-12-16 21:28:51 +0100 +++ MIME-Fast-1.6/gmime-stream-perlio.h 2007-02-09 08:15:50 +0100 @@@@ -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; Index: gmime/gmime-gpg-context.c --- gmime/gmime-gpg-context.c.orig 2007-02-08 06:18:39 +0100 +++ gmime/gmime-gpg-context.c 2007-02-09 08:15:50 +0100 @@@@ -27,6 +27,7 @@@@ #include #include #include +#include #include #include #include Index: util/list.h --- util/list.h.orig 2007-01-20 23:29:08 +0100 +++ util/list.h 2007-02-09 08:15:50 +0100 @@@@ -25,6 +25,15 @@@@ #include +#define list_init gmime_list_init +#define list_is_empty gmime_list_is_empty +#define list_length gmime_list_length +#define list_unlink_head gmime_list_unlink_head +#define list_unlink_tail gmime_list_unlink_tail +#define list_prepend_node gmime_list_prepend_node +#define list_append_node gmime_list_append_node +#define list_node_unlink gmime_list_node_unlink + G_BEGIN_DECLS typedef struct _ListNode { Index: zentimer.h --- zentimer.h.orig 2007-02-08 06:12:08 +0100 +++ zentimer.h 2007-02-09 08:18:06 +0100 @@@@ -29,6 +29,8 @@@@ #include #elif HAVE_INTTYPES_H #include +#elif !defined(__linux__) +#include #else typedef unsigned char uint8_t; typedef unsigned long int uint32_t; @ 1.4 log @try to resolve namespace conflict with libmysqlclient (affects dbmail and similar applications which link against both libgmime and libmysqlclient) @ text @d3 1 a3 1 +++ MIME-Fast-1.6/Fast/Part.xs 2006-08-03 09:32:29 +0200 a31 26 Index: MIME-Fast-1.6/Makefile.PL --- MIME-Fast-1.6/Makefile.PL.orig 2003-10-16 11:01:46 +0200 +++ MIME-Fast-1.6/Makefile.PL 2006-08-03 09:32:29 +0200 @@@@ -5,7 +5,13 @@@@ require 5.8.0; # require perl v5.8.0 or higher # my $libs = `pkg-config --libs gmime-2.0`; -my $libs = `gmime-config --libs`; +my $libs = "-L../gmime/.libs -L@@l_prefix@@/lib ".`gmime-config --libs`." -lgmime-2.0 ".`pkg-config --libs glib-2.0`; +$libs =~ s/-lgthread-\d\.\d//s; +$libs =~ s/-pthread//s; +$libs =~ s/\n/ /sg; +my $cflags = "-I. -Icinclude -I.. -I@@l_prefix@@/include ".`pkg-config --cflags glib-2.0`." ".`gmime-config --cflags`; +$cflags =~ s/-pthread//s; +$cflags =~ s/\n/ /sg; my $vers = `gmime-config --version`; if ($libs eq '') { @@@@ -77,6 +83,5 @@@@ # 'Fast.so' => qw{cinclude/gmime-stream-perlio.o} }, 'clean' => { FILES => "gmime-version.h" }, - # 'INC' => `pkg-config --cflags gmime-2.0` # e.g., '-I/usr/include/other' - 'INC' => "-I. -Icinclude " . `gmime-config --cflags`, + 'INC' => $cflags, ); d34 1 a34 1 +++ MIME-Fast-1.6/gmime-stream-perlio.h 2006-08-03 09:32:29 +0200 d53 2 a54 2 --- gmime/gmime-gpg-context.c.orig 2006-06-23 21:44:27 +0200 +++ gmime/gmime-gpg-context.c 2006-08-03 09:42:31 +0200 d64 2 a65 2 --- util/list.h.orig 2006-06-21 22:07:53 +0200 +++ util/list.h 2006-12-03 22:18:58 +0100 d82 12 @ 1.3 log @upgrading package: gmime 2.2.2 -> 2.2.3 @ text @d89 19 @ 1.2 log @add optional Perl API @ text @d3 1 a3 1 +++ MIME-Fast-1.6/Fast/Part.xs 2006-02-22 21:56:02 +0100 d34 1 a34 1 +++ MIME-Fast-1.6/Makefile.PL 2006-02-22 21:57:46 +0100 d60 1 a60 1 +++ MIME-Fast-1.6/gmime-stream-perlio.h 2006-02-22 21:56:02 +0100 d79 3 a81 10 --- gmime/gmime-gpg-context.c.orig 2005-05-03 19:34:17 +0200 +++ gmime/gmime-gpg-context.c 2006-02-22 21:56:02 +0100 @@@@ -25,13 +25,12 @@@@ #include #endif -#define _POSIX_SOURCE - #include #include @ 1.2.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d3 1 a3 1 +++ MIME-Fast-1.6/Fast/Part.xs 2006-08-03 09:32:29 +0200 d34 1 a34 1 +++ MIME-Fast-1.6/Makefile.PL 2006-08-03 09:32:29 +0200 d60 1 a60 1 +++ MIME-Fast-1.6/gmime-stream-perlio.h 2006-08-03 09:32:29 +0200 d79 10 a88 3 --- gmime/gmime-gpg-context.c.orig 2006-06-23 21:44:27 +0200 +++ gmime/gmime-gpg-context.c 2006-08-03 09:42:31 +0200 @@@@ -27,6 +27,7 @@@@ @ 1.1 log @handle FreeBSD for its Posix conformancy problems, deactivate flawed automatic mono discovery logic, patch for misplaced fd_set type in FreeBSD 5.3, and... gmime 2.1.9 -> 2.1.10 @ text @d1 77 d79 2 a80 3 diff -Nau gmime/gmime-gpg-context.c.orig gmime/gmime-gpg-context.c --- gmime/gmime-gpg-context.c.orig 2004-11-30 20:20:31 +0100 +++ gmime/gmime-gpg-context.c 2005-01-12 15:16:54 +0100 @