Subject: Patches for libgnomekbd (fix compile failure)
To: None <tech-pkg@netbsd.org>
From: walt <wa1ter@myrealbox.com>
List: tech-pkg
Date: 11/30/2007 09:46:26
x11/libgnomekbd is currently broken because of the -Werror flag. These
patches fix it:
$NetBSD$
--- capplet/gkbd-indicator-plugins-add.c.orig 2007-11-28 17:12:26 -0800
+++ capplet/gkbd-indicator-plugins-add.c
@@ -104,7 +104,7 @@ CappletAvailablePluginsSelectionChanged
gtk_label_set_text (GTK_LABEL (lblDescription),
g_strconcat ("<small><i>",
_("No description."),
- "</i></small>", NULL));
+ "</i></small>", (char *)NULL));
gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
if (fullPath != NULL)
@@ -116,7 +116,7 @@ CappletAvailablePluginsSelectionChanged
gtk_label_set_text (GTK_LABEL (lblDescription),
g_strconcat ("<small><i>",
plugin->
- description, "</i></small>", NULL));
+ description, "</i></small>", (char *)NULL));
gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
}
gtk_widget_set_sensitive (GTK_WIDGET
@@ -142,7 +142,7 @@ CappletEnablePlugin (GtkWidget * btnAdd,
renderer,
"text",
0,
- NULL);
+ (char *)NULL);
GtkTreeSelection *selection;
gint response;
availablePluginsList = glade_xml_get_widget (data, "allPlugins");
============================================================================
$NetBSD$
--- capplet/gkbd-indicator-plugins-capplet.c.orig 2007-11-28 17:09:52 -0800
+++ capplet/gkbd-indicator-plugins-capplet.c
@@ -115,7 +115,7 @@ CappletActivePluginsSelectionChanged (Gt
gtk_label_set_text (GTK_LABEL (lblDescription),
g_strconcat ("<small><i>",
_("No description."),
- "</i></small>", NULL));
+ "</i></small>", (char *)NULL));
gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
if (gtk_tree_selection_get_selected (selection, NULL, &selectedIter))
@@ -141,7 +141,7 @@ CappletActivePluginsSelectionChanged (Gt
g_strconcat ("<small><i>",
plugin->
description,
- "</i></small>", NULL));
+ "</i></small>", (char *)NULL));
gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
}
g_free (fullPath);
@@ -252,7 +252,7 @@ CappletSetup (GkbdIndicatorPluginsCapple
GtkTreeViewColumn *column =
gtk_tree_view_column_new_with_attributes (NULL, renderer,
"text", 0,
- NULL);
+ (char *)NULL);
GtkTreeSelection *selection;
glade_gnome_init ();
=====================================================================
$NetBSD$
--- libgnomekbd/gkbd-indicator-config.c.orig 2007-11-28 16:55:23 -0800
+++ libgnomekbd/gkbd-indicator-config.c
@@ -215,21 +215,21 @@ gkbd_indicator_config_init (GkbdIndicato
g_build_filename (g_get_home_dir
(),
".icons/flags",
- NULL));
+ (char *) NULL));
g_free (sp);
gtk_icon_theme_append_search_path (ind_config->icon_theme,
sp =
g_build_filename (DATADIR,
"pixmaps/flags",
- NULL));
+ (char *) NULL));
g_free (sp);
gtk_icon_theme_append_search_path (ind_config->icon_theme,
sp =
g_build_filename (DATADIR,
"icons/flags",
- NULL));
+ (char *) NULL));
g_free (sp);
}
==========================================================================
$NetBSD$
--- libgnomekbd/gkbd-indicator-plugin-manager.c.orig 2007-11-28 17:06:39 -0800
+++ libgnomekbd/gkbd-indicator-plugin-manager.c
@@ -53,7 +53,7 @@ gkbd_indicator_plugin_manager_add_plugin
xkl_debug (100, "Scanning [%s]...\n", dirname);
while ((filename = g_dir_read_name (dir)) != NULL) {
gchar *full_path =
- g_build_filename (dirname, filename, NULL);
+ g_build_filename (dirname, filename, (char *)NULL);
xkl_debug (100, "Loading plugin module [%s]...\n",
full_path);
if (full_path != NULL) {
==========================================================================
$NetBSD$
--- libgnomekbd/gkbd-indicator.c.orig 2007-11-28 17:02:01 -0800
+++ libgnomekbd/gkbd-indicator.c
@@ -307,7 +307,7 @@ gkbd_indicator_prepare_drawing (GkbdIndi
utf8length = g_unichar_to_utf8 (cidx, appendix);
appendix[utf8length] = '\0';
lbl_title =
- g_strconcat (layout_name, appendix, NULL);
+ g_strconcat (layout_name, appendix, (char *)NULL);
} else {
/* "first" time this description */
lbl_title = g_strdup (layout_name);