- 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).
This commit is contained in:
Matthew Barnes
parent
16ce3c18da
commit
39e25a5f96
199
evolution-2.9.2-gtk-font-button.patch
Normal file
199
evolution-2.9.2-gtk-font-button.patch
Normal file
@ -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 <bonobo/bonobo-generic-factory.h>
|
||||||
|
|
||||||
|
#include <libgnomeui/gnome-color-picker.h>
|
||||||
|
-#include <libgnomeui/gnome-font-picker.h>
|
||||||
|
#include <gtk/gtkfilechooserbutton.h>
|
||||||
|
+#include <gtk/gtkfontbutton.h>
|
||||||
|
|
||||||
|
#include <glade/glade.h>
|
||||||
|
|
||||||
|
@@ -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 @@
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label583">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="yes">S_end message receipts:</property>
|
||||||
|
+ <property name="label" translatable="yes">S_end message receipts:</property>
|
||||||
|
<property name="use_underline">True</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -3352,8 +3352,8 @@
|
||||||
|
<property name="yalign">0.5</property>
|
||||||
|
<property name="xpad">0</property>
|
||||||
|
<property name="ypad">0</property>
|
||||||
|
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||||
|
<property name="mnemonic_widget">receipt_policy_dropdown</property>
|
||||||
|
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||||
|
<property name="width_chars">-1</property>
|
||||||
|
<property name="single_line_mode">False</property>
|
||||||
|
<property name="angle">0</property>
|
||||||
|
@@ -4700,14 +4700,14 @@
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
- <widget class="GnomeFontPicker" id="FontFixed">
|
||||||
|
+ <widget class="GtkFontButton" id="FontFixed">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="title" translatable="yes">Select HTML fixed width font</property>
|
||||||
|
- <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
|
||||||
|
+ <property name="show_style">True</property>
|
||||||
|
<property name="show_size">True</property>
|
||||||
|
- <property name="use_font_in_label">False</property>
|
||||||
|
- <property name="label_font_size">14</property>
|
||||||
|
+ <property name="use_font">False</property>
|
||||||
|
+ <property name="use_size">False</property>
|
||||||
|
<property name="focus_on_click">True</property>
|
||||||
|
<signal name="font_set" handler="changed"/>
|
||||||
|
</widget>
|
||||||
|
@@ -4722,14 +4722,14 @@
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
- <widget class="GnomeFontPicker" id="FontVariable">
|
||||||
|
+ <widget class="GtkFontButton" id="FontVariable">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="title" translatable="yes">Select HTML variable width font</property>
|
||||||
|
- <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
|
||||||
|
+ <property name="show_style">True</property>
|
||||||
|
<property name="show_size">True</property>
|
||||||
|
- <property name="use_font_in_label">False</property>
|
||||||
|
- <property name="label_font_size">14</property>
|
||||||
|
+ <property name="use_font">False</property>
|
||||||
|
+ <property name="use_size">False</property>
|
||||||
|
<property name="focus_on_click">True</property>
|
||||||
|
<signal name="font_set" handler="changed"/>
|
||||||
|
</widget>
|
||||||
|
@@ -6572,7 +6572,7 @@
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label571">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="no"> </property>
|
||||||
|
+ <property name="label"> </property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -6675,7 +6675,7 @@
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label572">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="no"> </property>
|
||||||
|
+ <property name="label"> </property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -6731,7 +6731,7 @@
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label575">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="no"> </property>
|
||||||
|
+ <property name="label"> </property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">False</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
|
@@ -8484,14 +8484,14 @@
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
- <widget class="GnomeFontPicker" id="print_fixed">
|
||||||
|
+ <widget class="GtkFontButton" id="print_fixed">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="title" translatable="yes">Select HTML fixed width font for printing</property>
|
||||||
|
- <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
|
||||||
|
+ <property name="show_style">True</property>
|
||||||
|
<property name="show_size">True</property>
|
||||||
|
- <property name="use_font_in_label">False</property>
|
||||||
|
- <property name="label_font_size">14</property>
|
||||||
|
+ <property name="use_font">False</property>
|
||||||
|
+ <property name="use_size">False</property>
|
||||||
|
<property name="focus_on_click">True</property>
|
||||||
|
<signal name="font_set" handler="changed"/>
|
||||||
|
</widget>
|
||||||
|
@@ -8506,14 +8506,14 @@
|
||||||
|
</child>
|
||||||
|
|
||||||
|
<child>
|
||||||
|
- <widget class="GnomeFontPicker" id="print_variable">
|
||||||
|
+ <widget class="GtkFontButton" id="print_variable">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="title" translatable="yes">Select HTML variable width font for printing</property>
|
||||||
|
- <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
|
||||||
|
+ <property name="show_style">True</property>
|
||||||
|
<property name="show_size">True</property>
|
||||||
|
- <property name="use_font_in_label">False</property>
|
||||||
|
- <property name="label_font_size">14</property>
|
||||||
|
+ <property name="use_font">False</property>
|
||||||
|
+ <property name="use_size">False</property>
|
||||||
|
<property name="focus_on_click">True</property>
|
||||||
|
<signal name="font_set" handler="changed"/>
|
||||||
|
</widget>
|
||||||
111
evolution.spec
111
evolution.spec
@ -10,7 +10,7 @@
|
|||||||
%define libbonoboui_version 2.4.2
|
%define libbonoboui_version 2.4.2
|
||||||
%define libgnomeprint22_version 2.8.0
|
%define libgnomeprint22_version 2.8.0
|
||||||
%define orbit2_version 2.9.8
|
%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 redhat_menus_version 5.0.4
|
||||||
%define soup_version 2.2.2
|
%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
|
#Patch18: evolution-2.7.1-notification-cleanups.patch
|
||||||
Patch19: evolution-2.6.0-prototypes.patch
|
Patch19: evolution-2.6.0-prototypes.patch
|
||||||
|
|
||||||
# Gnome.org #343331
|
# RH bug #157400 / GNOME bug #303877
|
||||||
Patch20: evolution-2.7.2.1-quit-resize-crash.patch
|
Patch20: evolution-2.7.4-candidate-window-position-task.patch
|
||||||
|
|
||||||
# RH bug #157400 / Gnome.org bug #303877
|
# RH bug #157505 / GNOME bug #303878
|
||||||
Patch21: evolution-2.7.4-candidate-window-position-task.patch
|
Patch21: evolution-2.7.4-candidate-window-position-calendar.patch
|
||||||
|
|
||||||
# RH bug #157505 / Gnome.org bug #303878
|
# RH bug #190359 / GNOME bug #211058
|
||||||
Patch22: evolution-2.7.4-candidate-window-position-calendar.patch
|
Patch22: evolution-2.7.3-filter-datespec.patch
|
||||||
|
|
||||||
# RH bug #190359 / Gnome.org bug #211058
|
# RH bug #166231 / GNOME bug #264485
|
||||||
Patch23: evolution-2.7.3-filter-datespec.patch
|
Patch23: evolution-2.7.3-replicated-cjk-input.patch
|
||||||
|
|
||||||
# RH bug #166231 / Gnome.org bug #264485
|
# RH bug #178295 / GNOME bug #348638
|
||||||
Patch24: evolution-2.7.3-replicated-cjk-input.patch
|
Patch24: evolution-2.7.4-deleting-preedit-buffer.patch
|
||||||
|
|
||||||
# RH bug #178295 / Gnome.org bug #348638
|
|
||||||
Patch25: evolution-2.7.4-deleting-preedit-buffer.patch
|
|
||||||
|
|
||||||
# RH bug #202289
|
# 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
|
# RH bug #161885 / GNOME bug #309166
|
||||||
Patch27: evolution-2.8.0-indic-cursor-movement.patch
|
Patch26: evolution-2.8.0-indic-cursor-movement.patch
|
||||||
|
|
||||||
# Gnome.org bug #356177
|
# GNOME bug #356177
|
||||||
Patch28: evolution-2.8.0-kill-emutex.patch
|
Patch27: evolution-2.8.0-kill-emutex.patch
|
||||||
|
|
||||||
# Gnome.org bug #357216
|
# GNOME bug #357216
|
||||||
Patch29: evolution-2.8.0-deprecated-gdk-font.patch
|
Patch28: evolution-2.8.0-deprecated-gdk-font.patch
|
||||||
|
|
||||||
# Gnome.org bug #357970
|
# GNOME bug #357970
|
||||||
Patch30: evolution-2.8.0-more-deprecated.patch
|
Patch29: evolution-2.8.0-more-deprecated.patch
|
||||||
|
|
||||||
# RH bug #202751 / Gnome.org bug #355766
|
# RH bug #202751 / GNOME bug #355766
|
||||||
Patch31: evolution-2.8.0-fix-indic-printing.patch
|
Patch30: evolution-2.8.0-fix-indic-printing.patch
|
||||||
|
|
||||||
# Gnome.org bug #360946
|
# GNOME bug #360946
|
||||||
Patch34: evolution-2.8.1-about-dialog.patch
|
Patch31: evolution-2.8.1-about-dialog.patch
|
||||||
|
|
||||||
# Gnome.org bug #362638
|
# GNOME bug #362638
|
||||||
Patch35: evolution-2.8.1-kill-ethread.patch
|
Patch32: evolution-2.8.1-kill-ethread.patch
|
||||||
|
|
||||||
# Gnome.org bug #363695
|
# GNOME bug #363695
|
||||||
Patch36: evolution-2.9.1-kill-ememory.patch
|
Patch33: evolution-2.9.1-kill-ememory.patch
|
||||||
|
|
||||||
# RH bug #176400
|
# RH bug #176400
|
||||||
Patch37: evolution-2.9.1-im-context-reset.patch
|
Patch34: evolution-2.9.1-im-context-reset.patch
|
||||||
|
|
||||||
# RH bug #182247
|
# 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
|
# Port evolution conduits to pilot-link 0.12
|
||||||
# http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html
|
# 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 ###
|
## Dependencies ###
|
||||||
|
|
||||||
@ -261,24 +264,25 @@ Development files needed for building things which link against evolution.
|
|||||||
%patch17 -p1 -b .no-gnome-common
|
%patch17 -p1 -b .no-gnome-common
|
||||||
#patch18 -p1 -b .notification-cleanups
|
#patch18 -p1 -b .notification-cleanups
|
||||||
%patch19 -p1 -b .prototypes
|
%patch19 -p1 -b .prototypes
|
||||||
%patch20 -p1 -b .quit-resize-crash
|
%patch20 -p1 -b .candidate-window-position-task
|
||||||
%patch21 -p1 -b .candidate-window-position-task
|
%patch21 -p1 -b .candidate-window-position-calendar
|
||||||
%patch22 -p1 -b .candidate-window-position-calendar
|
%patch22 -p1 -b .filter-datespec
|
||||||
%patch23 -p1 -b .filter-datespec
|
%patch23 -p1 -b .replicated-cjk-input
|
||||||
%patch24 -p1 -b .replicated-cjk-input
|
%patch24 -p1 -b .deleting-preedit-buffer
|
||||||
%patch25 -p1 -b .deleting-preedit-buffer
|
%patch25 -p1 -b .fix-prgname
|
||||||
%patch26 -p1 -b .fix-prgname
|
%patch26 -p1 -b .indic-cursor-movement
|
||||||
%patch27 -p1 -b .indic-cursor-movement
|
%patch27 -p1 -b .kill-emutex
|
||||||
%patch28 -p1 -b .kill-emutex
|
%patch28 -p1 -b .deprecated-gdk-font
|
||||||
%patch29 -p1 -b .deprecated-gdk-font
|
%patch29 -p1 -b .more-deprecated
|
||||||
%patch30 -p1 -b .more-deprecated
|
%patch30 -p1 -b .fix-indic-printing
|
||||||
%patch31 -p1 -b .fix-indic-printing
|
%patch31 -p1 -b .about-dialog
|
||||||
%patch34 -p1 -b .about-dialog
|
%patch32 -p1 -b .kill-ethread
|
||||||
%patch35 -p1 -b .kill-ethread
|
%patch33 -p1 -b .kill-ememory
|
||||||
%patch36 -p1 -b .kill-ememory
|
%patch34 -p1 -b .im-context-reset
|
||||||
%patch37 -p1 -b .im-context-reset
|
%patch35 -p1 -b .first-ascii
|
||||||
%patch38 -p1 -b .first-ascii
|
%patch36 -p1 -b .gtk-font-button
|
||||||
%patch39 -p1 -b .pilot-link-0.12
|
%patch37 -p1 -b .pilot-link-0.12
|
||||||
|
%patch38 -p1 -b .optional-participant
|
||||||
|
|
||||||
mkdir -p krb5-fakeprefix/include
|
mkdir -p krb5-fakeprefix/include
|
||||||
mkdir -p krb5-fakeprefix/lib
|
mkdir -p krb5-fakeprefix/lib
|
||||||
@ -683,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%changelog
|
%changelog
|
||||||
* Tue Nov 28 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-3.fc7
|
* Tue Nov 28 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-3.fc7
|
||||||
- Add patch to port evolution conduits to pilot-link 0.12.
|
- 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 <mbarnes@redhat.com> - 2.9.2-2.fc7
|
* Tue Nov 07 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-2.fc7
|
||||||
- Revise patch for RH bug #202751 and re-enable it.
|
- Revise patch for RH bug #202751 and re-enable it.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user