Hello community,
here is the log from the commit of package gtkhtml for openSUSE:Factory checked
in at 2014-10-14 07:09:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtkhtml (Old)
and /work/SRC/openSUSE:Factory/.gtkhtml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkhtml"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gtkhtml/gtkhtml.changes 2014-08-15
09:55:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gtkhtml.new/gtkhtml.changes 2014-10-14
07:10:10.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Oct 13 10:39:11 UTC 2014 - dims...@opensuse.org
+
+- Update to version 4.8.5:
+ + bgo#537825: Text cursor not erased when moved to new position.
+ + bgo#737340: theme_text_color is no longer in gtk 3.14.
+
+-------------------------------------------------------------------
Old:
----
gtkhtml-4.8.4.tar.xz
New:
----
gtkhtml-4.8.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtkhtml.spec ++++++
--- /var/tmp/diff_new_pack.IX9Y6I/_old 2014-10-14 07:10:11.000000000 +0200
+++ /var/tmp/diff_new_pack.IX9Y6I/_new 2014-10-14 07:10:11.000000000 +0200
@@ -24,7 +24,7 @@
%define _gtkhtml_editor_major 0
Name: gtkhtml
-Version: 4.8.4
+Version: 4.8.5
Release: 0
Summary: Lightweight HTML rendering/printing/editing engine
License: GPL-2.0+ and LGPL-2.1+
++++++ gtkhtml-4.8.4.tar.xz -> gtkhtml-4.8.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/ChangeLog new/gtkhtml-4.8.5/ChangeLog
--- old/gtkhtml-4.8.4/ChangeLog 2014-08-11 09:16:54.000000000 +0200
+++ new/gtkhtml-4.8.5/ChangeLog 2014-10-13 08:31:40.000000000 +0200
@@ -1,5 +1,51 @@
# Generated by Makefile. Do not edit.
+commit 19d6e2274cef5a7a14ff30ff076b604086a8bdda
+Author: Jérémy Lal <kapo...@melix.org>
+Date: Thu Oct 9 11:31:48 2014 +0200
+
+ Bug 737340 - theme_text_color is no longer in gtk 3.14
+
+ gtkhtml/htmlcolorset.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+commit 8d107adf1caa825b6cb8c1b09ea6b636c86697d9
+Author: Owen W. Taylor <otay...@fishsoup.net>
+Date: Tue Oct 7 18:45:30 2014 +0200
+
+ Bug 537825 - Text cursor not erased when moved to new position
+
+ When we repaint and the cursor is visible, draw the cursor to the
+ main cairo context we are using, rather than separately. This makes
+ sure that we draw the cursor on top of the content and clipped to
+ the redraw area, and thus preserve the shown/hidden state properly.
+
+ Some combination of redraw ordering or drawing outside the clipped
+ area caused the shown/hidden state of the cursor to be flipped
+ on redraw, causing a left-over cursor on next cursor move.
+
+ gtkhtml/htmlengine-edit-cursor.c | 28 ++++++++++++++++++++++++++--
+ gtkhtml/htmlengine.c | 3 ++-
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+commit 283068632dc3f9d719821775f2330901a2f5a045
+Author: Milan Crha <mc...@redhat.com>
+Date: Mon Aug 11 09:20:37 2014 +0200
+
+ Post-release version bump
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 601a80d6acbcf4dfd84d64d12cb05e484ff12758
+Author: Milan Crha <mc...@redhat.com>
+Date: Mon Aug 11 09:19:35 2014 +0200
+
+ NEWS update for 4.8.4
+
+ NEWS | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
commit 85b04c935904212ba1a5827fdc83e22cc7633606
Author: Milan Crha <mc...@redhat.com>
Date: Thu Jul 17 10:43:52 2014 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/NEWS new/gtkhtml-4.8.5/NEWS
--- old/gtkhtml-4.8.4/NEWS 2014-08-11 09:15:38.000000000 +0200
+++ new/gtkhtml-4.8.5/NEWS 2014-10-13 08:31:00.000000000 +0200
@@ -1,3 +1,10 @@
+GtkHTML-4.8.5 2014-10-13
+------------------------
+
+Bug Fixes:
+ Bug 537825 - Text cursor not erased when moved to new position (Owen W.
Taylor)
+ Bug 737340 - theme_text_color is no longer in gtk 3.14 (Jérémy Lal)
+
GtkHTML-4.8.4 2014-08-11
------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/gtkhtml-4.8.4/components/editor/gtkhtml-editor-4.0.pc
new/gtkhtml-4.8.5/components/editor/gtkhtml-editor-4.0.pc
--- old/gtkhtml-4.8.4/components/editor/gtkhtml-editor-4.0.pc 2014-08-11
09:16:53.000000000 +0200
+++ new/gtkhtml-4.8.5/components/editor/gtkhtml-editor-4.0.pc 2014-10-13
08:31:38.000000000 +0200
@@ -8,6 +8,6 @@
Name: gtkhtml-editor
Description: HTML editor widget
Requires: libgtkhtml-4.0
-Version: 4.8.4
+Version: 4.8.5
Libs: -L${libdir} -lgtkhtml-editor-4.0
Cflags: -I${includedir}/libgtkhtml-4.0/editor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/configure new/gtkhtml-4.8.5/configure
--- old/gtkhtml-4.8.4/configure 2014-08-11 09:16:31.000000000 +0200
+++ new/gtkhtml-4.8.5/configure 2014-10-13 08:31:30.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtkhtml 4.8.4.
+# Generated by GNU Autoconf 2.69 for gtkhtml 4.8.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='gtkhtml'
PACKAGE_TARNAME='gtkhtml'
-PACKAGE_VERSION='4.8.4'
-PACKAGE_STRING='gtkhtml 4.8.4'
+PACKAGE_VERSION='4.8.5'
+PACKAGE_STRING='gtkhtml 4.8.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml'
PACKAGE_URL=''
@@ -1428,7 +1428,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtkhtml 4.8.4 to adapt to many kinds of systems.
+\`configure' configures gtkhtml 4.8.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1498,7 +1498,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtkhtml 4.8.4:";;
+ short | recursive ) echo "Configuration of gtkhtml 4.8.5:";;
esac
cat <<\_ACEOF
@@ -1630,7 +1630,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtkhtml configure 4.8.4
+gtkhtml configure 4.8.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2174,7 +2174,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtkhtml $as_me 4.8.4, which was
+It was created by gtkhtml $as_me 4.8.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3037,7 +3037,7 @@
# Define the identity of the package.
PACKAGE='gtkhtml'
- VERSION='4.8.4'
+ VERSION='4.8.5'
cat >>confdefs.h <<_ACEOF
@@ -19594,7 +19594,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gtkhtml $as_me 4.8.4, which was
+This file was extended by gtkhtml $as_me 4.8.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19660,7 +19660,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gtkhtml config.status 4.8.4
+gtkhtml config.status 4.8.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/configure.ac
new/gtkhtml-4.8.5/configure.ac
--- old/gtkhtml-4.8.4/configure.ac 2014-07-14 07:33:50.000000000 +0200
+++ new/gtkhtml-4.8.5/configure.ac 2014-08-11 09:20:28.000000000 +0200
@@ -1,6 +1,6 @@
dnl Initialization
AC_PREREQ(2.58)
-AC_INIT([gtkhtml], [4.8.4],
[http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml])
+AC_INIT([gtkhtml], [4.8.5],
[http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml])
AM_INIT_AUTOMAKE([gnu 1.9 dist-xz no-dist-gzip -Wno-portability])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/gtkhtml/htmlcolorset.c
new/gtkhtml-4.8.5/gtkhtml/htmlcolorset.c
--- old/gtkhtml-4.8.4/gtkhtml/htmlcolorset.c 2014-07-01 11:28:54.000000000
+0200
+++ new/gtkhtml-4.8.5/gtkhtml/htmlcolorset.c 2014-10-09 11:36:05.000000000
+0200
@@ -207,6 +207,16 @@
\
SET_GCOLOR (t, color_rgba);
\
}
+#define SET_COLOR_STYLE2(t,nm1,nm2,flbk)
\
+ if (!s->changed[HTML ## t ## Color]) {
\
+ GdkRGBA color_rgba;
\
+
\
+ if (!gtk_style_context_lookup_color (style_context, nm1,
&color_rgba) && \
+ !gtk_style_context_lookup_color (style_context, nm2,
&color_rgba)) \
+ gdk_rgba_parse (&color_rgba, flbk);
\
+
\
+ SET_GCOLOR (t, color_rgba);
\
+ }
GdkRGBA color;
gboolean backdrop;
@@ -217,7 +227,7 @@
backdrop = (state_flags & GTK_STATE_FLAG_BACKDROP) != 0;
SET_COLOR_STYLE (Bg, backdrop ? "theme_unfocused_base_color" :
"theme_base_color", "#ffffff");
- SET_COLOR_STYLE (Text, backdrop ? "theme_unfocused_text_color" :
"theme_text_color", "#000000");
+ SET_COLOR_STYLE2 (Text, backdrop ? "theme_unfocused_text_color" :
"theme_text_color", backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
"#000000");
SET_COLOR_STYLE (Highlight, backdrop ?
"theme_unfocused_selected_bg_color" : "theme_selected_bg_color", "#7f7fff");
SET_COLOR_STYLE (HighlightText, backdrop ?
"theme_unfocused_selected_fg_color" : "theme_selected_fg_color", "#000000");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/gtkhtml/htmlengine-edit-cursor.c
new/gtkhtml-4.8.5/gtkhtml/htmlengine-edit-cursor.c
--- old/gtkhtml-4.8.4/gtkhtml/htmlengine-edit-cursor.c 2014-03-24
10:04:22.000000000 +0100
+++ new/gtkhtml-4.8.5/gtkhtml/htmlengine-edit-cursor.c 2014-10-07
18:46:47.000000000 +0200
@@ -28,6 +28,7 @@
#include "htmlengine-edit-cursor.h"
#include "htmlengine-edit-table.h"
#include "htmlengine-edit-tablecell.h"
+#include "htmlgdkpainter.h"
#include "htmlimage.h"
#include "htmlobject.h"
#include "htmltable.h"
@@ -357,7 +358,26 @@
if (clip_cursor (engine, x, y, width, height, &x1, &y1, &x2, &y2)) {
cairo_t *cr;
- cr = gdk_cairo_create (engine->window);
+ gboolean using_painter_cr;
+
+ using_painter_cr = engine->painter &&
+ HTML_IS_GDK_PAINTER (engine->painter) &&
+ HTML_GDK_PAINTER (engine->painter)->cr != NULL;
+
+ if (using_painter_cr) {
+ HTMLGdkPainter *gdk_painter = HTML_GDK_PAINTER
(engine->painter);
+
+ cr = gdk_painter->cr;
+ cairo_save (cr);
+
+ x1 -= gdk_painter->x1;
+ y1 -= gdk_painter->y1;
+ x2 -= gdk_painter->x1;
+ y2 -= gdk_painter->y1;
+ } else {
+ cr = gdk_cairo_create (engine->window);
+ }
+
cairo_set_source_rgb (cr, 1, 1, 1);
cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE);
cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
@@ -365,7 +385,11 @@
cairo_line_to (cr, x2 + 0.5, y2 - 0.5);
cairo_set_line_width (cr, 1);
cairo_stroke (cr);
- cairo_destroy (cr);
+
+ if (using_painter_cr)
+ cairo_restore (cr);
+ else
+ cairo_destroy (cr);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gtkhtml-4.8.4/gtkhtml/htmlengine.c
new/gtkhtml-4.8.5/gtkhtml/htmlengine.c
--- old/gtkhtml-4.8.4/gtkhtml/htmlengine.c 2014-05-29 16:48:55.000000000
+0200
+++ new/gtkhtml-4.8.5/gtkhtml/htmlengine.c 2014-10-07 18:46:47.000000000
+0200
@@ -5290,11 +5290,12 @@
e->clue->y = html_engine_get_top_border (e) + e->clue->ascent;
html_object_draw (e->clue, e->painter, x1, y1, x2 - x1, y2 -
y1, 0, 0);
}
- html_painter_end (e->painter);
if (e->editable || e->caret_mode)
html_engine_draw_cursor_in_area (e, x1, y1, x2 - x1, y2 - y1);
+ html_painter_end (e->painter);
+
e->expose = FALSE;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
