- Move libgnomekbd to libgnomekbd2 for older Gnome2 packages
- Import libgnomekbd 3.6.0 for Cinnamon and Gnome3.


(youri)

$NetBSD: patch-aa,v 1.1 2018/06/01 17:04:18 youri Exp $

--- config.h.in.orig	2008-05-31 14:33:00.000000000 +0200
+++ config.h.in
@@ -80,3 +80,15 @@
 
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
+
+/*
+ * If NULL is just "0", and is used to terminate the argument list
+ * of functions with the gcc "sentinel" attribute, gcc4 emits
+ * a warning. Temporarily work around the issue until all supported
+ * platforms have the correct definition.
+ */
+#ifdef __DragonFly__ /* releases prior to 2.0 */
+#define VPNULL (void *)NULL
+#else
+#define VPNULL NULL
+#endif

$NetBSD: patch-ab,v 1.1 2018/06/01 17:04:18 youri Exp $

--- libgnomekbd/gkbd-indicator-config.c.orig	2008-05-31 14:43:07.000000000 +0200
+++ libgnomekbd/gkbd-indicator-config.c
@@ -213,21 +213,21 @@ gkbd_indicator_config_init (GkbdIndicato
 					   g_build_filename (g_get_home_dir
 							     (),
 							     ".icons/flags",
-							     NULL));
+							     VPNULL));
 	g_free (sp);
 
 	gtk_icon_theme_append_search_path (ind_config->icon_theme,
 					   sp =
 					   g_build_filename (DATADIR,
 							     "pixmaps/flags",
-							     NULL));
+							     VPNULL));
 	g_free (sp);
 
 	gtk_icon_theme_append_search_path (ind_config->icon_theme,
 					   sp =
 					   g_build_filename (DATADIR,
 							     "icons/flags",
-							     NULL));
+							     VPNULL));
 	g_free (sp);
 }
 

$NetBSD: patch-ad,v 1.1 2018/06/01 17:04:18 youri Exp $

--- libgnomekbd/gkbd-indicator-plugin-manager.c.orig	2008-05-31 14:45:15.000000000 +0200
+++ 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, VPNULL);
 		xkl_debug (100, "Loading plugin module [%s]...\n",
 			   full_path);
 		if (full_path != NULL) {

$NetBSD: patch-ae,v 1.1 2018/06/01 17:04:18 youri Exp $

--- capplet/gkbd-indicator-plugins-capplet.c.orig	2009-09-14 20:53:43.000000000 +0200
+++ capplet/gkbd-indicator-plugins-capplet.c
@@ -116,7 +116,7 @@ CappletActivePluginsSelectionChanged (Gt
 	gtk_label_set_text (GTK_LABEL (lblDescription),
 			    g_strconcat ("<small><i>",
 					 _("No description."),
-					 "</i></small>", NULL));
+					 "</i></small>", VPNULL));
 	gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
 
 	if (gtk_tree_selection_get_selected
@@ -145,7 +145,7 @@ CappletActivePluginsSelectionChanged (Gt
 							 plugin->
 							 description,
 							 "</i></small>",
-							 NULL));
+							 VPNULL));
 			gtk_label_set_use_markup (GTK_LABEL
 						  (lblDescription), TRUE);
 		}
@@ -284,7 +284,7 @@ CappletSetup (GkbdIndicatorPluginsCapple
 	GtkTreeViewColumn *column =
 	    gtk_tree_view_column_new_with_attributes (NULL, renderer,
 						      "text", 0,
-						      NULL);
+						      VPNULL);
 	GtkTreeSelection *selection;
 	builder = gtk_builder_new ();
 

$NetBSD: patch-af,v 1.1 2018/06/01 17:04:18 youri Exp $

--- capplet/gkbd-indicator-plugins-add.c.orig	2009-05-13 00:17:30.000000000 +0200
+++ 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>", VPNULL));
   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>", VPNULL));
       gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
     }
   gtk_widget_set_sensitive (GTK_WIDGET
@@ -141,7 +141,7 @@ CappletEnablePlugin (GtkWidget * btnAdd,
 									renderer,
 									"text",
 									0,
-									NULL);
+									VPNULL);
   GtkTreeSelection *selection;
   gint response;