cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use GMime 2.4.

Browse Source
This commit is contained in:
ajacoutot 2010-09-11 08:07:09 +00:00
parent 0cb0bd3828
commit f2c1d68ddc
5 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/mail-notification/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.38 2010/07/22 09:29:13 landry Exp $
# $OpenBSD: Makefile,v 1.39 2010/09/11 08:07:09 ajacoutot Exp $
COMMENT= mail notification for freedesktop.org-compliant system trays
DISTNAME= mail-notification-5.4
REVISION= 13
REVISION= 14
CATEGORIES= mail
@ -26,7 +26,7 @@ WANTLIB += glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2
WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png popt pthread
WANTLIB += pthread-stubs ssl xcb xcb-render xcb-render-util xml2
WANTLIB += z gnomeui-2.>=2400 notify sasl2 gmime-2.0
WANTLIB += z gnomeui-2.>=2400 notify sasl2 gmime-2.4
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=mailnotify/}
@ -41,7 +41,7 @@ RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \
LIB_DEPENDS= ::x11/gnome/libgnomeui \
::devel/libnotify \
::security/cyrus-sasl2 \
:gmime->=2.2,<2.4:mail/gmime
:gmime->=2.4:mail/gmime24
USE_X11= Yes
NO_REGRESS= Yes

15
mail/mail-notification/patches/patch-build_src_mn-base-mbox-mailbox-backend_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-build_src_mn-base-mbox-mailbox-backend_c,v 1.1 2010/09/11 08:07:09 ajacoutot Exp $
- fix build with GMime 2.4.
--- build/src/mn-base-mbox-mailbox-backend.c.orig Sat Sep 11 09:53:41 2010
+++ build/src/mn-base-mbox-mailbox-backend.c Sat Sep 11 09:53:41 2010
@@ -301,7 +301,7 @@ mn_base_mbox_mailbox_backend_get_mailbox_type (GnomeVF
mime_message = g_mime_parser_construct_message(parser);
if (mime_message)
{
- if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
+ if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
{
#if WITH_MOZILLA
type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;

15
mail/mail-notification/patches/patch-build_src_mn-mozilla-mailbox-backend_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-build_src_mn-mozilla-mailbox-backend_c,v 1.1 2010/09/11 08:07:09 ajacoutot Exp $
- fix build with GMime 2.4.
--- build/src/mn-mozilla-mailbox-backend.c.orig Sat Sep 11 09:53:38 2010
+++ build/src/mn-mozilla-mailbox-backend.c Sat Sep 11 09:53:38 2010
@@ -194,7 +194,7 @@ mn_mozilla_mailbox_backend_get_status_flags (GMimeMess
const char *header;
- header = g_mime_message_get_header(mime_message, header_name);
+ header = g_mime_object_get_header(mime_message, header_name);
if (header && mn_str_ishex(header))
return strtol(header, NULL, 16);
else

16
mail/mail-notification/patches/patch-jbsrc_jb_c
View File

@ -1,10 +1,20 @@
$OpenBSD: patch-jbsrc_jb_c,v 1.2 2010/06/15 19:35:38 jasper Exp $
$OpenBSD: patch-jbsrc_jb_c,v 1.3 2010/09/11 08:07:09 ajacoutot Exp $
- fix build with gcc4
- fix gtk-update-icon-cache line
- fix gtk-update-icon-cache line.
- fix build with GMime 2.4.
--- jbsrc/jb.c.orig Thu May 22 17:47:04 2008
+++ jbsrc/jb.c Tue Jun 15 21:14:15 2010
+++ jbsrc/jb.c Sat Sep 11 09:54:45 2010
@@ -166,7 +166,7 @@ jb_package_configure (void)
jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
+ jb_check_packages_for_options("GMime", "gmime", "gmime-2.4 >= 2.4.0",
"hotmail",
"imap",
"maildir",
@@ -176,7 +176,7 @@ jb_package_configure (void)
"pop3",
"sylpheed",

30
mail/mail-notification/patches/patch-src_mn-message-mime_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_mn-message-mime_c,v 1.1 2010/09/11 08:07:09 ajacoutot Exp $
- fix build with GMime 2.4.
--- src/mn-message-mime.c.orig Sat Sep 11 09:53:41 2010
+++ src/mn-message-mime.c Sat Sep 11 09:53:41 2010
@@ -33,12 +33,12 @@ is_spam (GMimeMessage *mime_message)
g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
/* SpamAssassin */
- spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
+ spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
return TRUE;
/* bogofilter */
- spam = g_mime_message_get_header(mime_message, "X-Bogosity");
+ spam = g_mime_object_get_header(mime_message, "X-Bogosity");
if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
return TRUE;
@@ -89,7 +89,7 @@ mn_message_new_from_mime_message_full (GType type,
{
const char *status;
- status = g_mime_message_get_header(mime_message, "Status");
+ status = g_mime_object_get_header(mime_message, "Status");
if (status && strchr(status, 'R'))
return NULL; /* the message was read */
else if (status && strchr(status, 'O'))