Hello community, here is the log from the commit of package gtkhtml for openSUSE:Factory checked in at 2014-07-18 06:39:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-13 17:16:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkhtml.new/gtkhtml.changes 2014-07-18 06:40:20.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 16 12:10:53 UTC 2014 - dims...@opensuse.org + +- Update to version 4.8.3: + + Remove usages of deprecated gtk_widget_ensure_style(). + + Remove unused and obsolete gtkhtml-zip.in. + + bgo#732499: Use named colors from themes. + +------------------------------------------------------------------- Old: ---- gtkhtml-4.8.2.tar.xz New: ---- gtkhtml-4.8.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml.spec ++++++ --- /var/tmp/diff_new_pack.hgl3xI/_old 2014-07-18 06:40:21.000000000 +0200 +++ /var/tmp/diff_new_pack.hgl3xI/_new 2014-07-18 06:40:21.000000000 +0200 @@ -24,7 +24,7 @@ %define _gtkhtml_editor_major 0 Name: gtkhtml -Version: 4.8.2 +Version: 4.8.3 Release: 0 Summary: Lightweight HTML rendering/printing/editing engine License: GPL-2.0+ and LGPL-2.1+ ++++++ gtkhtml-4.8.2.tar.xz -> gtkhtml-4.8.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/ChangeLog new/gtkhtml-4.8.3/ChangeLog --- old/gtkhtml-4.8.2/ChangeLog 2014-06-09 07:53:27.000000000 +0200 +++ new/gtkhtml-4.8.3/ChangeLog 2014-07-14 07:31:18.000000000 +0200 @@ -1,5 +1,62 @@ # Generated by Makefile. Do not edit. +commit 59fcab11b56d6a6e1c7fbf386304cae9560fcc83 +Author: Milan Crha <mc...@redhat.com> +Date: Thu Jul 10 12:14:09 2014 +0200 + + Remove unused and obsolete gtkhtml-zip.in + + Makefile.am | 1 - + configure.ac | 1 - + gtkhtml-zip.in | 28 ---------------------------- + 3 files changed, 30 deletions(-) + +commit d0309233b70d1ea291b0cc6a3b7f0053c94fe80c +Author: Milan Crha <mc...@redhat.com> +Date: Thu Jul 10 11:09:58 2014 +0200 + + Remove usages of deprecated gtk_widget_ensure_style() + + components/editor/gtkhtml-editor-private.c | 1 - + gtkhtml/test-stress.c | 2 -- + 2 files changed, 3 deletions(-) + +commit cd65674dd01a779ed5087bf368bff9b9f9ef641c +Author: Milan Crha <mc...@redhat.com> +Date: Tue Jul 1 11:27:42 2014 +0200 + + Bug 732499 - Use named colors from themes + + gtkhtml/htmlcolorset.c | 35 +++++++++++++++++------------------ + 1 file changed, 17 insertions(+), 18 deletions(-) + +commit 8e9a700e11f30b1d5b39c75c50ebddb1c2fa800b +Author: Milan Crha <mc...@redhat.com> +Date: Wed Jun 18 11:26:05 2014 +0200 + + Bug 731611 - Do not include marshall-generated code in tarballs + + components/editor/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit a574e6112db41b9124ff40f529b19eb115235d5e +Author: Milan Crha <mc...@redhat.com> +Date: Mon Jun 9 07:56:41 2014 +0200 + + Post-release version bump + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55cd24cec8078fe9fd33055f7a2aa844b3fb363b +Author: Milan Crha <mc...@redhat.com> +Date: Mon Jun 9 07:55:29 2014 +0200 + + NEWS update for 4.8.2 + + NEWS | 10 ++++++++++ + 1 file changed, 10 insertions(+) + commit 22eec6375faa70671dd1ad3be6be4ef92e79e331 Author: Lasse Liehu <lasse.li...@gmail.com> Date: Fri May 30 15:34:43 2014 +0300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/Makefile.am new/gtkhtml-4.8.3/Makefile.am --- old/gtkhtml-4.8.2/Makefile.am 2014-03-24 10:04:22.000000000 +0100 +++ new/gtkhtml-4.8.3/Makefile.am 2014-07-10 12:15:28.000000000 +0200 @@ -34,7 +34,6 @@ $(srcdir)/m4/lt~obsolete.m4 EXTRA_DIST = \ - gtkhtml-zip.in \ COPYING.LIB \ BUGS \ intltool-extract.in \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/Makefile.in new/gtkhtml-4.8.3/Makefile.in --- old/gtkhtml-4.8.2/Makefile.in 2014-06-09 07:53:15.000000000 +0200 +++ new/gtkhtml-4.8.3/Makefile.in 2014-07-14 07:31:03.000000000 +0200 @@ -81,9 +81,8 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/gtkhtml-zip.in COPYING \ - COPYING.LIB TODO config.guess config.sub depcomp install-sh \ - missing ltmain.sh + $(srcdir)/config.h.in COPYING COPYING.LIB TODO config.guess \ + config.sub depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -96,7 +95,7 @@ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = gtkhtml-zip +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -410,7 +409,6 @@ $(srcdir)/m4/lt~obsolete.m4 EXTRA_DIST = \ - gtkhtml-zip.in \ COPYING.LIB \ BUGS \ intltool-extract.in \ @@ -470,8 +468,6 @@ distclean-hdr: -rm -f config.h stamp-h1 -gtkhtml-zip: $(top_builddir)/config.status $(srcdir)/gtkhtml-zip.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/NEWS new/gtkhtml-4.8.3/NEWS --- old/gtkhtml-4.8.2/NEWS 2014-06-09 07:52:54.000000000 +0200 +++ new/gtkhtml-4.8.3/NEWS 2014-07-14 07:30:37.000000000 +0200 @@ -1,3 +1,13 @@ +GtkHTML-4.8.3 2014-07-14 +------------------------ + +Bug Fixes: + Bug 732499 - Use named colors from themes (Milan Crha) + +Miscellaneous: + Remove usages of deprecated gtk_widget_ensure_style() (Milan Crha) + Remove unused and obsolete gtkhtml-zip.in (Milan Crha) + GtkHTML-4.8.2 2014-06-09 ------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/Makefile.am new/gtkhtml-4.8.3/components/editor/Makefile.am --- old/gtkhtml-4.8.2/components/editor/Makefile.am 2014-03-24 10:04:22.000000000 +0100 +++ new/gtkhtml-4.8.3/components/editor/Makefile.am 2014-06-18 11:28:16.000000000 +0200 @@ -115,6 +115,9 @@ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(pkgconfig_DATA) +dist-hook: + cd $(distdir); rm -f $(BUILT_SOURCES) + if GLADE_CATALOG gladecatalog_DATA = gtkhtml-editor.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/Makefile.in new/gtkhtml-4.8.3/components/editor/Makefile.in --- old/gtkhtml-4.8.2/components/editor/Makefile.in 2014-06-09 07:53:15.000000000 +0200 +++ new/gtkhtml-4.8.3/components/editor/Makefile.in 2014-07-14 07:31:04.000000000 +0200 @@ -958,6 +958,9 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am @@ -1086,13 +1089,14 @@ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libglade_gtkhtml_editorLTLIBRARIES clean-libtool \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am \ - install-gladecatalogDATA install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ + cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-gladecatalogDATA install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES \ install-libglade_gtkhtml_editorLTLIBRARIES \ install-libgtkhtml_editorHEADERS install-man install-pdf \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ @@ -1124,6 +1128,9 @@ %-$(EDITOR_API_VERSION).pc: %.pc cp $< $@ +dist-hook: + cd $(distdir); rm -f $(BUILT_SOURCES) + -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-4.0.pc new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-4.0.pc --- old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-4.0.pc 2014-06-09 07:53:25.000000000 +0200 +++ new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-4.0.pc 2014-07-14 07:31:17.000000000 +0200 @@ -8,6 +8,6 @@ Name: gtkhtml-editor Description: HTML editor widget Requires: libgtkhtml-4.0 -Version: 4.8.2 +Version: 4.8.3 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.2/components/editor/gtkhtml-editor-marshal.c new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-marshal.c --- old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-marshal.c 2014-05-22 08:52:57.000000000 +0200 +++ new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-marshal.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#include "gtkhtml-editor-marshal.h" - -#include <glib-object.h> - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:STRING,POINTER (gtkhtml-editor-marshal.list:1) */ -void -gtkhtml_editor_marshal_VOID__STRING_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), - data2); -} - -/* STRING:STRING (gtkhtml-editor-marshal.list:2) */ -void -gtkhtml_editor_marshal_STRING__STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef gchar* (*GMarshalFunc_STRING__STRING) (gpointer data1, - gpointer arg_1, - gpointer data2); - register GMarshalFunc_STRING__STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - gchar* v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_STRING__STRING) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_string (param_values + 1), - data2); - - g_value_take_string (return_value, v_return); -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-marshal.h new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-marshal.h --- old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-marshal.h 2014-05-22 08:52:57.000000000 +0200 +++ new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-marshal.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ - -#ifndef __gtkhtml_editor_marshal_MARSHAL_H__ -#define __gtkhtml_editor_marshal_MARSHAL_H__ - -#include <glib-object.h> - -G_BEGIN_DECLS - -/* VOID:STRING,POINTER (gtkhtml-editor-marshal.list:1) */ -extern void gtkhtml_editor_marshal_VOID__STRING_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* STRING:STRING (gtkhtml-editor-marshal.list:2) */ -extern void gtkhtml_editor_marshal_STRING__STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gtkhtml_editor_marshal_MARSHAL_H__ */ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-private.c new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-private.c --- old/gtkhtml-4.8.2/components/editor/gtkhtml-editor-private.c 2014-03-24 10:04:22.000000000 +0100 +++ new/gtkhtml-4.8.3/components/editor/gtkhtml-editor-private.c 2014-07-10 11:11:02.000000000 +0200 @@ -318,7 +318,6 @@ /* Initialize painters (requires "edit_area"). */ html = gtkhtml_editor_get_html (editor); - gtk_widget_ensure_style (GTK_WIDGET (html)); priv->html_painter = g_object_ref (html->engine->painter); priv->plain_painter = html_plain_painter_new (priv->edit_area, TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/gtkhtml-spell-marshal.c new/gtkhtml-4.8.3/components/editor/gtkhtml-spell-marshal.c --- old/gtkhtml-4.8.2/components/editor/gtkhtml-spell-marshal.c 2014-05-22 08:52:57.000000000 +0200 +++ new/gtkhtml-4.8.3/components/editor/gtkhtml-spell-marshal.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -#include "gtkhtml-spell-marshal.h" - -#include <glib-object.h> - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:STRING,INT (gtkhtml-spell-marshal.list:1) */ -void -gtkhtml_spell_marshal_VOID__STRING_INT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_INT) (gpointer data1, - gpointer arg_1, - gint arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_INT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_int (param_values + 2), - data2); -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/components/editor/gtkhtml-spell-marshal.h new/gtkhtml-4.8.3/components/editor/gtkhtml-spell-marshal.h --- old/gtkhtml-4.8.2/components/editor/gtkhtml-spell-marshal.h 2014-05-22 08:52:57.000000000 +0200 +++ new/gtkhtml-4.8.3/components/editor/gtkhtml-spell-marshal.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ - -#ifndef __gtkhtml_spell_marshal_MARSHAL_H__ -#define __gtkhtml_spell_marshal_MARSHAL_H__ - -#include <glib-object.h> - -G_BEGIN_DECLS - -/* VOID:STRING,INT (gtkhtml-spell-marshal.list:1) */ -extern void gtkhtml_spell_marshal_VOID__STRING_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __gtkhtml_spell_marshal_MARSHAL_H__ */ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/configure new/gtkhtml-4.8.3/configure --- old/gtkhtml-4.8.2/configure 2014-06-09 07:53:14.000000000 +0200 +++ new/gtkhtml-4.8.3/configure 2014-07-14 07:31:02.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.2. +# Generated by GNU Autoconf 2.69 for gtkhtml 4.8.3. # # 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.2' -PACKAGE_STRING='gtkhtml 4.8.2' +PACKAGE_VERSION='4.8.3' +PACKAGE_STRING='gtkhtml 4.8.3' 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.2 to adapt to many kinds of systems. +\`configure' configures gtkhtml 4.8.3 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.2:";; + short | recursive ) echo "Configuration of gtkhtml 4.8.3:";; 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.2 +gtkhtml configure 4.8.3 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.2, which was +It was created by gtkhtml $as_me 4.8.3, 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.2' + VERSION='4.8.3' cat >>confdefs.h <<_ACEOF @@ -19026,7 +19026,7 @@ -ac_config_files="$ac_config_files Makefile gtkhtml-zip a11y/Makefile art/Makefile components/Makefile components/editor/Makefile components/editor/gtkhtml-editor.pc gtkhtml/Makefile gtkhtml/libgtkhtml.pc po/Makefile.in" +ac_config_files="$ac_config_files Makefile a11y/Makefile art/Makefile components/Makefile components/editor/Makefile components/editor/gtkhtml-editor.pc gtkhtml/Makefile gtkhtml/libgtkhtml.pc po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -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.2, which was +This file was extended by gtkhtml $as_me 4.8.3, 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.2 +gtkhtml config.status 4.8.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20172,7 +20172,6 @@ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "gtkhtml-zip") CONFIG_FILES="$CONFIG_FILES gtkhtml-zip" ;; "a11y/Makefile") CONFIG_FILES="$CONFIG_FILES a11y/Makefile" ;; "art/Makefile") CONFIG_FILES="$CONFIG_FILES art/Makefile" ;; "components/Makefile") CONFIG_FILES="$CONFIG_FILES components/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/configure.ac new/gtkhtml-4.8.3/configure.ac --- old/gtkhtml-4.8.2/configure.ac 2014-05-02 14:40:44.000000000 +0200 +++ new/gtkhtml-4.8.3/configure.ac 2014-07-10 12:15:28.000000000 +0200 @@ -1,6 +1,6 @@ dnl Initialization AC_PREREQ(2.58) -AC_INIT([gtkhtml], [4.8.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml]) +AC_INIT([gtkhtml], [4.8.3], [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) @@ -279,7 +279,6 @@ AC_CONFIG_FILES([ Makefile -gtkhtml-zip a11y/Makefile art/Makefile components/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/gtkhtml/htmlcolorset.c new/gtkhtml-4.8.3/gtkhtml/htmlcolorset.c --- old/gtkhtml-4.8.2/gtkhtml/htmlcolorset.c 2014-03-24 10:04:22.000000000 +0100 +++ new/gtkhtml-4.8.3/gtkhtml/htmlcolorset.c 2014-07-01 11:28:54.000000000 +0200 @@ -198,32 +198,32 @@ if (s->color[HTML ## t ## Color]) html_color_unref (s->color[HTML ## t ## Color]); \ s->color[HTML ## t ## Color] = html_color_new_from_gdk_color (&gc); \ } -#define SET_COLOR_FUNC(t,st,func) \ +#define SET_COLOR_STYLE(t,nm,flbk) \ if (!s->changed[HTML ## t ## Color]) { \ GdkRGBA color_rgba; \ \ - func (style_context, st, &color_rgba); \ + if (!gtk_style_context_lookup_color (style_context, nm, &color_rgba)) \ + gdk_rgba_parse (&color_rgba, flbk); \ \ SET_GCOLOR (t, color_rgba); \ } -#define SET_COLOR_BG(t,st) SET_COLOR_FUNC (t, st, gtk_style_context_get_background_color) -#define SET_COLOR_FG(t,st) SET_COLOR_FUNC (t, st, gtk_style_context_get_color) - GdkRGBA color; + gboolean backdrop; GtkStyleContext *style_context = gtk_widget_get_style_context (w); + GtkStateFlags state_flags; + + state_flags = gtk_widget_get_state_flags (w); + 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_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"); + SET_COLOR_STYLE (HighlightNF, backdrop ? "theme_unfocused_selected_bg_color" : "theme_selected_bg_color", "#afafff"); + SET_COLOR_STYLE (HighlightTextNF, backdrop ? "theme_unfocused_selected_fg_color" : "theme_selected_fg_color", "#000000"); - /* have text background and foreground colors same as GtkEntry */ - gtk_style_context_save (style_context); - gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY); - SET_COLOR_BG (Bg, GTK_STATE_FLAG_NORMAL); - SET_COLOR_FG (Text, GTK_STATE_FLAG_NORMAL); - gtk_style_context_restore (style_context); - - SET_COLOR_BG (Highlight, GTK_STATE_FLAG_SELECTED); - SET_COLOR_FG (HighlightText, GTK_STATE_FLAG_SELECTED); - SET_COLOR_BG (HighlightNF, GTK_STATE_FLAG_ACTIVE); - SET_COLOR_FG (HighlightTextNF, GTK_STATE_FLAG_ACTIVE); get_prop_color (w, "link_color", "#0000ff", FALSE, &color); SET_GCOLOR (Link, color); get_prop_color (w, "alink_color", "#0000ff", FALSE, &color); @@ -235,8 +235,7 @@ get_prop_color (w, "cite_color", NULL, TRUE, &color); SET_GCOLOR (Cite, color); -#undef SET_COLOR_FG -#undef SET_COLOR_BG +#undef SET_COLOR_STYLE #undef SET_COLOR_FUNC #undef SET_GCOLOR } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/gtkhtml/test-stress.c new/gtkhtml-4.8.3/gtkhtml/test-stress.c --- old/gtkhtml-4.8.2/gtkhtml/test-stress.c 2014-03-24 10:04:22.000000000 +0100 +++ new/gtkhtml-4.8.3/gtkhtml/test-stress.c 2014-07-10 11:11:02.000000000 +0200 @@ -42,8 +42,6 @@ { HTMLGdkPainter *p, *old_p; - gtk_widget_ensure_style (GTK_WIDGET (html)); - if (!plain_painter) { gdk_painter = HTML_GDK_PAINTER (html->engine->painter); plain_painter = HTML_GDK_PAINTER (html_plain_painter_new (GTK_WIDGET (html), TRUE)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkhtml-4.8.2/gtkhtml-zip.in new/gtkhtml-4.8.3/gtkhtml-zip.in --- old/gtkhtml-4.8.2/gtkhtml-zip.in 2014-03-24 10:04:22.000000000 +0100 +++ new/gtkhtml-4.8.3/gtkhtml-zip.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -#!/bin/sh - -# Build zipfile distribution of gtkhtml for Win32. Separate runtime -# and developer zipfiles. Run after make install. - -ZIP=/tmp/gtkhtml-@VERSION@.zip -DEVZIP=/tmp/gtkhtml-dev-@VERSION@.zip - -cd @prefix@ -rm $ZIP - -current_minus_age=`expr @GTKHTML_CURRENT@ - @GTKHTML_AGE@` - -zip -r $ZIP -@ <<EOF -bin/libgtkhtml-@GTKHTML_API_VERSION@-$current_minus_age.dll -bin/libgtkhtml-editor-0.dll -share/gtkhtml-@GTKHTML_API_VERSION@ -EOF - -zip $ZIP share/locale/*/LC_MESSAGES/gtkhtml-@GTKHTML_API_VERSION@.mo - -rm $DEVZIP -zip -r $DEVZIP -@ <<EOF -lib/libgtkhtml-@GTKHTML_API_VERSION@.dll.a -lib/libgtkhtml-editor.dll.a -lib/pkgconfig -include/libgtkhtml-@GTKHTML_API_VERSION@ -EOF -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org