From 49288a8855181df9c2f308dcf83cbeaf2442f138 Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 2 Jun 2008 16:42:21 +0000 Subject: make it build on DragonFly, from Hasso Tepper by PR pkg/38806, slightly modified by me --- x11/libgnomekbd/distinfo | 8 +++++++- x11/libgnomekbd/patches/patch-aa | 20 ++++++++++++++++++++ x11/libgnomekbd/patches/patch-ab | 29 +++++++++++++++++++++++++++++ x11/libgnomekbd/patches/patch-ac | 22 ++++++++++++++++++++++ x11/libgnomekbd/patches/patch-ad | 13 +++++++++++++ x11/libgnomekbd/patches/patch-ae | 31 +++++++++++++++++++++++++++++++ x11/libgnomekbd/patches/patch-af | 31 +++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 x11/libgnomekbd/patches/patch-aa create mode 100644 x11/libgnomekbd/patches/patch-ab create mode 100644 x11/libgnomekbd/patches/patch-ac create mode 100644 x11/libgnomekbd/patches/patch-ad create mode 100644 x11/libgnomekbd/patches/patch-ae create mode 100644 x11/libgnomekbd/patches/patch-af diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index 84f5c8bf3dc..83b35f5186e 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.4 2008/04/15 17:57:15 drochner Exp $ +$NetBSD: distinfo,v 1.5 2008/06/02 16:42:21 drochner Exp $ SHA1 (libgnomekbd-2.22.0.tar.bz2) = 62a11b227d4bcbc3df64fbdfc7e075e9366140da RMD160 (libgnomekbd-2.22.0.tar.bz2) = 23cabca07aaf18325fc6ca6d4daade4b86044ad0 Size (libgnomekbd-2.22.0.tar.bz2) = 406083 bytes +SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde +SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98 +SHA1 (patch-ac) = 7c22964c48779006509aebb703983d47f47fd593 +SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126 +SHA1 (patch-ae) = da103d07fcd3053ad0993b98542a6815dbc5e42b +SHA1 (patch-af) = 0c2569c177846e75e58922b38c9bb8f4fe762162 diff --git a/x11/libgnomekbd/patches/patch-aa b/x11/libgnomekbd/patches/patch-aa new file mode 100644 index 00000000000..6c300c168d0 --- /dev/null +++ b/x11/libgnomekbd/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.4 2008/06/02 16:42:21 drochner 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 diff --git a/x11/libgnomekbd/patches/patch-ab b/x11/libgnomekbd/patches/patch-ab new file mode 100644 index 00000000000..cf90acf1d92 --- /dev/null +++ b/x11/libgnomekbd/patches/patch-ab @@ -0,0 +1,29 @@ +$NetBSD: patch-ab,v 1.1 2008/06/02 16:42:21 drochner 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); + } + diff --git a/x11/libgnomekbd/patches/patch-ac b/x11/libgnomekbd/patches/patch-ac new file mode 100644 index 00000000000..d6b53a79ef8 --- /dev/null +++ b/x11/libgnomekbd/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2008/06/02 16:42:21 drochner Exp $ + +--- libgnomekbd/gkbd-indicator.c.orig 2007-10-08 17:18:41.000000000 +0200 ++++ libgnomekbd/gkbd-indicator.c +@@ -17,6 +17,8 @@ + * Boston, MA 02111-1307, USA. + */ + ++#include ++ + #include + + #include +@@ -306,7 +308,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, VPNULL); + } else { + /* "first" time this description */ + lbl_title = g_strdup (layout_name); diff --git a/x11/libgnomekbd/patches/patch-ad b/x11/libgnomekbd/patches/patch-ad new file mode 100644 index 00000000000..bf4f7fffb42 --- /dev/null +++ b/x11/libgnomekbd/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2008/06/02 16:42:21 drochner 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) { diff --git a/x11/libgnomekbd/patches/patch-ae b/x11/libgnomekbd/patches/patch-ae new file mode 100644 index 00000000000..041407af49f --- /dev/null +++ b/x11/libgnomekbd/patches/patch-ae @@ -0,0 +1,31 @@ +$NetBSD: patch-ae,v 1.1 2008/06/02 16:42:21 drochner Exp $ + +--- capplet/gkbd-indicator-plugins-capplet.c.orig 2008-05-31 14:45:57.000000000 +0200 ++++ capplet/gkbd-indicator-plugins-capplet.c +@@ -120,7 +120,7 @@ CappletActivePluginsSelectionChanged (Gt + gtk_label_set_text (GTK_LABEL (lblDescription), + g_strconcat ("", + _("No description."), +- "", NULL)); ++ "", VPNULL)); + gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); + + if (gtk_tree_selection_get_selected +@@ -149,7 +149,7 @@ CappletActivePluginsSelectionChanged (Gt + plugin-> + description, + "", +- NULL)); ++ VPNULL)); + gtk_label_set_use_markup (GTK_LABEL + (lblDescription), TRUE); + } +@@ -265,7 +265,7 @@ CappletSetup (GkbdIndicatorPluginsCapple + GtkTreeViewColumn *column = + gtk_tree_view_column_new_with_attributes (NULL, renderer, + "text", 0, +- NULL); ++ VPNULL); + GtkTreeSelection *selection; + glade_gnome_init (); + diff --git a/x11/libgnomekbd/patches/patch-af b/x11/libgnomekbd/patches/patch-af new file mode 100644 index 00000000000..ab3b05b9afb --- /dev/null +++ b/x11/libgnomekbd/patches/patch-af @@ -0,0 +1,31 @@ +$NetBSD: patch-af,v 1.1 2008/06/02 16:42:21 drochner Exp $ + +--- capplet/gkbd-indicator-plugins-add.c.orig 2008-05-31 14:46:50.000000000 +0200 ++++ capplet/gkbd-indicator-plugins-add.c +@@ -104,7 +104,7 @@ CappletAvailablePluginsSelectionChanged + gtk_label_set_text (GTK_LABEL (lblDescription), + g_strconcat ("", + _("No description."), +- "", NULL)); ++ "", 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 ("", + plugin-> +- description, "", NULL)); ++ description, "", VPNULL)); + 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); ++ VPNULL); + GtkTreeSelection *selection; + gint response; + availablePluginsList = glade_xml_get_widget (data, "allPlugins"); -- cgit v1.2.3