diff options
Diffstat (limited to 'x11/gtk2-chtheme')
-rw-r--r-- | x11/gtk2-chtheme/distinfo | 9 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-ab | 33 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-ac | 26 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-ad | 40 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-ae | 41 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-af | 61 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-ag | 54 | ||||
-rw-r--r-- | x11/gtk2-chtheme/patches/patch-ah | 17 |
8 files changed, 280 insertions, 1 deletions
diff --git a/x11/gtk2-chtheme/distinfo b/x11/gtk2-chtheme/distinfo index 9fa75c73cc9..794f571cf79 100644 --- a/x11/gtk2-chtheme/distinfo +++ b/x11/gtk2-chtheme/distinfo @@ -1,5 +1,12 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/12/28 03:26:19 minskim Exp $ +$NetBSD: distinfo,v 1.2 2005/01/21 20:17:58 kristerw Exp $ SHA1 (gtk-chtheme-0.3.1.tar.bz2) = dbea31f4092877e786fe040fae1374238fada94a Size (gtk-chtheme-0.3.1.tar.bz2) = 18205 bytes SHA1 (patch-aa) = ac7fa718bf0cdd0b36382761b8fd716cf00e6bad +SHA1 (patch-ab) = 084f5591a47e5a45c296a8abc5ae913c2c5723e9 +SHA1 (patch-ac) = 47152490f795614baf43c0cde147b54515e0a02d +SHA1 (patch-ad) = e175b381769f3397ae05245f1110ef674abdbda6 +SHA1 (patch-ae) = 0df9032aebee9f62e9e1a176642e127778b08035 +SHA1 (patch-af) = db5fad934c1dde3f2e150e65714fa4aee72d16e2 +SHA1 (patch-ag) = fca54c72ee877a4d297fbdc10db247d5cda0092b +SHA1 (patch-ah) = 3604869485aea5fd5ff903af41e5d7db39e0d373 diff --git a/x11/gtk2-chtheme/patches/patch-ab b/x11/gtk2-chtheme/patches/patch-ab new file mode 100644 index 00000000000..adbea0fd2c6 --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-ab @@ -0,0 +1,33 @@ +$NetBSD: patch-ab,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- about_dialog.c.orig Fri Jan 21 21:04:21 2005 ++++ about_dialog.c Fri Jan 21 21:05:21 2005 +@@ -36,22 +36,25 @@ + "</span>" + + void show_about_dialog(void) { ++ GtkWidget* about; ++ GtkWidget* box; ++ GtkWidget* ok_button; + GtkWidget* about_dlg = gtk_dialog_new(); + gtk_window_set_title(GTK_WINDOW(about_dlg), "About"); + gtk_window_set_resizable(GTK_WINDOW(about_dlg), FALSE); + gtk_dialog_set_has_separator(GTK_DIALOG(about_dlg), FALSE); + gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(about_dlg)->vbox), 20); + +- GtkWidget* about = GTK_WIDGET(gtk_label_new_from_pango_markup((ABOUT), GTK_JUSTIFY_CENTER)); ++ about = GTK_WIDGET(gtk_label_new_from_pango_markup((ABOUT), GTK_JUSTIFY_CENTER)); + +- GtkWidget* box = gtk_hbox_new(FALSE, 0); ++ box = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width(GTK_CONTAINER(box), 20); + gtk_box_pack_start(GTK_BOX(box), about, FALSE, FALSE, 10); + gtk_widget_show_all(box); + + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about_dlg)->vbox), box, FALSE, FALSE, 10); + +- GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(about_dlg), GTK_STOCK_OK, 0); ++ ok_button = gtk_dialog_add_button(GTK_DIALOG(about_dlg), GTK_STOCK_OK, 0); + gtk_button_set_use_stock(GTK_BUTTON(ok_button), TRUE); + + gtk_dialog_run(GTK_DIALOG(about_dlg)); diff --git a/x11/gtk2-chtheme/patches/patch-ac b/x11/gtk2-chtheme/patches/patch-ac new file mode 100644 index 00000000000..53c15ea9ce9 --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- font_sel.c.orig Fri Jan 21 21:00:43 2005 ++++ font_sel.c Fri Jan 21 21:01:41 2005 +@@ -27,17 +27,19 @@ + + static void font_browse_clicked(GtkWidget *widget, gpointer u) + { ++ gboolean is_confirmed; ++ const gchar *curfont; + GtkFontSelectionDialog *font_dlg = + GTK_FONT_SELECTION_DIALOG(gtk_font_selection_dialog_new("Select Font")); + + gtk_font_selection_dialog_set_preview_text(font_dlg, PROJNAME); + +- const gchar *curfont = gtk_entry_get_text(GTK_ENTRY(font_entry)); ++ curfont = gtk_entry_get_text(GTK_ENTRY(font_entry)); + + if (g_utf8_strlen(curfont, -1)) + gtk_font_selection_dialog_set_font_name(font_dlg, curfont); + +- gboolean is_confirmed = FALSE; ++ is_confirmed = FALSE; + + g_signal_connect(G_OBJECT(font_dlg->ok_button), "clicked", + G_CALLBACK(font_dlg_ok_clicked), &is_confirmed); diff --git a/x11/gtk2-chtheme/patches/patch-ad b/x11/gtk2-chtheme/patches/patch-ad new file mode 100644 index 00000000000..d63fadda8ed --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-ad @@ -0,0 +1,40 @@ +$NetBSD: patch-ad,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- main.c.orig Fri Jan 21 21:07:11 2005 ++++ main.c Fri Jan 21 21:09:43 2005 +@@ -75,15 +75,17 @@ + + void apply_new_look(gboolean is_preview) + { ++ FILE *gtkrc_fh; ++ gchar *include_file; + if(!themename) return; + + cleanup_temporary(); + +- FILE *gtkrc_fh = is_preview ++ gtkrc_fh = is_preview + ? fdopen(g_file_open_tmp("gtkrc.preview-XXXXXXXX", &tmp_rc, NULL), "w+") + : fopen(gtkrc, "w"); + +- gchar *include_file = g_hash_table_lookup(hash, themename); ++ include_file = g_hash_table_lookup(hash, themename); + + fprintf(gtkrc_fh, + "# -- THEME AUTO-WRITTEN DO NOT EDIT\n" "include \"%s\"\n\n", +@@ -101,6 +103,7 @@ + fprintf(gtkrc_fh, "# -- THEME AUTO-WRITTEN DO NOT EDIT\n"); + fclose(gtkrc_fh); + ++ { + gchar *default_files[] = { is_preview ? tmp_rc : gtkrc, NULL }; + gtk_rc_set_default_files(default_files); + +@@ -114,6 +117,7 @@ + { GDK_CLIENT_EVENT, NULL, TRUE, gdk_atom_intern("_GTK_READ_RCFILES", + FALSE), 8 }; + gdk_event_send_clientmessage_toall((GdkEvent *) & event); ++ } + } + } + diff --git a/x11/gtk2-chtheme/patches/patch-ae b/x11/gtk2-chtheme/patches/patch-ae new file mode 100644 index 00000000000..a66d8695680 --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-ae @@ -0,0 +1,41 @@ +$NetBSD: patch-ae,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- mainwin.c.orig Fri Jan 21 21:05:36 2005 ++++ mainwin.c Fri Jan 21 21:06:56 2005 +@@ -41,6 +41,10 @@ + + GtkWidget* create_mainwin(void) + { ++ GtkWidget* about_button; ++ GtkWidget* apply_button; ++ GtkWidget* ok_button; ++ GtkWidget *cancel_button; + GtkWidget *mainwin = gtk_dialog_new(); + gtk_widget_realize(mainwin); + gtk_window_set_title(GTK_WINDOW(mainwin), PROJNAME); +@@ -54,21 +58,21 @@ + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mainwin)->vbox), gtk_hseparator_new(), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mainwin)->vbox), create_font_sel(), FALSE, FALSE, 0); + +- GtkWidget* about_button = gtk_button_new_from_stock(GTK_STOCK_ABOUT); ++ about_button = gtk_button_new_from_stock(GTK_STOCK_ABOUT); + g_signal_connect(G_OBJECT(about_button), "clicked", G_CALLBACK(about_clicked), NULL); + gtk_box_pack_end(GTK_BOX(GTK_DIALOG(mainwin)->action_area), about_button, TRUE, TRUE, 0); + +- GtkWidget* apply_button = gtk_button_new_from_stock(GTK_STOCK_APPLY); ++ apply_button = gtk_button_new_from_stock(GTK_STOCK_APPLY); + g_signal_connect(G_OBJECT(apply_button), "clicked", G_CALLBACK(apply_clicked), NULL); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mainwin)->action_area), apply_button, TRUE, TRUE, 0); + await_activation(apply_button); + +- GtkWidget* ok_button = gtk_button_new_from_stock(GTK_STOCK_OK); ++ ok_button = gtk_button_new_from_stock(GTK_STOCK_OK); + g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(ok_clicked), NULL); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mainwin)->action_area), ok_button, TRUE, TRUE, 0); + await_activation(ok_button); + +- GtkWidget *cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); ++ cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL); + g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(gtk_main_quit), NULL); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mainwin)->action_area), cancel_button, TRUE, TRUE, 0); + diff --git a/x11/gtk2-chtheme/patches/patch-af b/x11/gtk2-chtheme/patches/patch-af new file mode 100644 index 00000000000..55601d49197 --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-af @@ -0,0 +1,61 @@ +$NetBSD: patch-af,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- preview_pane.c.orig Fri Jan 21 21:01:56 2005 ++++ preview_pane.c Fri Jan 21 21:12:41 2005 +@@ -23,17 +23,20 @@ + + GtkWidget* create_preview_pane(void) + { ++ GtkWidget* frame; + GtkBox* box = GTK_BOX(unfocussable(gtk_vbox_new(FALSE, 5))); + + { + gint i; + ++ GtkWidget *item; ++ GSList* group; + GtkWidget *menubar = unfocussable(gtk_menu_bar_new()); + + GtkWidget *menu = unfocussable(gtk_menu_new()); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), unfocussable(gtk_tearoff_menu_item_new())); + +- GtkWidget *item = unfocussable(gtk_menu_item_new_with_label("Menu")); ++ item = unfocussable(gtk_menu_item_new_with_label("Menu")); + gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu); + +@@ -51,7 +54,7 @@ + + gtk_menu_shell_append(GTK_MENU_SHELL(menu), unfocussable(gtk_separator_menu_item_new())); + +- GSList* group = NULL; ++ group = NULL; + for (i = 0; i < MENU_PREVIEW_ITEMS; i++) + { + item = unfocussable(gtk_radio_menu_item_new_with_label(group, "Radio")); +@@ -77,6 +80,7 @@ + { + GtkToolbar* toolbar = GTK_TOOLBAR(unfocussable(gtk_toolbar_new())); + GtkWidget* button; ++ GtkRadioButton* radio; + + button = unfocussable(gtk_check_button_new_with_label("Check 1")); + gtk_toolbar_append_widget(toolbar, button, "Tooltip", ""); +@@ -87,8 +91,6 @@ + + gtk_toolbar_append_space(toolbar); + +- GtkRadioButton* radio; +- + radio = GTK_RADIO_BUTTON(unfocussable(gtk_radio_button_new_with_label(NULL, "Radio 1"))); + gtk_toolbar_append_widget(toolbar, GTK_WIDGET(radio), "Tooltip", ""); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), TRUE); +@@ -143,7 +145,7 @@ + gtk_box_pack_start(box, GTK_WIDGET(hbox), FALSE, FALSE, 0); + } + +- GtkWidget* frame = unfocussable(gtk_frame_new("Preview")); ++ frame = unfocussable(gtk_frame_new("Preview")); + gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(box)); + + return frame; diff --git a/x11/gtk2-chtheme/patches/patch-ag b/x11/gtk2-chtheme/patches/patch-ag new file mode 100644 index 00000000000..1374c16a286 --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-ag @@ -0,0 +1,54 @@ +$NetBSD: patch-ag,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- theme_sel.c.orig Fri Jan 21 20:58:28 2005 ++++ theme_sel.c Fri Jan 21 21:00:30 2005 +@@ -53,6 +53,9 @@ + + GtkWidget *create_theme_sel(void) + { ++ GtkTreeViewColumn *column; ++ GtkTreeSelection *selection; ++ GtkWidget *sw; + GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING); + + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 0, +@@ -65,7 +68,7 @@ + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(theme_list), TRUE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(theme_list), 0); + +- GtkTreeSelection *selection = ++ selection = + gtk_tree_view_get_selection(GTK_TREE_VIEW(theme_list)); + + gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE); +@@ -81,11 +84,12 @@ + + do + { ++ GtkTreePath *p; + gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &newtheme, -1); + if (strcmp(newtheme, get_theme()) != 0) + continue; + +- GtkTreePath *p = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter); ++ p = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter); + + gtk_tree_view_set_cursor(GTK_TREE_VIEW(theme_list), p, NULL, FALSE); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(theme_list), p, NULL, TRUE, 0.5, 0); +@@ -97,14 +101,14 @@ + + g_object_unref(G_OBJECT(store)); + +- GtkTreeViewColumn *column = ++ column = + gtk_tree_view_column_new_with_attributes("Theme", + gtk_cell_renderer_text_new(), "text", 0, NULL); + + gtk_tree_view_column_set_sort_column_id(column, 0); + gtk_tree_view_append_column(GTK_TREE_VIEW(theme_list), column); + +- GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL); ++ sw = gtk_scrolled_window_new(NULL, NULL); + + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); diff --git a/x11/gtk2-chtheme/patches/patch-ah b/x11/gtk2-chtheme/patches/patch-ah new file mode 100644 index 00000000000..f56ec91b11f --- /dev/null +++ b/x11/gtk2-chtheme/patches/patch-ah @@ -0,0 +1,17 @@ +$NetBSD: patch-ah,v 1.1 2005/01/21 20:17:58 kristerw Exp $ + +--- util.c.orig Fri Jan 21 20:57:47 2005 ++++ util.c Fri Jan 21 20:58:10 2005 +@@ -34,10 +34,11 @@ + { + PangoAttrList *attrs; + gchar* parsed_text; ++ GtkLabel* label; + + pango_parse_markup(markup_text, -1, 0, &attrs, &parsed_text, NULL, NULL); + +- GtkLabel* label = GTK_LABEL(gtk_label_new(parsed_text)); ++ label = GTK_LABEL(gtk_label_new(parsed_text)); + gtk_label_set_attributes(label, attrs); + gtk_label_set_line_wrap(label, TRUE); + gtk_label_set_justify(label, jtype); |