rpms/gtkhtml3/FC-5 gtkhtml-fix-indic-navigation-129212.patch, 1.1, 1.2 gtkhtml3.spec, 1.58, 1.59 sources, 1.33, 1.34
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 11 00:41:47 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/gtkhtml3/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4796
Modified Files:
gtkhtml-fix-indic-navigation-129212.patch gtkhtml3.spec
sources
Log Message:
3.10.1
gtkhtml-fix-indic-navigation-129212.patch:
gtkhtml-3.10.1/src/htmlcursor.c | 34 +++----
src/htmlengine-edit-cut-and-paste.c | 13 +-
src/htmlobject.c | 29 ++++--
src/htmlobject.h | 15 ++-
src/htmltext.c | 167 ++++++++++++++++++++++++++++++++++++
5 files changed, 225 insertions(+), 33 deletions(-)
Index: gtkhtml-fix-indic-navigation-129212.patch
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/gtkhtml-fix-indic-navigation-129212.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml-fix-indic-navigation-129212.patch 27 Jul 2005 00:50:19 -0000 1.1
+++ gtkhtml-fix-indic-navigation-129212.patch 11 Apr 2006 00:41:44 -0000 1.2
@@ -1,150 +1,3 @@
---- orig/src/htmlcursor.c
-+++ mod/src/htmlcursor.c
-@@ -203,12 +203,12 @@
-
-
- static gboolean
--forward (HTMLCursor *cursor)
-+forward (HTMLCursor *cursor, HTMLEngine *engine)
- {
- gboolean retval;
-
- retval = TRUE;
-- if (!html_object_cursor_forward (cursor->object, cursor)) {
-+ if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
- HTMLObject *next;
-
- next = html_object_next_cursor (cursor->object, &cursor->offset);
-@@ -237,7 +237,7 @@
- html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
-
- cursor->have_target_x = FALSE;
-- retval = forward (cursor);
-+ retval = forward (cursor, engine);
-
- debug_location (cursor);
-
-@@ -245,12 +245,12 @@
- }
-
- static gboolean
--backward (HTMLCursor *cursor)
-+backward (HTMLCursor *cursor, HTMLEngine *engine)
- {
- gboolean retval;
-
- retval = TRUE;
-- if (!html_object_cursor_backward (cursor->object, cursor)) {
-+ if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
- HTMLObject *prev;
-
- prev = html_object_prev_cursor (cursor->object, &cursor->offset);
-@@ -280,7 +280,7 @@
- html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
-
- cursor->have_target_x = FALSE;
-- retval = backward (cursor);
-+ retval = backward (cursor, engine);
-
- debug_location (cursor);
-
-@@ -340,7 +340,7 @@
- prev_x = x;
- prev_y = y;
-
-- if (! backward (cursor))
-+ if (! backward (cursor, engine))
- return FALSE;
-
- html_object_get_cursor_base (cursor->object,
-@@ -562,14 +562,14 @@
-
- html_cursor_copy (&original, cursor);
-
-- while (forward (cursor)) {
-+ while (forward (cursor, engine)) {
- if (cursor->object == object && cursor->offset == offset)
- return TRUE;
- }
-
- html_cursor_copy (cursor, &original);
-
-- while (backward (cursor)) {
-+ while (backward (cursor, engine)) {
- if (cursor->object == object && cursor->offset == offset)
- return TRUE;
- }
-@@ -593,7 +593,7 @@
- if (engine->need_spell_check)
- html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
-
-- while (backward (cursor))
-+ while (backward (cursor, engine))
- ;
- }
-
-@@ -610,7 +610,7 @@
- if (engine->need_spell_check)
- html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
-
-- while (forward (cursor))
-+ while (forward (cursor, engine))
- ;
- }
-
-@@ -646,12 +646,12 @@
-
- if (cursor->position < position) {
- while (cursor->position < position) {
-- if (! forward (cursor))
-+ if (! forward (cursor, engine))
- break;
- }
- } else if (cursor->position > position) {
- while (cursor->position > position) {
-- if (! backward (cursor))
-+ if (! backward (cursor, engine))
- break;
- }
- }
-@@ -755,7 +755,7 @@
- while (1) {
- if (!cursor->offset) {
- copy = html_cursor_dup (cursor);
-- if (backward (cursor)) {
-+ if (backward (cursor, engine)) {
- new_level = html_object_get_parent_level (cursor->object);
- if (new_level < level
- || (new_level == level && flow != cursor->object->parent)) {
-@@ -767,7 +767,7 @@
- break;
- }
- else
-- if (!backward (cursor))
-+ if (!backward (cursor, engine))
- break;
- rv = TRUE;
- }
-@@ -794,7 +794,7 @@
- while (1) {
- if (cursor->offset == html_object_get_length (cursor->object)) {
- copy = html_cursor_dup (cursor);
-- if (forward (cursor)) {
-+ if (forward (cursor, engine)) {
- new_level = html_object_get_parent_level (cursor->object);
- if (new_level < level
- || (new_level == level && flow != cursor->object->parent)) {
-@@ -806,7 +806,7 @@
- break;
- }
- else
-- if (!forward (cursor))
-+ if (!forward (cursor, engine))
- break;
- rv = TRUE;
- }
-
-
--- orig/src/htmlengine-edit-cut-and-paste.c
+++ mod/src/htmlengine-edit-cut-and-paste.c
@@ -1445,14 +1445,15 @@
@@ -501,3 +354,148 @@
+ object_class->backspace = html_text_backspace;
object_class->get_right_edge_offset = html_text_get_right_edge_offset;
object_class->get_left_edge_offset = html_text_get_left_edge_offset;
+--- gtkhtml-3.10.1/src/htmlcursor.c.fix-indic-navigation 2006-04-10 20:31:00.000000000 -0400
++++ gtkhtml-3.10.1/src/htmlcursor.c 2006-04-10 20:34:57.000000000 -0400
+@@ -203,12 +203,12 @@
+
+
+ static gboolean
+-forward (HTMLCursor *cursor)
++forward (HTMLCursor *cursor, HTMLEngine *engine)
+ {
+ gboolean retval;
+
+ retval = TRUE;
+- if (!html_object_cursor_forward (cursor->object, cursor)) {
++ if (!html_object_cursor_forward (cursor->object, cursor, engine)) {
+ HTMLObject *next;
+
+ next = html_object_next_cursor (cursor->object, &cursor->offset);
+@@ -237,7 +237,7 @@
+ html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+
+ cursor->have_target_x = FALSE;
+- retval = forward (cursor);
++ retval = forward (cursor, engine);
+
+ debug_location (cursor);
+
+@@ -245,12 +245,12 @@
+ }
+
+ static gboolean
+-backward (HTMLCursor *cursor)
++backward (HTMLCursor *cursor, HTMLEngine *engine)
+ {
+ gboolean retval;
+
+ retval = TRUE;
+- if (!html_object_cursor_backward (cursor->object, cursor)) {
++ if (!html_object_cursor_backward (cursor->object, cursor, engine)) {
+ HTMLObject *prev;
+
+ prev = html_object_prev_cursor (cursor->object, &cursor->offset);
+@@ -280,7 +280,7 @@
+ html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+
+ cursor->have_target_x = FALSE;
+- retval = backward (cursor);
++ retval = backward (cursor, engine);
+
+ debug_location (cursor);
+
+@@ -337,7 +337,7 @@
+ prev_x = x;
+ prev_y = y;
+
+- if (! backward (cursor))
++ if (! backward (cursor, engine))
+ return FALSE;
+
+ html_object_get_cursor_base (cursor->object,
+@@ -556,14 +556,14 @@
+
+ html_cursor_copy (&original, cursor);
+
+- while (forward (cursor)) {
++ while (forward (cursor, engine)) {
+ if (cursor->object == object && cursor->offset == offset)
+ return TRUE;
+ }
+
+ html_cursor_copy (cursor, &original);
+
+- while (backward (cursor)) {
++ while (backward (cursor, engine)) {
+ if (cursor->object == object && cursor->offset == offset)
+ return TRUE;
+ }
+@@ -587,7 +587,7 @@
+ if (engine->need_spell_check)
+ html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+
+- while (backward (cursor))
++ while (backward (cursor, engine))
+ ;
+ }
+
+@@ -604,7 +604,7 @@
+ if (engine->need_spell_check)
+ html_engine_spell_check_range (engine, engine->cursor, engine->cursor);
+
+- while (forward (cursor))
++ while (forward (cursor, engine))
+ ;
+ }
+
+@@ -640,12 +640,12 @@
+
+ if (cursor->position < position) {
+ while (cursor->position < position) {
+- if (! forward (cursor))
++ if (! forward (cursor, engine))
+ break;
+ }
+ } else if (cursor->position > position) {
+ while (cursor->position > position) {
+- if (! backward (cursor))
++ if (! backward (cursor, engine))
+ break;
+ }
+ }
+@@ -749,7 +749,7 @@
+ while (1) {
+ if (!cursor->offset) {
+ html_cursor_copy (©, cursor);
+- if (backward (cursor)) {
++ if (backward (cursor, engine)) {
+ new_level = html_object_get_parent_level (cursor->object);
+ if (new_level < level
+ || (new_level == level && flow != cursor->object->parent)) {
+@@ -760,7 +760,7 @@
+ break;
+ }
+ else
+- if (!backward (cursor))
++ if (!backward (cursor, engine))
+ break;
+ rv = TRUE;
+ }
+@@ -787,7 +787,7 @@
+ while (1) {
+ if (cursor->offset == html_object_get_length (cursor->object)) {
+ html_cursor_copy (©, cursor);
+- if (forward (cursor)) {
++ if (forward (cursor, engine)) {
+ new_level = html_object_get_parent_level (cursor->object);
+ if (new_level < level
+ || (new_level == level && flow != cursor->object->parent)) {
+@@ -798,7 +798,7 @@
+ break;
+ }
+ else
+- if (!forward (cursor))
++ if (!forward (cursor, engine))
+ break;
+ rv = TRUE;
+ }
Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/gtkhtml3.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gtkhtml3.spec 13 Mar 2006 16:54:41 -0000 1.58
+++ gtkhtml3.spec 11 Apr 2006 00:41:44 -0000 1.59
@@ -4,8 +4,8 @@
Summary: gtkhtml library
Name: gtkhtml3
-Version: 3.10.0
-Release: 1
+Version: 3.10.1
+Release: 1.fc5.1
License: LGPL/GPL
Group: System Environment/Libraries
Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -27,6 +27,7 @@
# Patches from bugzilla.ximian.com #65670, #66206
Patch2: gtkhtml-3.3.2-imcommit.patch
Patch3: gtkhtml-fix-indic-navigation-129212.patch
+Patch4: gtkhtml-3.10.0-im-too-late.patch
%description
GtkHTML is a lightweight HTML rendering/printing/editing engine. It
@@ -50,6 +51,7 @@
%patch1 -p1 -b .crash
%patch3 -p1 -b .fix-129212
+%patch4 -p1 -b .im-too-late
%build
%configure
@@ -96,6 +98,13 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 3.10.1-1.fc5.1
+- Update to 3.10.1
+- Update patches
+
+* Fri Apr 7 2006 Dan Williams <dcbw at redhat.com> - 3.10.0-2
+- Fix crash with IM enabled
+
* Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 3.10.0-1
- Update to 3.10.0
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 13 Mar 2006 16:54:42 -0000 1.33
+++ sources 11 Apr 2006 00:41:44 -0000 1.34
@@ -1 +1 @@
-1d564a2d9a7a4911c8d1b50868acef81 gtkhtml-3.10.0.tar.bz2
+f2b7ff386dae9fcc3b01c4116564722d gtkhtml-3.10.1.tar.bz2
More information about the fedora-cvs-commits
mailing list