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

- fix build with gcc4

Browse Source 
- regen plist
- regen wantlib

ok landry@
This commit is contained in:
jasper 2010-06-15 19:35:38 +00:00
parent a6b7b3244e
commit 267776fba7
9 changed files with 617 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mail/mail-notification/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.36 2009/12/21 22:20:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2010/06/15 19:35:38 jasper Exp $
COMMENT= mail notification for freedesktop.org-compliant system trays
DISTNAME= mail-notification-5.4
PKGNAME= ${DISTNAME}p11
DISTNAME= mail-notification-5.4
PKGNAME= ${DISTNAME}p12
CATEGORIES= mail
@ -17,16 +17,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage \
Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
art_lgpl_2 atk-1.0 bonobo-2 \
bonobo-activation bonoboui-2 c cairo crypto dbus-1 \
dbus-glib-1 expat fontconfig freetype gailutil \
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 \
glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \
gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 \
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png popt pthread pthread-stubs ssl xcb xml2 z
WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0
WANTLIB += bonobo-2 bonobo-activation bonoboui-2 c cairo crypto
WANTLIB += dbus-1 dbus-glib-1 expat fontconfig freetype gailutil
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0
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
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=mailnotify/}

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

@ -1,6 +1,55 @@
$OpenBSD: patch-jbsrc_jb_c,v 1.1 2008/12/02 09:11:15 ajacoutot Exp $
--- jbsrc/jb.c.orig Sun Nov 30 21:49:07 2008
+++ jbsrc/jb.c Sun Nov 30 21:49:30 2008
$OpenBSD: patch-jbsrc_jb_c,v 1.2 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4
- fix gtk-update-icon-cache line
--- jbsrc/jb.c.orig Thu May 22 17:47:04 2008
+++ jbsrc/jb.c Tue Jun 15 21:14:15 2010
@@ -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");
@ -10,3 +59,155 @@ $OpenBSD: patch-jbsrc_jb_c,v 1.1 2008/12/02 09:11:15 ajacoutot Exp $
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);

123
mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-action_c Normal file
View File

@ -0,0 +1,123 @@
$OpenBSD: patch-jbsrc_lib_src_core_jb-action_c,v 1.1 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4.
--- jbsrc/lib/src/core/jb-action.c.orig Tue Jun 15 21:17:17 2010
+++ jbsrc/lib/src/core/jb-action.c Tue Jun 15 21:18:50 2010
@@ -176,7 +176,7 @@ print_configure_report (void)
GSList *l;
jb_message("");
- jb_message_expand("$human-package $version was configured successfully.", NULL);
+ jb_message_expand("$human-package $version was configured successfully.", (void *)NULL);
jb_message("The following variables are in effect:");
varname_len = get_longest_displayable_variable_name_len();
@@ -185,7 +185,7 @@ print_configure_report (void)
report_variable_group(l->data, varname_len);
jb_message("");
- jb_message_expand("Type \"./jb build\" to build $human-package $version.", NULL);
+ jb_message_expand("Type \"./jb build\" to build $human-package $version.", (void *)NULL);
}
static void
@@ -269,7 +269,7 @@ ensure_configure (void)
jb_config_load();
else
{
- jb_message_expand("configuring $human-package $version with default values since \"./jb configure\" was not run...", NULL);
+ jb_message_expand("configuring $human-package $version with default values since \"./jb configure\" was not run...", (void *)NULL);
configure_real();
}
}
@@ -296,8 +296,8 @@ jb_action_build (GSList *group_names)
build_real(groups);
jb_message("");
- jb_message_expand("$human-package $version was built successfully.", NULL);
- jb_message_expand("Type \"sudo ./jb install\" to install $human-package $version.", NULL);
+ jb_message_expand("$human-package $version was built successfully.", (void *)NULL);
+ jb_message_expand("Type \"sudo ./jb install\" to install $human-package $version.", (void *)NULL);
g_slist_free(groups);
}
@@ -324,7 +324,7 @@ jb_action_install (GSList *group_names)
install_real(groups);
jb_message("");
- jb_message_expand("$human-package $version was installed successfully.", NULL);
+ jb_message_expand("$human-package $version was installed successfully.", (void *)NULL);
g_slist_free(groups);
}
@@ -380,13 +380,13 @@ jb_action_makedist (void)
build_real(groups);
makedist_real(groups);
- tarball = jb_variable_expand("${package}-$version.tar.bz2", NULL);
+ tarball = jb_variable_expand("${package}-$version.tar.bz2", (void *)NULL);
jb_message("creating build/%s", tarball);
jb_action_exec("cd build && tar -chof - ${package}-$version | bzip2 -9 -c >$tarball",
"tarball", tarball,
- NULL);
+ (void *)NULL);
jb_rmtree(jb_action_get_distdir());
@@ -418,7 +418,7 @@ jb_action_clean (GSList *group_names)
clean_real(groups);
jb_message("");
- jb_message_expand("$human-package $version was cleaned successfully.", NULL);
+ jb_message_expand("$human-package $version was cleaned successfully.", (void *)NULL);
g_slist_free(groups);
}
@@ -447,7 +447,7 @@ jb_action_distclean (GSList *group_names)
distclean_real(groups);
jb_message("");
- jb_message_expand("$human-package $version was dist-cleaned successfully.", NULL);
+ jb_message_expand("$human-package $version was dist-cleaned successfully.", (void *)NULL);
g_slist_free(groups);
}
@@ -477,7 +477,7 @@ jb_action_maintainerclean (GSList *group_names)
maintainerclean_real(groups);
jb_message("");
- jb_message_expand("$human-package $version was maintainer-cleaned successfully.", NULL);
+ jb_message_expand("$human-package $version was maintainer-cleaned successfully.", (void *)NULL);
g_slist_free(groups);
}
@@ -690,7 +690,7 @@ jb_action_install_to_file (const char *srcfile,
real_dstfile = jb_variable_expand("$destdir$dstfile",
"dstfile", dstfile,
- NULL);
+ (void *)NULL);
jb_message("installing %s", real_dstfile);
@@ -900,7 +900,7 @@ jb_action_add_to_dist (const char *file)
jb_action_exec("cp -p $file $distdir",
"file", file,
"distdir", distdir,
- NULL);
+ (void *)NULL);
g_free(distdir);
}
@@ -945,7 +945,7 @@ jb_action_get_distdir (void)
static char *distdir = NULL;
if (distdir == NULL)
- distdir = jb_variable_expand("build/${package}-$version", NULL);
+ distdir = jb_variable_expand("build/${package}-$version", (void *)NULL);
return distdir;
}

15
mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-compile-options_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-jbsrc_lib_src_core_jb-compile-options_c,v 1.1 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4.
--- jbsrc/lib/src/core/jb-compile-options.c.orig Tue Jun 15 21:24:07 2010
+++ jbsrc/lib/src/core/jb-compile-options.c Tue Jun 15 21:24:19 2010
@@ -265,7 +265,7 @@ jb_compile_options_add_string_defines (JBCompileOption
g_assert(value != NULL);
/* expand variables since we need to quote the value */
- evaluated = jb_variable_expand(value, NULL);
+ evaluated = jb_variable_expand(value, (void *)NULL);
c_quoted = jb_c_quote(evaluated);
g_free(evaluated);

51
mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-feature_c Normal file
View File

@ -0,0 +1,51 @@
$OpenBSD: patch-jbsrc_lib_src_core_jb-feature_c,v 1.1 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4.
--- jbsrc/lib/src/core/jb-feature.c.orig Tue Jun 15 21:20:22 2010
+++ jbsrc/lib/src/core/jb-feature.c Tue Jun 15 21:20:24 2010
@@ -131,7 +131,7 @@ intltool_configure (void)
gboolean result;
jb_message_checking("for XML::Parser");
- result = jb_exec_expand(NULL, NULL, "$perl -e 'require XML::Parser'", NULL);
+ result = jb_exec_expand(NULL, NULL, "$perl -e 'require XML::Parser'", (void *)NULL);
jb_message_result_bool(result);
if (! result)
@@ -172,7 +172,7 @@ gconf_configure (void)
{
char *config_source;
- if (! jb_exec_expand(&config_source, NULL, "$gconftool-2 --get-default-source", NULL))
+ if (! jb_exec_expand(&config_source, NULL, "$gconftool-2 --get-default-source", (void *)NULL))
jb_error("unable to detect the GConf configuration source address");
jb_variable_set_string("gconf-config-source", config_source);
@@ -186,7 +186,7 @@ gconf_configure (void)
static const char *ubuntu_dir = "$datadir/gconf/schemas";
char *expanded;
- expanded = jb_variable_expand(ubuntu_dir, NULL);
+ expanded = jb_variable_expand(ubuntu_dir, (void *)NULL);
if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
@@ -238,7 +238,7 @@ gnome_help_check_dir (const char *name,
if (jb_exec_expand(&result, NULL, "$scrollkeeper-config $arg",
"arg", scrollkeeper_config_arg,
- NULL))
+ (void *)NULL))
{
jb_message_result_string(result);
jb_variable_set_string(name, result);
@@ -358,7 +358,7 @@ gob2_configure (void)
jb_message_checking("for gob2 >= %s", minversion_string);
- if (jb_exec_expand(NULL, &output, "$gob2 --version", NULL))
+ if (jb_exec_expand(NULL, &output, "$gob2 --version", (void *)NULL))
{
char *version_string;
Version version;

130
mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-resource_c Normal file
View File

@ -0,0 +1,130 @@
$OpenBSD: patch-jbsrc_lib_src_core_jb-resource_c,v 1.1 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4.
--- jbsrc/lib/src/core/jb-resource.c.orig Tue Jun 15 21:21:03 2010
+++ jbsrc/lib/src/core/jb-resource.c Tue Jun 15 21:23:21 2010
@@ -559,7 +559,7 @@ object_file_build (JBObject *object, const char *ofile
depsflags = jb_variable_expand(" -MT $ofile -MD -MP -MF $depsfile",
"ofile", ofile,
"depsfile", depsfile,
- NULL);
+ (void *)NULL);
jb_mkdir_of_file(ofile);
@@ -578,7 +578,7 @@ object_file_build (JBObject *object, const char *ofile
"depsflags", depsflags,
"ofile", ofile,
"cfile", cfile,
- NULL);
+ (void *)NULL);
g_free(depsfile);
g_free(depsflags);
@@ -783,11 +783,11 @@ gob_class_pre_build (JBResource *res)
"group-gob2flags", jb_compile_options_get_gob2flags(gres->group->compile_options),
"object-gob2flags", jb_compile_options_get_gob2flags(ores->object->compile_options),
"gobfile", gobfile,
- NULL);
+ (void *)NULL);
jb_action_exec("touch $stamp",
"stamp", stamp,
- NULL);
+ (void *)NULL);
}
g_free(gobfile);
@@ -1003,8 +1003,8 @@ intltool_file_build (JBResource *res)
jb_mkdir_of_file(INTLTOOL_MERGE_OUT);
variables = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
- g_hash_table_insert(variables, "INTLTOOL_PERL", jb_variable_expand("$perl", NULL));
- g_hash_table_insert(variables, "INTLTOOL_LIBDIR", jb_variable_expand("$perl", NULL));
+ g_hash_table_insert(variables, "INTLTOOL_PERL", jb_variable_expand("$perl", (void *)NULL));
+ g_hash_table_insert(variables, "INTLTOOL_LIBDIR", jb_variable_expand("$perl", (void *)NULL));
jb_subst(INTLTOOL_MERGE_IN, INTLTOOL_MERGE_OUT, variables);
@@ -1030,7 +1030,7 @@ intltool_file_build (JBResource *res)
"merge-flags", self->merge_flags,
"infile", infile,
"outfile", outfile,
- NULL);
+ (void *)NULL);
}
g_free(infile);
@@ -1147,7 +1147,7 @@ gconf_schemas_install (JBResource *res)
jb_action_exec("GCONF_CONFIG_SOURCE=$gconf-config-source $gconftool-2 --makefile-install-rule $outfile",
"outfile", outfile,
- NULL);
+ (void *)NULL);
g_free(outfile);
}
@@ -1221,7 +1221,7 @@ gnome_help_get_files (JBGnomeHelp *self,
*helpdir = jb_variable_expand("$help-dir/$name/$lang",
"name", self->name,
"lang", self->lang,
- NULL);
+ (void *)NULL);
if (xmlfile != NULL)
*xmlfile = g_strdup_printf("%s/%s/%s.xml",
gres->group->srcdir,
@@ -1275,7 +1275,7 @@ gnome_help_build (JBResource *res)
"helpname", self->name,
"inomf", inomf,
"outomf", outomf,
- NULL);
+ (void *)NULL);
}
g_free(inomf);
@@ -1311,7 +1311,7 @@ gnome_help_install (JBResource *res)
jb_action_exec("-$scrollkeeper-update -p \"$destdir$scrollkeeper-dir\" -o \"$destdir$omfdir\"",
"omfdir", omfdir,
- NULL);
+ (void *)NULL);
g_free(outomf);
g_free(helpdir);
@@ -1427,7 +1427,7 @@ translations_build (JBResource *res)
jb_action_exec("$msgfmt -o $outfile.tmp $infile && mv -f $outfile.tmp $outfile",
"outfile", outfile,
"infile", infile,
- NULL);
+ (void *)NULL);
}
g_free(infile);
@@ -1599,7 +1599,7 @@ rule_expand_variables (JBRule *self, GSList *strings)
expanded = jb_variable_expand(str,
"srcdir", gres->group->srcdir,
"builddir", gres->group->builddir,
- NULL);
+ (void *)NULL);
result = g_slist_append(result, expanded);
}
@@ -1625,7 +1625,7 @@ rule_perform (JBRule *self, const char *message, GSLis
jb_action_exec(command,
"srcdir", gres->group->srcdir,
"builddir", gres->group->builddir,
- NULL);
+ (void *)NULL);
}
}
@@ -1824,7 +1824,7 @@ object_build (JBResource *res)
"stock-libs", object_class->stock_libs,
"outfile", outfile,
"object-files", object_files,
- NULL);
+ (void *)NULL);
g_free(object_files);
}

54
mail/mail-notification/patches/patch-jbsrc_lib_src_core_jb-tests_c Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-jbsrc_lib_src_core_jb-tests_c,v 1.1 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4.
--- jbsrc/lib/src/core/jb-tests.c.orig Tue Jun 15 21:20:58 2010
+++ jbsrc/lib/src/core/jb-tests.c Tue Jun 15 21:21:42 2010
@@ -215,7 +215,7 @@ jb_test_compile (const char *filename,
"extra-cflags", cflags,
"extra-cppflags", cppflags,
"filename", filename,
- NULL);
+ (void *)NULL);
}
gboolean
@@ -253,7 +253,7 @@ jb_test_link (const char *filename,
"extra-cppflags", cppflags,
"extra-ldflags", ldflags,
"extra-libs", libs,
- NULL);
+ (void *)NULL);
}
gboolean
@@ -386,17 +386,17 @@ jb_check_packages (const char *group_name,
status = jb_exec_expand(&cflags, NULL, "$pkg-config --cflags $packages",
"packages", quoted_packages,
- NULL)
+ (void *)NULL)
&& jb_exec_expand(&libs, NULL, "$pkg-config --libs $packages",
"packages", quoted_packages,
- NULL);
+ (void *)NULL);
if (status)
jb_variable_set_package_flags(varprefix, cflags, NULL, NULL, libs);
else
jb_exec_expand(NULL, &error, "$pkg-config --print-errors $packages",
"packages", quoted_packages,
- NULL);
+ (void *)NULL);
g_free(quoted_packages);
g_free(cflags);
@@ -492,7 +492,7 @@ jb_get_package_variable (const char *package, const ch
if (! jb_exec_expand(&value, NULL, "$pkg-config --variable=$variable $package",
"variable", variable,
"package", package,
- NULL))
+ (void *)NULL))
{
g_free(value);
value = NULL;

24
mail/mail-notification/patches/patch-jbsrc_lib_src_extras_jb-dbus_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-jbsrc_lib_src_extras_jb-dbus_c,v 1.1 2010/06/15 19:35:38 jasper Exp $
- fix build with gcc4.
--- jbsrc/lib/src/extras/jb-dbus.c.orig Tue Jun 15 21:24:28 2010
+++ jbsrc/lib/src/extras/jb-dbus.c Tue Jun 15 21:24:54 2010
@@ -102,7 +102,7 @@ dbus_interface_client_pre_build (JBResource *res)
jb_action_exec("$dbus-binding-tool --mode=glib-client $xmlfile > $clientfile.tmp && mv -f $clientfile.tmp $clientfile",
"xmlfile", xmlfile,
"clientfile", clientfile,
- NULL);
+ (void *)NULL);
}
g_free(xmlfile);
@@ -218,7 +218,7 @@ dbus_interface_server_pre_build (JBResource *res)
"server-prefix", self->server_prefix,
"xmlfile", xmlfile,
"serverfile", serverfile,
- NULL);
+ (void *)NULL);
}
g_free(xmlfile);

16
mail/mail-notification/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2009/12/21 22:20:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.13 2010/06/15 19:35:38 jasper Exp $
@bin bin/mail-notification
share/applications/mail-notification-properties.desktop
share/examples/mail-notification/
@ -15,23 +15,11 @@ share/gnome/help/mail-notification/C/figures/
share/gnome/help/mail-notification/C/figures/mail.png
share/gnome/help/mail-notification/C/mail-notification.xml
share/gnome/help/mail-notification/C/software-license.xml
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/mail-notification.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/mail-notification.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/mail-notification.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/mail-notification.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/mail-notification.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/mail-notification.svg
share/locale/bg/LC_MESSAGES/mail-notification.mo
share/locale/ca/LC_MESSAGES/mail-notification.mo
@ -46,6 +34,8 @@ share/locale/pt/LC_MESSAGES/mail-notification.mo
share/locale/pt_BR/LC_MESSAGES/mail-notification.mo
share/locale/ru/LC_MESSAGES/mail-notification.mo
share/locale/sr/LC_MESSAGES/mail-notification.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
share/locale/sv/LC_MESSAGES/mail-notification.mo
share/mail-notification/