cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7b0c8c8b2e
openbsd-ports/mail/mail-notification/patches/patch-jbsrc_jb_c
ajacoutot f2c1d68ddc Use GMime 2.4.
2010-09-11 08:07:09 +00:00

224 lines
6.7 KiB
Plaintext
Raw Blame History

$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 build with GMime 2.4.
--- jbsrc/jb.c.orig Thu May 22 17:47:04 2008
+++ 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",
"yahoo",
- NULL);
+ (void *)NULL);
jb_check_packages_for_options("GNOME Keyring", "gnome-keyring", "gnome-keyring-1",
"pop3",
@@ -184,7 +184,7 @@ jb_package_configure (void)
"gmail",
"yahoo",
"hotmail",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("pop3") || jb_variable_get_bool("imap"))
{
@@ -276,7 +276,7 @@ add_vfs_test (JBGroup *group, const char *name, int bl
jb_object_add_sources(object,
"../src/mn-vfs.c",
"test-vfs-read-line.c",
- NULL);
+ (void *)NULL);
cppflags = g_strdup_printf("-Isrc -DREAD_LINE_BLOCK_SIZE=%i -DMN_REGRESSION_TEST", block_size);
jb_compile_options_add_cppflags(object->compile_options, cppflags);
@@ -315,7 +315,7 @@ add_vfs_test (JBGroup *group, const char *name, int bl
jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
- jb_group_add_dist_files(group, infile, expected, NULL);
+ jb_group_add_dist_files(group, infile, expected, (void *)NULL);
g_free(outfile);
g_free(infile);
@@ -351,7 +351,7 @@ jb_package_add_resources (void)
"32x32/apps/mail-notification.png", "$datadir/icons/hicolor/32x32/apps",
"48x48/apps/mail-notification.png", "$datadir/icons/hicolor/48x48/apps",
"scalable/apps/mail-notification.svg", "$datadir/icons/hicolor/scalable/apps",
- NULL);
+ (void *)NULL);
jb_group_add_data_file(group, "logo.png", "$pkgdatadir");
@@ -365,8 +365,6 @@ jb_package_add_resources (void)
jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
rule = jb_rule_new();
- jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
- jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
jb_group_add(group);
@@ -409,7 +407,7 @@ jb_package_add_resources (void)
jb_compile_options_add_string_defines(group->compile_options,
"GETTEXT_PACKAGE", "$package",
- NULL);
+ (void *)NULL);
object = JB_OBJECT(jb_program_new("mail-notification"));
@@ -434,7 +432,7 @@ jb_package_add_resources (void)
"PKGDATADIR", "$pkgdatadir",
"LIBDIR", "$libdir",
"GNOMELOCALEDIR", "$datadir/locale",
- NULL);
+ (void *)NULL);
/*
* We need --export-dynamic because because libglade needs to
@@ -492,7 +490,7 @@ jb_package_add_resources (void)
"mn-vfs",
"mn-xml",
"nautilus-cell-renderer-pixbuf-emblem",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("mbox"))
jb_object_add_source(object, "MN:Mbox:Mailbox:Backend");
@@ -510,20 +508,20 @@ jb_package_add_resources (void)
jb_object_add_sources(object,
"MN:Maildir:Mailbox:Backend",
"MN:Maildir:Message",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("pop3"))
jb_object_add_sources(object,
"MN:POP3:Mailbox",
"MN:POP3:Mailbox:Properties",
"mn-md5",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("imap"))
jb_object_add_sources(object,
"MN:IMAP:Mailbox",
"MN:IMAP:Mailbox:Properties",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("pop3") || jb_variable_get_bool("imap"))
jb_object_add_sources(object,
@@ -531,7 +529,7 @@ jb_package_add_resources (void)
"MN:PI:Mailbox",
"MN:PI:Mailbox:Properties",
"mn-client-session",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("pop3")
|| jb_variable_get_bool("imap")
@@ -544,14 +542,14 @@ jb_package_add_resources (void)
"MN:Authenticated:Mailbox",
"MN:Authenticated:Mailbox:Properties",
"mn-keyring",
- NULL);
+ (void *)NULL);
}
if (jb_variable_get_bool("sylpheed"))
jb_object_add_sources(object,
"MN:Sylpheed:Mailbox:Backend",
"MN:Sylpheed:Message",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("maildir") || jb_variable_get_bool("sylpheed"))
jb_object_add_source(object, "MN:VFS:Message");
@@ -560,25 +558,25 @@ jb_package_add_resources (void)
jb_object_add_sources(object,
"MN:Gmail:Mailbox",
"MN:Gmail:Mailbox:Properties",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("yahoo"))
jb_object_add_sources(object,
"MN:Yahoo:Mailbox",
"MN:Yahoo:Mailbox:Properties",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("hotmail"))
jb_object_add_sources(object,
"MN:Hotmail:Mailbox",
"MN:Hotmail:Mailbox:Properties",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("yahoo") || jb_variable_get_bool("hotmail"))
jb_object_add_sources(object,
"MN:Webmail:Mailbox",
"MN:Webmail:Mailbox:Properties",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("mbox")
|| jb_variable_get_bool("mozilla")
@@ -592,7 +590,7 @@ jb_package_add_resources (void)
"MN:System:VFS:Mailbox:Properties",
"MN:VFS:Mailbox",
"MN:VFS:Mailbox:Backend",
- NULL);
+ (void *)NULL);
if (jb_variable_get_bool("hotmail")
|| jb_variable_get_bool("imap")
@@ -609,7 +607,7 @@ jb_package_add_resources (void)
jb_object_add_sources(object,
"mn-message-mime",
"MN:GMime:Stream:VFS",
- NULL);
+ (void *)NULL);
}
if (jb_variable_get_bool("ssl"))
@@ -651,7 +649,7 @@ jb_package_add_resources (void)
"MN:Evolution:Mailbox:Properties",
"MN:Evolution:Message",
"mn-evolution.h",
- NULL);
+ (void *)NULL);
plugin = JB_OBJECT(jb_module_new("liborg-jylefort-mail-notification"));
@@ -677,7 +675,7 @@ jb_package_add_resources (void)
"MN:Evolution:Server",
"mn-evolution-plugin",
"mn-evolution.h",
- NULL);
+ (void *)NULL);
jb_group_add_resource(group, JB_GROUP_RESOURCE(plugin));
}
@@ -693,7 +691,7 @@ jb_package_add_resources (void)
jb_group_add_data_files(group,
"mailbox-properties-dialog.glade", "$pkgdatadir",
"properties-dialog.glade", "$pkgdatadir",
- NULL);
+ (void *)NULL);
jb_group_add(group);
Reference in New Issue View Git Blame Copy Permalink