pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gdm Fix C99 variable declarations to make this pkg...
details: https://anonhg.NetBSD.org/pkgsrc/rev/71cd6c97da65
branches: trunk
changeset: 496965:71cd6c97da65
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Sun Jul 17 22:53:06 2005 +0000
description:
Fix C99 variable declarations to make this pkg compile with gcc 2.95.
diffstat:
x11/gdm/distinfo | 6 +-
x11/gdm/patches/patch-ad | 21 +++
x11/gdm/patches/patch-ak | 21 +++
x11/gdm/patches/patch-al | 266 +++++++++++++++++++++++++++++++++++++++++++++++
x11/gdm/patches/patch-am | 17 +++
5 files changed, 330 insertions(+), 1 deletions(-)
diffs (truncated from 364 to 300 lines):
diff -r d96b418827cf -r 71cd6c97da65 x11/gdm/distinfo
--- a/x11/gdm/distinfo Sun Jul 17 22:12:08 2005 +0000
+++ b/x11/gdm/distinfo Sun Jul 17 22:53:06 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/07/13 13:10:27 wiz Exp $
+$NetBSD: distinfo,v 1.26 2005/07/17 22:53:06 kristerw Exp $
SHA1 (gdm-2.8.0.0.tar.bz2) = d97e2e489e84094151a795b6e4c3631b3a69deb9
RMD160 (gdm-2.8.0.0.tar.bz2) = 97927daf7914b830b0fabd8569bfa4084530fd14
@@ -12,9 +12,13 @@
SHA1 (patch-aa) = 8e81767c1cdb0d85ffcf3cf62a37ac0cb7ac8634
SHA1 (patch-ab) = c4966199d4fb6354a32e3229e8b51a08b0ff5b02
SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
+SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
SHA1 (patch-ae) = 55b66f0f32701f6911db88c0b7da29758a7b2b95
SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
SHA1 (patch-ah) = bbd92c7051479e54cce1182e54aca165c43e5ca4
SHA1 (patch-ai) = 263b4a326574bdbf03a350028e157427b36144f4
SHA1 (patch-aj) = 4aa63ab6e190dc80c298e6317e7f7882f5a319f9
+SHA1 (patch-ak) = b35c36326ce70c4840716bda948843c883876124
+SHA1 (patch-al) = 4117998f599c86cb6f8e96b6449bf1f1c3533e06
+SHA1 (patch-am) = 351eeed08bf6abac2a4817801a30c075acc7ebea
diff -r d96b418827cf -r 71cd6c97da65 x11/gdm/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gdm/patches/patch-ad Sun Jul 17 22:53:06 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.5 2005/07/17 22:53:06 kristerw Exp $
+
+--- daemon/xdmcp.c.orig Sun Jul 17 23:22:30 2005
++++ daemon/xdmcp.c Sun Jul 17 23:41:59 2005
+@@ -1175,6 +1175,7 @@
+
+ if (clnt_port.length == 2 &&
+ clnt_addr.length == 4) {
++ char * ipv4_addr;
+
+ /* Convert IPv4 address to IPv6 if needed */
+ struct sockaddr_in tmp_disp_sa = {0};
+@@ -1182,7 +1183,7 @@
+ memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_port, clnt_port.data, 2);
+ memcpy (&((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr.s_addr, clnt_addr.data, 4);
+
+- char * ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
++ ipv4_addr = inet_ntoa (((struct sockaddr_in *)(&tmp_disp_sa))->sin_addr);
+ strcpy(buffer6, "::ffff:");
+ strncat(buffer6, ipv4_addr, INET_ADDRSTRLEN);
+
diff -r d96b418827cf -r 71cd6c97da65 x11/gdm/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gdm/patches/patch-ak Sun Jul 17 22:53:06 2005 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ak,v 1.1 2005/07/17 22:53:06 kristerw Exp $
+
+--- gui/gdmchooser.c.orig Sun Jul 17 23:43:21 2005
++++ gui/gdmchooser.c Sun Jul 17 23:44:59 2005
+@@ -2030,6 +2030,7 @@
+ int nextopt;
+ const char *gdm_version;
+ int i;
++ guint sid;
+
+ stored_argv = g_new0 (char *, argc + 1);
+ for (i = 0; i < argc; i++)
+@@ -2124,7 +2125,7 @@
+ gdm_chooser_xdmcp_init (hosts);
+ poptFreeContext (ctx);
+
+- guint sid = g_signal_lookup ("event",
++ sid = g_signal_lookup ("event",
+ GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook (sid,
+ 0 /* detail */,
diff -r d96b418827cf -r 71cd6c97da65 x11/gdm/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gdm/patches/patch-al Sun Jul 17 22:53:06 2005 +0000
@@ -0,0 +1,266 @@
+$NetBSD: patch-al,v 1.1 2005/07/17 22:53:06 kristerw Exp $
+
+--- gui/gdmsetup.c.orig Sun Jul 17 23:50:28 2005
++++ gui/gdmsetup.c Mon Jul 18 00:06:08 2005
+@@ -334,13 +334,13 @@
+
+ for (li = list; li != NULL; li = li->next) {
+ char *key = li->data;
++ GtkTreeIter iter;
+ int vt = atoi(key);
+ key = g_strconcat(GDM_KEY_SERVERS, "/", key, NULL);
+ cpy = ve_config_get_string (cfg, key);
+ server = ve_first_word (cpy);
+ options = ve_rest (cpy);
+
+- GtkTreeIter iter;
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ XSERVER_COLUMN_VT, vt,
+@@ -2075,16 +2075,19 @@
+ const char *nosound_button;
+ const char *soundtest_button;
+ char *sound_key, *val, *config_val;
++ GtkWidget *acc_no_sound_file;
++ GtkWidget *acc_sound_test;
++ VeConfig *config;
+
+ nosound_button = g_strconcat ("acc_nosound_", key, "_button", NULL);
+ soundtest_button = g_strconcat ("acc_soundtest_", key, "_button", NULL);
+
+- GtkWidget *acc_no_sound_file = glade_helper_get (xml, nosound_button,
++ acc_no_sound_file = glade_helper_get (xml, nosound_button,
+ GTK_TYPE_BUTTON);
+- GtkWidget *acc_sound_test = glade_helper_get (xml, soundtest_button,
++ acc_sound_test = glade_helper_get (xml, soundtest_button,
+ GTK_TYPE_BUTTON);
+
+- VeConfig *config = ve_config_get (GDM_CONFIG_FILE);
++ config = ve_config_get (GDM_CONFIG_FILE);
+ gtk_label_set_text (GTK_LABEL (acc_sound_file_label), _("None"));
+ gtk_widget_set_sensitive (acc_no_sound_file, FALSE);
+ gtk_widget_set_sensitive (acc_sound_test, FALSE);
+@@ -2120,17 +2123,20 @@
+
+ const char *nosound_button;
+ const char *soundtest_button;
++ GtkWidget *acc_no_sound_file;
++ GtkWidget *acc_sound_test;
+ nosound_button = g_strconcat("acc_nosound_",key,"_button",NULL);
+ soundtest_button = g_strconcat("acc_soundtest_",key,"_button",NULL);
+
+- GtkWidget *acc_no_sound_file = glade_helper_get (xml, nosound_button,
++ acc_no_sound_file = glade_helper_get (xml, nosound_button,
+ GTK_TYPE_BUTTON);
+- GtkWidget *acc_sound_test = glade_helper_get (xml, soundtest_button,
++ acc_sound_test = glade_helper_get (xml, soundtest_button,
+ GTK_TYPE_BUTTON);
+ if (response == GTK_RESPONSE_ACCEPT) {
+ VeConfig *config = ve_config_get (GDM_CONFIG_FILE);
+ char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_dialog));
+ char *val;
++ char* sound_key;
+
+ gtk_label_set_text (GTK_LABEL (acc_sound_file_label), filename);
+
+@@ -2138,7 +2144,6 @@
+ gtk_widget_set_sensitive (acc_sound_test, TRUE);
+
+
+- char* sound_key;
+ if (strcmp (key, "ready") == 0 ) {
+ have_sound_ready_file = TRUE;
+ sound_key = g_strdup(GDM_KEY_SOUND_ON_LOGIN_READY_FILE);
+@@ -2270,6 +2275,9 @@
+ gchar *success_key = g_strdup("success");
+ gchar *failure_key = g_strdup("failure");
+ VeConfig *config = ve_config_get (GDM_CONFIG_FILE);
++ gboolean add_gtk_modules;
++ char *modules_list;
++ char *val;
+
+ g_object_set_data (G_OBJECT (acc_sound_ready_file_label), "key",
+ ready_key);
+@@ -2278,11 +2286,10 @@
+ g_object_set_data (G_OBJECT (acc_sound_failure_file_label), "key",
+ failure_key);
+
+- gboolean add_gtk_modules = ve_config_get_bool (config,
++ add_gtk_modules = ve_config_get_bool (config,
+ GDM_KEY_ADD_GTK_MODULES);
+- char *modules_list = ve_config_get_string (config,
++ modules_list = ve_config_get_string (config,
+ GDM_KEY_GTK_MODULES_LIST);
+- char *val;
+
+ if (add_gtk_modules &&
+ modules_list_contains (modules_list, "gail") &&
+@@ -2749,6 +2756,7 @@
+
+ /* Loop through all checkboxes */
+ while (gtk_tree_model_get_iter (model, &iter, path)) {
++ gboolean selected;
+ /* If this checkbox was just toggled */
+ if (gtk_tree_path_compare (path, sel_path) == 0) {
+
+@@ -2766,7 +2774,7 @@
+ }
+ }
+
+- gboolean selected = FALSE;
++ selected = FALSE;
+ gtk_tree_model_get (model, &iter, THEME_COLUMN_SELECTED_LIST,
+ &selected, THEME_COLUMN_DIR, &theme_name, -1);
+
+@@ -3435,12 +3443,15 @@
+ static gboolean
+ xserver_entry_timeout (GtkWidget *entry)
+ {
++ const char *key;
++ VeConfig *cfg;
++ const char *text;
+ /* Get xserver section to update */
+ GtkWidget *combobox = glade_helper_get (xml, "xserver_mod_combobox",
+ GTK_TYPE_COMBO_BOX);
+ gchar *section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combobox));
+ section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL);
+- const char *key = g_object_get_data (G_OBJECT (entry), "key");
++ key = g_object_get_data (G_OBJECT (entry), "key");
+
+ if (strcmp (key, GDM_KEY_SERVER_NAME) == 0)
+ section = g_strconcat(section, GDM_KEY_SERVER_NAME, NULL);
+@@ -3448,10 +3459,10 @@
+ section = g_strconcat(section, GDM_KEY_SERVER_COMMAND, NULL);
+
+ /* Locate this server's section */
+- VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE);
++ cfg = ve_config_get (GDM_CONFIG_FILE);
+
+ /* Update this servers configuration */
+- const char *text = gtk_entry_get_text (GTK_ENTRY (entry));
++ text = gtk_entry_get_text (GTK_ENTRY (entry));
+ ve_config_set_string (cfg, section, ve_sure_string (text));
+ ve_config_save (cfg, FALSE /* force */);
+ g_free(section);
+@@ -3462,12 +3473,15 @@
+ static gboolean
+ xserver_toggle_timeout (GtkWidget *toggle)
+ {
++ const char *key;
++ VeConfig *cfg;
++ gboolean val;
+ /* Get xserver section to update */
+ GtkWidget *combobox = glade_helper_get (xml, "xserver_mod_combobox",
+ GTK_TYPE_COMBO_BOX);
+ gchar *section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combobox));
+ section = g_strconcat(GDM_KEY_SERVER_PREFIX, section, "/", NULL);
+- const char *key = g_object_get_data (G_OBJECT (toggle), "key");
++ key = g_object_get_data (G_OBJECT (toggle), "key");
+
+ if (strcmp (key, GDM_KEY_SERVER_HANDLED) == 0)
+ section = g_strconcat(section, GDM_KEY_SERVER_HANDLED, NULL);
+@@ -3477,8 +3491,8 @@
+ section = g_strconcat(section, GDM_KEY_SERVER_CHOOSER, NULL);
+
+ /* Locate this server's section */
+- VeConfig *cfg = ve_config_get (GDM_CONFIG_FILE);
+- gboolean val = ve_config_get_bool (cfg, section);
++ cfg = ve_config_get (GDM_CONFIG_FILE);
++ val = ve_config_get_bool (cfg, section);
+
+ /* Update this servers configuration */
+ if ( ! ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) {
+@@ -3513,6 +3527,7 @@
+ xserver_populate_combobox(GtkComboBox* combobox)
+ {
+ gint i,j;
++ GSList *xservers;
+
+ /* Get number of items in combobox */
+ i = gtk_tree_model_iter_n_children(
+@@ -3524,7 +3539,7 @@
+ }
+
+ /* Populate combobox with list of current servers */
+- GSList *xservers = xservers_get_server_definitions();
++ xservers = xservers_get_server_definitions();
+ g_slist_foreach(xservers, (GFunc) xserver_append_combobox, combobox);
+ }
+
+@@ -3608,13 +3623,14 @@
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
++ char *key;
+ /* Update config */
+ cfg = ve_config_get (GDM_CONFIG_FILE);
+ gtk_tree_model_get (model, &iter, XSERVER_COLUMN_VT, &vt, -1);
+
+
+ g_snprintf (vt_value, sizeof (vt_value), "%d", vt);
+- char *key = g_object_get_data (G_OBJECT (combo), "key");
++ key = g_object_get_data (G_OBJECT (combo), "key");
+ key = g_strconcat (key, "/", vt_value, "=", NULL);
+ ve_config_delete_key (cfg, key);
+ ve_config_save (cfg, FALSE /* force */);
+@@ -3634,6 +3650,8 @@
+ GtkWidget *spinner, *combo, *entry, *button;
+ gchar *string;
+ char spinner_value[3];
++ char *key;
++ VeConfig *cfg;
+
+ /* Get Widgets from glade */
+ spinner = glade_helper_get (xml, "xserver_spin_button",
+@@ -3646,7 +3664,7 @@
+ GTK_TYPE_BUTTON);
+
+ /* Section in config to modify */
+- char *key = g_object_get_data (G_OBJECT (combo), "key");
++ key = g_object_get_data (G_OBJECT (combo), "key");
+
+ /* String to add to config */
+ g_snprintf (spinner_value, sizeof (spinner_value), "%d",
Home |
Main Index |
Thread Index |
Old Index