From ce8128ab2d8693643afaba6a980048c61e36ae99 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:24:38 +0000 Subject: [PATCH 1/7] Initialize branch F-7 for xfce-mcs-plugins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 8b03b84fb8282dc0523b3135f208f52622190457 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 31 Jul 2007 05:30:38 +0000 Subject: [PATCH 2/7] Add dpi interface option. (fixes #244286) --- xfce-mcs-plugins-4.4.1-dpi.patch | 350 +++++++++++++++++++++++++++++++ xfce-mcs-plugins.spec | 7 +- 2 files changed, 356 insertions(+), 1 deletion(-) create mode 100644 xfce-mcs-plugins-4.4.1-dpi.patch diff --git a/xfce-mcs-plugins-4.4.1-dpi.patch b/xfce-mcs-plugins-4.4.1-dpi.patch new file mode 100644 index 0000000..2ba4e61 --- /dev/null +++ b/xfce-mcs-plugins-4.4.1-dpi.patch @@ -0,0 +1,350 @@ +diff -uNr xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c +--- xfce-mcs-plugins-4.4.1.orig/plugins/ui_plugin/ui_plugin.c 2007-02-17 00:38:20.000000000 -0800 ++++ xfce-mcs-plugins-4.4.1/plugins/ui_plugin/ui_plugin.c 2007-06-14 05:51:52.000000000 -0700 +@@ -16,6 +16,7 @@ + gnome theme-switcher capplet - (c) Jonathan Blandford + xfce4 mcs plugin - (c) 2002 Olivier Fourdan + (c) 2004-2006 Benedikt Meurer ++ (c) 2005-2007 Brian Tarircone + sub-pixel icons stolen from KDE :) + + */ +@@ -29,6 +30,10 @@ + #include + #endif + ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++ + #include + + #include +@@ -112,6 +117,17 @@ + "aaaaaaaaaaaa" + }; + ++static const gchar *xft_dpi_default_entries[4] = ++{ ++ N_("System Default"), "75", "96", "100", ++}; ++static const gint xft_dpi_default_values[4] = ++{ ++ /* fortunately, 'Xft.dpi: 0' appears to be interpreted as ++ * 'system default' */ ++ 0, 75, 96, 100, ++}; ++ + #define RCDIR "mcs_settings" + #define OLDRCDIR "settings" + #define RCFILE "gtk.xml" +@@ -143,6 +159,7 @@ + static gint current_xft_hinting = DEFAULT_XFT_HINTING; + static gchar *current_xft_hintstyle = NULL; + static gchar *current_xft_rgba = NULL; ++static gint current_dpi = 0; + + static GtkTooltips *tooltips = NULL; + +@@ -167,7 +184,9 @@ + GtkWidget *label1; + GtkWidget *vbox3; + GtkWidget *frame2; ++ GtkWidget *font_vbox; + GtkWidget *button3; ++ GtkWidget *dpi_combo; + GtkWidget *frame3; + GtkWidget *optionmenu1; + GtkWidget *frame5; +@@ -499,6 +518,188 @@ + } + } + ++static void ++handle_dpi_change(Itf *itf) ++{ ++ gint r; ++ ++ mcs_manager_set_int(itf->mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); ++ mcs_manager_notify(itf->mcs_plugin->manager, CHANNEL); ++ write_options(itf->mcs_plugin); ++ apply_xft_options(itf); ++ ++ r = xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), _("DPI Changed"), ++ GTK_STOCK_DIALOG_INFO, ++ _("DPI was changed successfully"), ++ _("However, you may need to restart your session for the settings to take effect."), ++ XFCE_CUSTOM_STOCK_BUTTON, ++ _("Log Out Later"), ++ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, ++ XFCE_CUSTOM_STOCK_BUTTON, _("Log Out Now"), ++ GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL); ++ if(GTK_RESPONSE_ACCEPT == r) { ++ GError *error = NULL; ++ ++ if(!xfce_exec("xfce4-session-logout", FALSE, FALSE, &error)) { ++ xfce_message_dialog(GTK_WINDOW(itf->theme_dialog), ++ _("Exec Error"), GTK_STOCK_DIALOG_ERROR, ++ _("Failed to run \"xfce4-session-logout\""), ++ error->message, ++ GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); ++ g_error_free(error); ++ } ++ } ++} ++ ++static gboolean ++handle_user_entered_dpi(Itf *itf) ++{ ++ GtkWidget *dlg, *topvbox, *hbox, *img, *lbl, *spin, *spacer; ++ gint resp; ++ ++ dlg = xfce_titled_dialog_new_with_buttons(_("Custom DPI"), ++ GTK_WINDOW(itf->theme_dialog), ++ GTK_DIALOG_NO_SEPARATOR ++ | GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_STOCK_CANCEL, ++ GTK_RESPONSE_CANCEL, ++ GTK_STOCK_SAVE, ++ GTK_RESPONSE_ACCEPT, NULL); ++ gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT); ++ gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-ui"); ++ topvbox = GTK_DIALOG(dlg)->vbox; ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_DIALOG_INFO, ++ GTK_ICON_SIZE_DIALOG); ++ gtk_widget_show(img); ++ gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new(_("Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look.")); ++ gtk_label_set_line_wrap(GTK_LABEL(lbl), TRUE); ++ gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, 0); ++ ++ spacer = gtk_alignment_new(0.5, 0.5, 1.0, 1.0); ++ gtk_widget_set_size_request(spacer, -1, 12); ++ gtk_widget_show(spacer); ++ gtk_box_pack_start(GTK_BOX(topvbox), spacer, FALSE, FALSE, 0); ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(topvbox), hbox, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Custom _DPI:")); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); ++ ++ spin = gtk_spin_button_new_with_range(24, 264, 1); ++ if(!current_dpi) { ++ /* FIXME: get the actual current dpi */ ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 100); ++ } else ++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), current_dpi); ++ gtk_widget_show(spin); ++ gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); ++ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), spin); ++ ++ resp = gtk_dialog_run(GTK_DIALOG(dlg)); ++ ++ if(GTK_RESPONSE_ACCEPT == resp) ++ current_dpi = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); ++ ++ gtk_widget_destroy(dlg); ++ ++ return (GTK_RESPONSE_ACCEPT == resp); ++} ++ ++static void ++on_dpi_combo_changed(GtkComboBox *combo, ++ gpointer user_data) ++{ ++ Itf *itf = (Itf *)user_data; ++ gint selected, old_dpi = current_dpi; ++ ++ selected = gtk_combo_box_get_active(combo); ++ ++ if(selected < G_N_ELEMENTS(xft_dpi_default_values)) ++ current_dpi = xft_dpi_default_values[selected]; ++ else { ++ gchar *text = gtk_combo_box_get_active_text(combo); ++ if(!strcmp(text, _("Other..."))) { ++ if(handle_user_entered_dpi(itf)) { ++ gint i; ++ gboolean done = FALSE; ++ ++ /* if there's an old custom dpi, remove it from the box */ ++ if(selected > G_N_ELEMENTS(xft_dpi_default_values)) ++ gtk_combo_box_remove_text(combo, selected - 1); ++ ++ /* make sure they didn't set one of our default values */ ++ for(i = 1; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(xft_dpi_default_values[i] == current_dpi) { ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, i); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ done = TRUE; ++ break; ++ } ++ } ++ ++ if(!done) { ++ /* if we get here, we have to create a new entry */ ++ gchar *str = g_strdup_printf("%d", current_dpi); ++ gtk_combo_box_insert_text(combo, ++ G_N_ELEMENTS(xft_dpi_default_values), ++ str); ++ ++ /* set the combo to the new entry, but block this func ++ * from getting called on the change */ ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, ++ G_N_ELEMENTS(xft_dpi_default_values)); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ } ++ } else { ++ /* user canceled, so reset the last-selected item */ ++ gint i; ++ ++ for(i = 0; i <= G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(G_N_ELEMENTS(xft_dpi_default_values) == i ++ || xft_dpi_default_values[i] == current_dpi) ++ { ++ g_signal_handlers_block_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ gtk_combo_box_set_active(combo, i); ++ g_signal_handlers_unblock_by_func(G_OBJECT(combo), ++ G_CALLBACK(on_dpi_combo_changed), ++ itf); ++ break; ++ } ++ } ++ } ++ } else ++ current_dpi = atoi(text); /* we should be able to trust this */ ++ g_free(text); ++ } ++ ++ if(old_dpi != current_dpi) ++ handle_dpi_change(itf); ++} ++ + static gint sort_func(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer user_data) + { + gchar *a_str = NULL; +@@ -672,6 +873,8 @@ + GdkPixbuf *icon; + GtkTreeIter iter; + GtkCellRenderer *cell[2]; ++ GtkWidget *hbox, *lbl; ++ gint i, selected = -1; + + dialog = g_new(Itf, 1); + +@@ -758,11 +961,50 @@ + gtk_widget_show(dialog->vbox3); + gtk_box_pack_start(GTK_BOX(dialog->hbox1), dialog->vbox3, TRUE, TRUE, 0); + ++ dialog->font_vbox = gtk_vbox_new(FALSE, BORDER); ++ gtk_widget_show(dialog->font_vbox); ++ + dialog->button3 = gtk_button_new(); + gtk_button_set_label(GTK_BUTTON(dialog->button3), current_font); + gtk_widget_show(dialog->button3); ++ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), dialog->button3, FALSE, FALSE, 0); ++ ++ hbox = gtk_hbox_new(FALSE, BORDER); ++ gtk_widget_show(hbox); ++ gtk_box_pack_start(GTK_BOX(dialog->font_vbox), hbox, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Font _DPI:")); ++ gtk_widget_show(lbl); ++ gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0); ++ ++ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_values); ++i) { ++ if(xft_dpi_default_values[i] == current_dpi) { ++ selected = i; ++ break; ++ } ++ } ++ ++ dialog->dpi_combo = gtk_combo_box_new_text(); ++ for(i = 0; i < G_N_ELEMENTS(xft_dpi_default_entries); ++i) { ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), ++ _(xft_dpi_default_entries[i])); ++ if(selected == i) ++ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), selected); ++ } ++ if(-1 == selected) { ++ gchar *str = g_strdup_printf("%d", current_dpi); ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), str); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->dpi_combo), ++ G_N_ELEMENTS(xft_dpi_default_entries)); ++ g_free(str); ++ } ++ gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->dpi_combo), ++ _("Other...")); ++ gtk_widget_show(dialog->dpi_combo); ++ gtk_box_pack_start(GTK_BOX(hbox), dialog->dpi_combo, TRUE, TRUE, 0); ++ gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), dialog->dpi_combo); + +- dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->button3); ++ dialog->frame2 = xfce_create_framebox_with_content (_("Font"), dialog->font_vbox); + gtk_widget_show(dialog->frame2); + gtk_box_pack_start(GTK_BOX(dialog->vbox3), dialog->frame2, TRUE, FALSE, 0); + +@@ -919,6 +1161,7 @@ + + g_signal_connect(G_OBJECT(itf->theme_dialog), "response", G_CALLBACK(cb_dialog_response), itf->mcs_plugin); + g_signal_connect(G_OBJECT(itf->button3), "clicked", G_CALLBACK(show_font_selection), itf); ++ g_signal_connect(G_OBJECT(itf->dpi_combo), "changed", G_CALLBACK(on_dpi_combo_changed), itf); + g_signal_connect(G_OBJECT(itf->optionmenu1), "changed", G_CALLBACK(on_icons_changed), itf); + g_signal_connect(G_OBJECT(itf->accel_checkbox), "toggled", G_CALLBACK(on_change_accel_toggled), itf); + +@@ -1036,6 +1279,12 @@ + current_font = g_strdup(DEFAULT_FONT); + mcs_manager_set_string(mcs_plugin->manager, "Gtk/FontName", CHANNEL, current_font); + } ++ ++ setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL); ++ if(setting) ++ current_dpi = setting->data.v_int; ++ else ++ mcs_manager_set_int(mcs_plugin->manager, "Xfce/XftDPI", CHANNEL, current_dpi); + + setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Gtk/ToolbarStyle", CHANNEL); + if(setting) +@@ -1167,12 +1416,20 @@ + else + fprintf(fp, "Xft.hintstyle: hintnone\n"); + fprintf(fp, "Xft.rgba: %s\n", current_xft_rgba); ++ if(current_dpi > 0) ++ fprintf(fp, "Xft.dpi: %d\n", current_dpi); + fclose(fp); + + /* run xrdb to merge the new settings */ + cmd = g_strdup_printf("xrdb -nocpp -merge \"%s\"", path); + g_spawn_command_line_async(cmd, NULL); + g_free(cmd); ++ ++ if(!current_dpi) { ++ /* filter out Xft.dpi from xrdb */ ++ g_spawn_command_line_async("sh -c \"xrdb -query | grep -i -v '^Xft.dpi:' | xrdb\"", ++ NULL); ++ } + } + g_free(path); + } diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index ce9ab40..521cce6 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,12 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch +Patch1: xfce-mcs-plugins-4.4.1-dpi.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,6 +26,7 @@ settings manager. %prep %setup -q %patch -p1 -b .fedora +%patch1 -p1 -b .dpi %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 +- Add dpi interface option. (fixes #244286) + * Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 - Update to 4.4.1 From c2a546616307079d83e77264ebb192c0c9121de2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Aug 2007 21:18:40 +0000 Subject: [PATCH 3/7] Update License tag --- xfce-mcs-plugins.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 521cce6..8694557 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,8 +1,8 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.1 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 Patch: xfce-mcs-plugins-4.2.0-rh.patch @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 +- Update License tag + * Mon Jul 30 2007 Kevin Fenzi - 4.4.1-2 - Add dpi interface option. (fixes #244286) From 95f7392dc3fcfed0c7d4de13f637b0b1a55b9467 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Dec 2007 03:38:38 +0000 Subject: [PATCH 4/7] Update to 4.4.2 --- .cvsignore | 2 +- sources | 2 +- xfce-mcs-plugins-4.4.2-fedora.patch | 14 ++++++++++++++ xfce-mcs-plugins.spec | 15 ++++++++------- 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 xfce-mcs-plugins-4.4.2-fedora.patch diff --git a/.cvsignore b/.cvsignore index 59947cf..f49e1c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce-mcs-plugins-4.4.1.tar.bz2 +xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/sources b/sources index 986c5b7..232146e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99f05b5ce95f24c205731565210aa8a9 xfce-mcs-plugins-4.4.1.tar.bz2 +77fcc929058de530d4f91eb25de851a1 xfce-mcs-plugins-4.4.2.tar.bz2 diff --git a/xfce-mcs-plugins-4.4.2-fedora.patch b/xfce-mcs-plugins-4.4.2-fedora.patch new file mode 100644 index 0000000..bcde2a9 --- /dev/null +++ b/xfce-mcs-plugins-4.4.2-fedora.patch @@ -0,0 +1,14 @@ +--- xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c.orig 2007-12-01 20:56:27.000000000 +0100 ++++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c 2007-12-01 20:59:17.000000000 +0100 +@@ -131,9 +131,9 @@ + #define RCFILE "gtk.xml" + #define CHANNEL "settings" + #define PLUGIN_NAME "ui" +-#define DEFAULT_THEME "Default" ++#define DEFAULT_THEME "Clearlooks" + #define INITIAL_THEME "Xfce" +-#define DEFAULT_ICON_THEME "hicolor" ++#define DEFAULT_ICON_THEME "Fedora" + #define INITIAL_ICON_THEME "Rodent" + #define DEFAULT_TOOLBAR_STYLE "icons" + #define DEFAULT_FONT "Sans 9" diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index 8694557..e0a6477 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,12 +1,11 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.4.2 +Release: 1%{?dist} License: GPLv2 URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce-mcs-plugins-4.4.1.tar.bz2 -Patch: xfce-mcs-plugins-4.2.0-rh.patch -Patch1: xfce-mcs-plugins-4.4.1-dpi.patch +Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 +Patch: xfce-mcs-plugins-4.4.2-fedora.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,8 +24,7 @@ settings manager. %prep %setup -q -%patch -p1 -b .fedora -%patch1 -p1 -b .dpi +%patch -p1 -b .theme %build %configure @@ -56,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 +- Update to 4.4.2 + * Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 - Update License tag From dcd549b5d49440454b2cebcafcd2aac0849b85c0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 19 Dec 2007 03:12:02 +0000 Subject: [PATCH 5/7] Add patch for mouse button crash (fixes #425925) --- xfce-mcs-plugins-4.4.2-mouse.patch | 29 +++++++++++++++++++++++++++++ xfce-mcs-plugins.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 xfce-mcs-plugins-4.4.2-mouse.patch diff --git a/xfce-mcs-plugins-4.4.2-mouse.patch b/xfce-mcs-plugins-4.4.2-mouse.patch new file mode 100644 index 0000000..f994370 --- /dev/null +++ b/xfce-mcs-plugins-4.4.2-mouse.patch @@ -0,0 +1,29 @@ +diff -Nur xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c +--- xfce-mcs-plugins-4.4.2.orig/plugins/mouse_plugin/mouse_plugin.c 2007-11-17 12:31:23.000000000 -0700 ++++ xfce-mcs-plugins-4.4.2/plugins/mouse_plugin/mouse_plugin.c 2007-12-17 17:51:03.000000000 -0700 +@@ -174,7 +174,7 @@ + unsigned char *buttons; + gint n_buttons, n_devices, i; + gint idx_1 = 0, idx_3 = 1; +- gsize buttons_capacity = 16; ++ gsize buttons_capacity = DEFAULT_PTR_MAP_SIZE; + + device_info = XListInputDevices (GDK_DISPLAY (), &n_devices); + +@@ -204,11 +204,12 @@ + continue; + } + +- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, DEFAULT_PTR_MAP_SIZE); +- if (n_buttons > DEFAULT_PTR_MAP_SIZE) ++ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); ++ if (n_buttons > buttons_capacity) + { +- buttons = g_alloca (n_buttons); +- n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, n_buttons); ++ buttons = g_realloc (buttons, n_buttons); ++ buttons_capacity = n_buttons; ++ n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, buttons_capacity); + } + + for (i = 0; i < n_buttons; i++) diff --git a/xfce-mcs-plugins.spec b/xfce-mcs-plugins.spec index e0a6477..43feb04 100644 --- a/xfce-mcs-plugins.spec +++ b/xfce-mcs-plugins.spec @@ -1,11 +1,12 @@ Summary: Plugins for multi channel settings manager Name: xfce-mcs-plugins Version: 4.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2 Patch: xfce-mcs-plugins-4.4.2-fedora.patch +Patch1: xfce-mcs-plugins-4.4.2-mouse.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xfce-mcs-manager >= %{version} @@ -25,6 +26,7 @@ settings manager. %prep %setup -q %patch -p1 -b .theme +%patch1 -p1 -b .mouse %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/*/*/apps/* %changelog +* Mon Dec 17 2007 Kevin Fenzi - 4.4.2-2 +- Add patch for mouse button crash (fixes #425925) + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 From f8820d58ac87c4cebafb64c58b284daed196653c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:41 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7df561d..294af23 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce-mcs-plugins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 71170aa4b92ec65ef3d1f49990bfabaf220bdefe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:42:21 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 294af23..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-mcs-plugins -# $Id$ -NAME := xfce-mcs-plugins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7