rpms/evolution/devel .cvsignore, 1.50, 1.51 evolution-2.7.3-candidate-window-position-calendar.patch, 1.1, 1.2 evolution.spec, 1.163, 1.164 sources, 1.50, 1.51 evolution-2.7.3-mailing-list-menu.patch, 1.1, NONE evolution-2.7.3-no-boolean-in-schemas.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 12 22:10:17 UTC 2006
Author: mbarnes
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16610
Modified Files:
.cvsignore
evolution-2.7.3-candidate-window-position-calendar.patch
evolution.spec sources
Removed Files:
evolution-2.7.3-mailing-list-menu.patch
evolution-2.7.3-no-boolean-in-schemas.patch
Log Message:
- Update to 2.7.4
- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
- Remove patch for Gnome.org bug #345677 (fixed upstream).
- Remove patch for RH bug #175596 (fixed upstream).
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 13 Jun 2006 20:11:28 -0000 1.50
+++ .cvsignore 12 Jul 2006 22:10:15 -0000 1.51
@@ -1 +1 @@
-evolution-2.7.3.tar.bz2
+evolution-2.7.4.tar.bz2
evolution-2.7.3-candidate-window-position-calendar.patch:
e-text.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
e-text.h | 6 ++++-
2 files changed, 74 insertions(+), 4 deletions(-)
Index: evolution-2.7.3-candidate-window-position-calendar.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.3-candidate-window-position-calendar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.3-candidate-window-position-calendar.patch 30 Jun 2006 14:59:13 -0000 1.1
+++ evolution-2.7.3-candidate-window-position-calendar.patch 12 Jul 2006 22:10:15 -0000 1.2
@@ -1,7 +1,6 @@
-diff -uNrp evolution.orig/widgets/text/e-text.c evolution/widgets/text/e-text.c
---- evolution.orig/widgets/text/e-text.c 2006-06-20 18:52:39.000000000 +0530
-+++ evolution/widgets/text/e-text.c 2006-06-20 18:58:17.000000000 +0530
-@@ -132,6 +132,11 @@ static void e_text_insert(EText *text, c
+--- evolution-2.7.4/widgets/text/e-text.c.candidate-window-position-calendar 2006-07-10 11:13:56.000000000 -0400
++++ evolution-2.7.4/widgets/text/e-text.c 2006-07-12 09:17:18.000000000 -0400
+@@ -132,6 +132,11 @@
static void reset_layout_attrs (EText *text);
@@ -13,7 +12,7 @@
#if 0
/* GtkEditable Methods */
static void e_text_editable_do_insert_text (GtkEditable *editable,
-@@ -324,6 +329,9 @@ insert_preedit_text (EText *text)
+@@ -325,6 +330,9 @@
pango_layout_set_attributes (text->layout, attrs);
pango_attr_list_unref (attrs);
}
@@ -23,7 +22,7 @@
}
if (preedit_string)
-@@ -2195,6 +2203,8 @@ e_text_event (GnomeCanvasItem *item, Gdk
+@@ -2196,6 +2204,8 @@
* handlers connect to multiple e-texts but with subsequent commit these
* should go away.
*/
@@ -32,7 +31,7 @@
if (save_text && save_text->im_context) {
g_signal_handlers_disconnect_matched (save_text->im_context,
-@@ -3721,6 +3731,8 @@ e_text_init (EText *text)
+@@ -3722,6 +3732,8 @@
text->text = e_text_model_get_text (text->model);
text->preedit_len = 0;
text->layout = NULL;
@@ -41,27 +40,26 @@
text->revert = NULL;
-@@ -3842,11 +3854,16 @@ e_text_preedit_changed_cb (GtkIMContext
+@@ -3843,11 +3855,15 @@
EText *etext)
{
gchar *preedit_string = NULL;
-+ gint cursor_pos;
++ gint cursor_pos;
- gtk_im_context_get_preedit_string (context, &preedit_string,
- NULL, NULL);
-
-+ /* get the cursor position for the preedit string */
-+ gtk_im_context_get_preedit_string (context, &preedit_string, NULL, &cursor_pos);
++ /* get the cursor position for the preedit string */
++ gtk_im_context_get_preedit_string (
++ context, &preedit_string, NULL, &cursor_pos);
etext->preedit_len = strlen (preedit_string);
-+ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
-+ etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
-+
-+ if(preedit_string)
-+ g_free (preedit_string);
++ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
++ etext->preedit_pos = g_utf8_offset_to_pointer (
++ preedit_string, cursor_pos) - preedit_string;
+ g_free (preedit_string);
g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
- }
-@@ -3875,3 +3892,53 @@ e_text_delete_surrounding_cb (GtkIMCon
+@@ -3877,3 +3893,53 @@
return TRUE;
}
@@ -115,10 +113,9 @@
+ e_text_get_cursor_locations (text, &area, NULL);
+ gtk_im_context_set_cursor_location (text->im_context, &area);
+}
-diff -uNrp evolution.orig/widgets/text/e-text.h evolution/widgets/text/e-text.h
---- evolution.orig/widgets/text/e-text.h 2006-06-20 18:46:54.000000000 +0530
-+++ evolution/widgets/text/e-text.h 2006-06-20 18:46:07.000000000 +0530
-@@ -107,8 +107,12 @@ struct _EText {
+--- evolution-2.7.4/widgets/text/e-text.h.candidate-window-position-calendar 2005-06-23 05:11:11.000000000 -0400
++++ evolution-2.7.4/widgets/text/e-text.h 2006-07-12 09:13:15.000000000 -0400
+@@ -107,8 +107,12 @@
gint model_changed_signal_id;
gint model_repos_signal_id;
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- evolution.spec 12 Jul 2006 05:46:29 -0000 1.163
+++ evolution.spec 12 Jul 2006 22:10:15 -0000 1.164
@@ -46,8 +46,8 @@
### Abstract ###
Name: evolution
-Version: 2.7.3
-Release: 10.1
+Version: 2.7.4
+Release: 1
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -67,7 +67,6 @@
# patches sent upstream
Patch100: evo-addressbook-print-with-pango-2.patch
-Patch101: evo-calendar-print-with-pango-7.patch
#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
@@ -116,26 +115,20 @@
# Gnome.org #343331
Patch900: evolution-2.7.2.1-quit-resize-crash.patch
-# Gnome.org #345677 - fixed upstream
-Patch901: evolution-2.7.3-no-boolean-in-schemas.patch
-
# RH bug #157400 / Gnome.org bug #303877
-Patch902: evolution-2.7.3-candidate-window-position-task.patch
+Patch901: evolution-2.7.3-candidate-window-position-task.patch
# RH bug #157505 / Gnome.org bug #303878
-Patch903: evolution-2.7.3-candidate-window-position-calendar.patch
+Patch902: evolution-2.7.3-candidate-window-position-calendar.patch
# RH bug #190359 / Gnome.org bug #211058
-Patch904: evolution-2.7.3-filter-datespec.patch
-
-# RH bug #175596 / Gnome.org bug #323952
-Patch905: evolution-2.7.3-mailing-list-menu.patch
+Patch903: evolution-2.7.3-filter-datespec.patch
# RH bug #166231 / Gnome.org bug #264485
-Patch906: evolution-2.7.3-replicated-cjk-input.patch
+Patch904: evolution-2.7.3-replicated-cjk-input.patch
# RH bug #197834 / Gnome.org bug #346797
-Patch907: evolution-2.7.3-submit-bug-report.patch
+Patch905: evolution-2.7.3-submit-bug-report.patch
### Dependencies ###
@@ -264,7 +257,7 @@
# patches sent upstream
#%patch100 -p0 -b .addressbook-print-with-pango
-%patch101 -p1 -b .calendar-print-with-pango
+#%patch101 -p1 -b .calendar-print-with-pango
%patch106 -p1 -b .commit-enter-on-calendar
%patch107 -p1 -b .move-autosave-file
@@ -289,13 +282,11 @@
# %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain at redhat.com
%patch900 -p1 -b .quit-resize-crash
-%patch901 -p1 -b .no-boolean-in-schemas
-%patch902 -p1 -b .candidate-window-position-task
-%patch903 -p1 -b .candidate-window-position-calendar
-%patch904 -p1 -b .filter-datespec
-%patch905 -p1 -b .mailing-list-menu
-%patch906 -p1 -b .replicated-cjk-input
-%patch907 -p1 -b .submit-bug-report
+%patch901 -p1 -b .candidate-window-position-task
+%patch902 -p1 -b .candidate-window-position-calendar
+%patch903 -p1 -b .filter-datespec
+%patch904 -p1 -b .replicated-cjk-input
+%patch905 -p1 -b .submit-bug-report
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -686,6 +677,12 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-1
+- Update to 2.7.4
+- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
+- Remove patch for Gnome.org bug #345677 (fixed upstream).
+- Remove patch for RH bug #175596 (fixed upstream).
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-10.1
- rebuild
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 13 Jun 2006 20:11:29 -0000 1.50
+++ sources 12 Jul 2006 22:10:15 -0000 1.51
@@ -1 +1 @@
-e6f155e9c5d5a11ff61ef364752af6a9 evolution-2.7.3.tar.bz2
+5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2
--- evolution-2.7.3-mailing-list-menu.patch DELETED ---
--- evolution-2.7.3-no-boolean-in-schemas.patch DELETED ---
More information about the fedora-cvs-commits
mailing list