diff --git a/audio/soundtracker/patches/patch-app_audioconfig_c b/audio/soundtracker/patches/patch-app_audioconfig_c new file mode 100644 index 00000000000..9dda9fd440c --- /dev/null +++ b/audio/soundtracker/patches/patch-app_audioconfig_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-app_audioconfig_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/audioconfig.c.orig Tue Jul 30 02:45:44 2002 ++++ app/audioconfig.c Tue Jul 30 02:46:22 2002 +@@ -163,7 +163,7 @@ static void + audioconfig_object_changed (void *a, + void *b) + { +- unsigned n = (int)b; ++ unsigned n = GPOINTER_TO_INT(b); + GList *l; + gchar *insertbuf[2] = { NULL }; + int i, active = -1; diff --git a/audio/soundtracker/patches/patch-app_file-operations_c b/audio/soundtracker/patches/patch-app_file-operations_c index 79f0da8e4a7..451675940a6 100644 --- a/audio/soundtracker/patches/patch-app_file-operations_c +++ b/audio/soundtracker/patches/patch-app_file-operations_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-app_file-operations_c,v 1.1 2002/05/30 09:08:28 wcobb Exp $ ---- app/file-operations.c.orig Tue May 28 23:38:51 2002 -+++ app/file-operations.c Tue May 28 23:39:04 2002 +$OpenBSD: patch-app_file-operations_c,v 1.2 2002/07/30 06:51:15 wcobb Exp $ +--- app/file-operations.c.orig Sat Feb 9 12:20:12 2002 ++++ app/file-operations.c Tue Jul 30 02:47:43 2002 @@ -25,6 +25,7 @@ #include @@ -9,3 +9,12 @@ $OpenBSD: patch-app_file-operations_c,v 1.1 2002/05/30 09:08:28 wcobb Exp $ #include "i18n.h" #include +@@ -214,7 +215,7 @@ void + fileops_open_dialog (void *dummy, + void *index) + { +- int n = (int)index; ++ int n = GPOINTER_TO_INT(index); + + if(!fileops_dialogs[n]) { + error_error(_("Operation not supported.")); diff --git a/audio/soundtracker/patches/patch-app_gui-subs_c b/audio/soundtracker/patches/patch-app_gui-subs_c new file mode 100644 index 00000000000..dda754c3222 --- /dev/null +++ b/audio/soundtracker/patches/patch-app_gui-subs_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-app_gui-subs_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/gui-subs.c.orig Tue Jul 30 02:47:58 2002 ++++ app/gui-subs.c Tue Jul 30 02:49:08 2002 +@@ -359,7 +359,7 @@ gui_build_option_menu (OptionMenuItem it + { + menu_item = gtk_radio_menu_item_new_with_label (group, items[i].name); + gtk_signal_connect (GTK_OBJECT (menu_item), "activate", +- (GtkSignalFunc) items[i].func, (void*)i); ++ (GtkSignalFunc) items[i].func, GINT_TO_POINTER(i)); + group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item)); + gtk_menu_append (GTK_MENU (menu), menu_item); + if (i == history) +@@ -443,7 +443,7 @@ cdialog_close (gpointer data) + gtk_widget_destroy(cdialog); + cdialog = NULL; + +- ccallback((gint)data, ccallbackdata); ++ ccallback(GPOINTER_TO_INT(data), ccallbackdata); + } + + static void diff --git a/audio/soundtracker/patches/patch-app_gui_c b/audio/soundtracker/patches/patch-app_gui_c new file mode 100644 index 00000000000..6ed89f3268c --- /dev/null +++ b/audio/soundtracker/patches/patch-app_gui_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-app_gui_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/gui.c.orig Tue Jul 30 02:49:25 2002 ++++ app/gui.c Tue Jul 30 02:49:38 2002 +@@ -474,7 +474,7 @@ keyevent (GtkWidget *widget, + sample_editor_handle_keys, + modinfo_page_handle_keys, + }; +- gboolean pressed = (gboolean)data; ++ gboolean pressed = (gboolean)GPOINTER_TO_INT(data); + gboolean handled = FALSE; + gboolean entry_focus = GTK_IS_ENTRY(GTK_WINDOW(mainwindow)->focus_widget); + diff --git a/audio/soundtracker/patches/patch-app_keys_c b/audio/soundtracker/patches/patch-app_keys_c new file mode 100644 index 00000000000..1eae0bdc741 --- /dev/null +++ b/audio/soundtracker/patches/patch-app_keys_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-app_keys_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/keys.c.orig Tue Jul 30 02:50:01 2002 ++++ app/keys.c Tue Jul 30 02:50:08 2002 +@@ -316,7 +316,7 @@ static void + keys_key_group_changed (void *a, + void *b) + { +- unsigned n = (int)b; ++ unsigned n = GPOINTER_TO_INT(b); + keys_key *kpt; + gchar string[128]; + gchar * insertbuf[2] = { NULL, string }; diff --git a/audio/soundtracker/patches/patch-app_menubar_c b/audio/soundtracker/patches/patch-app_menubar_c new file mode 100644 index 00000000000..25722473564 --- /dev/null +++ b/audio/soundtracker/patches/patch-app_menubar_c @@ -0,0 +1,38 @@ +$OpenBSD: patch-app_menubar_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/menubar.c.orig Tue Jul 30 02:50:28 2002 ++++ app/menubar.c Tue Jul 30 02:52:01 2002 +@@ -117,7 +117,7 @@ menubar_clear_callback (gint reply, + gpointer data) + { + if(reply == 0) { +- if((gint)data == 0) { ++ if(GPOINTER_TO_INT(data) == 0) { + gui_free_xm(); + gui_new_xm(); + xm->modified = 0; +@@ -709,19 +709,22 @@ menubar_gnome_to_gtk (GnomeUIInfo *gnome + switch(gnometree->type) { + case GNOME_APP_UI_SUBTREE: + menubar_gtk_items[n].callback = (GtkItemFactoryCallback)gnometree->func; +- menubar_gtk_items[n].callback_action = (guint)gnometree->funcparam; ++ menubar_gtk_items[n].callback_action = ++ GPOINTER_TO_UINT(gnometree->funcparam); + menubar_gtk_items[n].item_type = ""; + strip_underscores(buf, buf); + n = menubar_gnome_to_gtk((GnomeUIInfo*)gnometree->dummy1, n + 1, buf) - 1; + break; + case GNOME_APP_UI_ITEM: + menubar_gtk_items[n].callback = (GtkItemFactoryCallback)gnometree->func; +- menubar_gtk_items[n].callback_action = (guint)gnometree->funcparam; ++ menubar_gtk_items[n].callback_action = ++ GPOINTER_TO_UINT(gnometree->funcparam); + menubar_gtk_items[n].item_type = NULL; + break; + case GNOME_APP_UI_TOGGLEITEM: + menubar_gtk_items[n].callback = (GtkItemFactoryCallback)gnometree->func; +- menubar_gtk_items[n].callback_action = (guint)gnometree->funcparam; ++ menubar_gtk_items[n].callback_action = ++ GPOINTER_TO_UINT(gnometree->funcparam); + menubar_gtk_items[n].item_type = ""; + break; + case GNOME_APP_UI_SEPARATOR: diff --git a/audio/soundtracker/patches/patch-app_sample_editor_c b/audio/soundtracker/patches/patch-app_sample_editor_c index bcb6ac3542a..8fbeef04a79 100644 --- a/audio/soundtracker/patches/patch-app_sample_editor_c +++ b/audio/soundtracker/patches/patch-app_sample_editor_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-app_sample_editor_c,v 1.2 2002/05/30 09:08:28 wcobb Exp $ +$OpenBSD: patch-app_sample_editor_c,v 1.3 2002/07/30 06:51:15 wcobb Exp $ --- app/sample-editor.c.orig Thu May 16 11:55:24 2002 -+++ app/sample-editor.c Tue May 21 18:21:30 2002 ++++ app/sample-editor.c Tue Jul 30 02:53:03 2002 @@ -186,7 +186,7 @@ static void sample_editor_reverse_clicke static void sample_editor_lock_sample (void) @@ -28,3 +28,40 @@ $OpenBSD: patch-app_sample_editor_c,v 1.2 2002/05/30 09:08:28 wcobb Exp $ function = dlsym(handle, "afSetVirtualPCMMapping"); if(function == NULL) { libaf2 = FALSE; +@@ -2038,7 +2038,7 @@ static void + sample_editor_lrvol (GtkWidget *widget, + gpointer data) + { +- int mode = (int)data; ++ int mode = GPOINTER_TO_INT(data); + + switch(mode) + { +@@ -2056,7 +2056,7 @@ static void + sample_editor_open_volume_ramp_dialog (void) + { + GtkWidget *mainbox, *box1, *thing; +- int i; ++ gint i; + const char *labels1[] = { + _("Normalize"), + _("Execute"), +@@ -2146,7 +2146,8 @@ sample_editor_open_volume_ramp_dialog (v + gtk_widget_show(thing); + gtk_box_pack_start(GTK_BOX(box1), thing, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(thing), "clicked", +- GTK_SIGNAL_FUNC(sample_editor_perform_ramp), (gpointer)i); ++ GTK_SIGNAL_FUNC(sample_editor_perform_ramp), ++ GINT_TO_POINTER(i)); + } + + gtk_widget_show (volrampwindow); +@@ -2166,7 +2167,7 @@ static void + sample_editor_perform_ramp (GtkWidget *w, + gpointer data) + { +- int action = (int)data; ++ int action = GPOINTER_TO_INT(data); + double left, right; + const int ss = sampledisplay->sel_start, se = sampledisplay->sel_end; + int i; diff --git a/audio/soundtracker/patches/patch-app_scope-group_c b/audio/soundtracker/patches/patch-app_scope-group_c new file mode 100644 index 00000000000..f747056c191 --- /dev/null +++ b/audio/soundtracker/patches/patch-app_scope-group_c @@ -0,0 +1,21 @@ +$OpenBSD: patch-app_scope-group_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/scope-group.c.orig Tue Jul 30 02:53:16 2002 ++++ app/scope-group.c Tue Jul 30 02:53:33 2002 +@@ -223,7 +223,7 @@ scope_group_new (void) + { + ScopeGroup *s; + GtkWidget *button, *box, *thing; +- int i; ++ gint i; + char buf[5]; + + s = gtk_type_new(scope_group_get_type()); +@@ -244,7 +244,7 @@ scope_group_new (void) + gtk_signal_connect(GTK_OBJECT(button), "event", + GTK_SIGNAL_FUNC(scope_group_scope_event), s); + gtk_signal_connect(GTK_OBJECT(button), "toggled", +- GTK_SIGNAL_FUNC(button_toggled), (void*)i); ++ GTK_SIGNAL_FUNC(button_toggled), GINT_TO_POINTER(i)); + gtk_widget_show(button); + gtk_widget_ref(button); + diff --git a/audio/soundtracker/patches/patch-app_transposition_c b/audio/soundtracker/patches/patch-app_transposition_c new file mode 100644 index 00000000000..ad86dbc541d --- /dev/null +++ b/audio/soundtracker/patches/patch-app_transposition_c @@ -0,0 +1,59 @@ +$OpenBSD: patch-app_transposition_c,v 1.1 2002/07/30 06:51:15 wcobb Exp $ +--- app/transposition.c.orig Tue Jul 30 02:54:56 2002 ++++ app/transposition.c Tue Jul 30 02:56:33 2002 +@@ -127,7 +127,7 @@ transposition_transpose_notes (GtkWidget + { + int add = 0; + +- switch((int)data) { ++ switch(GPOINTER_TO_INT(data)) { + case 0: + add = +1; + break; +@@ -173,7 +173,7 @@ static void + transposition_change_instruments (GtkWidget *w, + gpointer data) + { +- int b = (int)data; ++ int b = GPOINTER_TO_INT(data); + + transposition_for_each (transposition_change_instruments_sub, b); + tracker_redraw(tracker); +@@ -184,14 +184,15 @@ static void + transposition_current_instrument_clicked (GtkWidget *w, + gpointer data) + { +- gtk_spin_button_set_value(GTK_SPIN_BUTTON(transposition_instrument_w[(int)data]), ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(transposition_instrument_w[ ++ GPOINTER_TO_INT(data)]), + gui_get_current_instrument()); + } + + void + transposition_dialog (void) + { +- int i; ++ gint i; + GtkWidget *mainbox, *thing, *box1, *box2, *frame, *hbox; + const char *labels1[] = { + _("Whole Song"), +@@ -279,7 +280,8 @@ transposition_dialog (void) + gtk_widget_show(thing); + gtk_box_pack_start(GTK_BOX(box1), thing, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(thing), "clicked", +- GTK_SIGNAL_FUNC(transposition_transpose_notes), (gpointer)i); ++ GTK_SIGNAL_FUNC(transposition_transpose_notes), ++ GINT_TO_POINTER(i)); + } + + frame = gtk_frame_new(NULL); +@@ -327,7 +329,8 @@ transposition_dialog (void) + gtk_widget_show(thing); + gtk_box_pack_start(GTK_BOX(box1), thing, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(thing), "clicked", +- GTK_SIGNAL_FUNC(transposition_change_instruments), (gpointer)i); ++ GTK_SIGNAL_FUNC(transposition_change_instruments), ++ GINT_TO_POINTER(i)); + } + + /* The button area */