diff --git a/evolution-2.9.2-gtk-font-button.patch b/evolution-2.9.2-gtk-font-button.patch new file mode 100644 index 0000000..f3d4476 --- /dev/null +++ b/evolution-2.9.2-gtk-font-button.patch @@ -0,0 +1,199 @@ +--- evolution-2.9.2/mail/em-mailer-prefs.c.gtk-font-button 2006-08-09 04:43:27.000000000 -0400 ++++ evolution-2.9.2/mail/em-mailer-prefs.c 2006-11-11 08:31:53.000000000 -0500 +@@ -36,8 +36,8 @@ + #include + + #include +-#include + #include ++#include + + #include + +@@ -535,12 +535,14 @@ + } + + static void +-font_changed (GnomeFontPicker *fontpicker, const char *arg1, EMMailerPrefs *prefs) ++font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs) + { +- const char *key; ++ const gchar *key; ++ const gchar *font_name; + +- key = g_object_get_data ((GObject *) fontpicker, "key"); +- gconf_client_set_string (prefs->gconf, key, gnome_font_picker_get_font_name (fontpicker), NULL); ++ key = g_object_get_data (G_OBJECT (font_button), "key"); ++ font_name = gtk_font_button_get_font_name (font_button); ++ gconf_client_set_string (prefs->gconf, key, font_name, NULL); + } + + static void +@@ -841,8 +843,8 @@ + + /* Mail Fonts */ + font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); +- prefs->font_fixed = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontFixed")); +- gnome_font_picker_set_font_name (prefs->font_fixed, font); ++ prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); ++ gtk_font_button_set_font_name (prefs->font_fixed, font); + g_free (font); + g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); + g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); +@@ -850,8 +852,8 @@ + gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); + + font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); +- prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable")); +- gnome_font_picker_set_font_name (prefs->font_variable, font); ++ prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); ++ gtk_font_button_set_font_name (prefs->font_variable, font); + g_free (font); + g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); + g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); +--- evolution-2.9.2/mail/em-mailer-prefs.h.gtk-font-button 2006-05-25 00:59:47.000000000 -0400 ++++ evolution-2.9.2/mail/em-mailer-prefs.h 2006-11-11 08:31:53.000000000 -0500 +@@ -39,7 +39,7 @@ + struct _GladeXML; + struct _GnomeColorPicker; + struct _GtkFileChooserbutton; +-struct _GnomeFontPicker; ++struct _GtkFontButton; + struct _GConfClient; + struct _GtkButton; + struct _GtkTreeView; +@@ -92,8 +92,8 @@ + struct _GtkFileChooserButton *notify_sound_file; + + /* HTML Mail tab */ +- struct _GnomeFontPicker *font_variable; +- struct _GnomeFontPicker *font_fixed; ++ struct _GtkFontButton *font_variable; ++ struct _GtkFontButton *font_fixed; + struct _GtkToggleButton *font_share; + + /* Loading Images */ +--- evolution-2.9.2/mail/mail-config.glade.gtk-font-button 2006-07-19 11:26:27.000000000 -0400 ++++ evolution-2.9.2/mail/mail-config.glade 2006-11-11 08:31:53.000000000 -0500 +@@ -3342,7 +3342,7 @@ + + + True +- S_end message receipts: ++ S_end message receipts: + True + False + GTK_JUSTIFY_LEFT +@@ -3352,8 +3352,8 @@ + 0.5 + 0 + 0 +- PANGO_ELLIPSIZE_NONE + receipt_policy_dropdown ++ PANGO_ELLIPSIZE_NONE + -1 + False + 0 +@@ -4700,14 +4700,14 @@ + + + +- ++ + True + True + Select HTML fixed width font +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + +@@ -4722,14 +4722,14 @@ + + + +- ++ + True + True + Select HTML variable width font +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + +@@ -6572,7 +6572,7 @@ + + + True +- ++ + False + False + GTK_JUSTIFY_LEFT +@@ -6675,7 +6675,7 @@ + + + True +- ++ + False + False + GTK_JUSTIFY_LEFT +@@ -6731,7 +6731,7 @@ + + + True +- ++ + False + False + GTK_JUSTIFY_LEFT +@@ -8484,14 +8484,14 @@ + + + +- ++ + True + True + Select HTML fixed width font for printing +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + +@@ -8506,14 +8506,14 @@ + + + +- ++ + True + True + Select HTML variable width font for printing +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + diff --git a/evolution.spec b/evolution.spec index c2fa013..6bab434 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libbonoboui_version 2.4.2 %define libgnomeprint22_version 2.8.0 %define orbit2_version 2.9.8 -%define pilot_link_version 2:0.11.8 +%define pilot_link_version 2:0.12.1 %define redhat_menus_version 5.0.4 %define soup_version 2.2.2 @@ -85,60 +85,63 @@ Patch17: evolution-2.7.1-no-gnome-common.patch #Patch18: evolution-2.7.1-notification-cleanups.patch Patch19: evolution-2.6.0-prototypes.patch -# Gnome.org #343331 -Patch20: evolution-2.7.2.1-quit-resize-crash.patch +# RH bug #157400 / GNOME bug #303877 +Patch20: evolution-2.7.4-candidate-window-position-task.patch -# RH bug #157400 / Gnome.org bug #303877 -Patch21: evolution-2.7.4-candidate-window-position-task.patch +# RH bug #157505 / GNOME bug #303878 +Patch21: evolution-2.7.4-candidate-window-position-calendar.patch -# RH bug #157505 / Gnome.org bug #303878 -Patch22: evolution-2.7.4-candidate-window-position-calendar.patch +# RH bug #190359 / GNOME bug #211058 +Patch22: evolution-2.7.3-filter-datespec.patch -# RH bug #190359 / Gnome.org bug #211058 -Patch23: evolution-2.7.3-filter-datespec.patch +# RH bug #166231 / GNOME bug #264485 +Patch23: evolution-2.7.3-replicated-cjk-input.patch -# RH bug #166231 / Gnome.org bug #264485 -Patch24: evolution-2.7.3-replicated-cjk-input.patch - -# RH bug #178295 / Gnome.org bug #348638 -Patch25: evolution-2.7.4-deleting-preedit-buffer.patch +# RH bug #178295 / GNOME bug #348638 +Patch24: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #202289 -Patch26: evolution-2.7.92-fix-prgname.patch +Patch25: evolution-2.7.92-fix-prgname.patch -# RH bug #161885 / Gnome.org bug #309166 -Patch27: evolution-2.8.0-indic-cursor-movement.patch +# RH bug #161885 / GNOME bug #309166 +Patch26: evolution-2.8.0-indic-cursor-movement.patch -# Gnome.org bug #356177 -Patch28: evolution-2.8.0-kill-emutex.patch +# GNOME bug #356177 +Patch27: evolution-2.8.0-kill-emutex.patch -# Gnome.org bug #357216 -Patch29: evolution-2.8.0-deprecated-gdk-font.patch +# GNOME bug #357216 +Patch28: evolution-2.8.0-deprecated-gdk-font.patch -# Gnome.org bug #357970 -Patch30: evolution-2.8.0-more-deprecated.patch +# GNOME bug #357970 +Patch29: evolution-2.8.0-more-deprecated.patch -# RH bug #202751 / Gnome.org bug #355766 -Patch31: evolution-2.8.0-fix-indic-printing.patch +# RH bug #202751 / GNOME bug #355766 +Patch30: evolution-2.8.0-fix-indic-printing.patch -# Gnome.org bug #360946 -Patch34: evolution-2.8.1-about-dialog.patch +# GNOME bug #360946 +Patch31: evolution-2.8.1-about-dialog.patch -# Gnome.org bug #362638 -Patch35: evolution-2.8.1-kill-ethread.patch +# GNOME bug #362638 +Patch32: evolution-2.8.1-kill-ethread.patch -# Gnome.org bug #363695 -Patch36: evolution-2.9.1-kill-ememory.patch +# GNOME bug #363695 +Patch33: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch37: evolution-2.9.1-im-context-reset.patch +Patch34: evolution-2.9.1-im-context-reset.patch # RH bug #182247 -Patch38: evolution-2.9.1-first-ascii.patch +Patch35: evolution-2.9.1-first-ascii.patch + +# GNOME bug #373837 +Patch36: evolution-2.9.2-gtk-font-button.patch # Port evolution conduits to pilot-link 0.12 # http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html -Patch39: evolution-2.9.2-pilot-link-0.12.patch +Patch37: evolution-2.9.2-pilot-link-0.12.patch + +# RH bug #215466 / GNOME bug #377511 +Patch38: evolution-2.9.2-optional-participant.patch ## Dependencies ### @@ -261,24 +264,25 @@ Development files needed for building things which link against evolution. %patch17 -p1 -b .no-gnome-common #patch18 -p1 -b .notification-cleanups %patch19 -p1 -b .prototypes -%patch20 -p1 -b .quit-resize-crash -%patch21 -p1 -b .candidate-window-position-task -%patch22 -p1 -b .candidate-window-position-calendar -%patch23 -p1 -b .filter-datespec -%patch24 -p1 -b .replicated-cjk-input -%patch25 -p1 -b .deleting-preedit-buffer -%patch26 -p1 -b .fix-prgname -%patch27 -p1 -b .indic-cursor-movement -%patch28 -p1 -b .kill-emutex -%patch29 -p1 -b .deprecated-gdk-font -%patch30 -p1 -b .more-deprecated -%patch31 -p1 -b .fix-indic-printing -%patch34 -p1 -b .about-dialog -%patch35 -p1 -b .kill-ethread -%patch36 -p1 -b .kill-ememory -%patch37 -p1 -b .im-context-reset -%patch38 -p1 -b .first-ascii -%patch39 -p1 -b .pilot-link-0.12 +%patch20 -p1 -b .candidate-window-position-task +%patch21 -p1 -b .candidate-window-position-calendar +%patch22 -p1 -b .filter-datespec +%patch23 -p1 -b .replicated-cjk-input +%patch24 -p1 -b .deleting-preedit-buffer +%patch25 -p1 -b .fix-prgname +%patch26 -p1 -b .indic-cursor-movement +%patch27 -p1 -b .kill-emutex +%patch28 -p1 -b .deprecated-gdk-font +%patch29 -p1 -b .more-deprecated +%patch30 -p1 -b .fix-indic-printing +%patch31 -p1 -b .about-dialog +%patch32 -p1 -b .kill-ethread +%patch33 -p1 -b .kill-ememory +%patch34 -p1 -b .im-context-reset +%patch35 -p1 -b .first-ascii +%patch36 -p1 -b .gtk-font-button +%patch37 -p1 -b .pilot-link-0.12 +%patch38 -p1 -b .optional-participant mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -683,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Nov 28 2006 Matthew Barnes - 2.9.2-3.fc7 - Add patch to port evolution conduits to pilot-link 0.12. +- Add patch for RH bug #215466 (optional meeting participants). +- Add patch for GNOME bug #373837 (use GtkFontButton). +- Remove patch for GNOME bug #343331 (fixed upstream). * Tue Nov 07 2006 Matthew Barnes - 2.9.2-2.fc7 - Revise patch for RH bug #202751 and re-enable it.