[mingw-gtkhtml3: 3/20] Update to 3.30.1 (fixes RHBZ #599778 and #564909)
epienbro
epienbro at fedoraproject.org
Tue Mar 6 20:04:04 UTC 2012
commit e3c2660f60fa99917fdd102150acefb7ed36863e
Author: epienbro <epienbro at fedoraproject.org>
Date: Fri Jun 11 21:37:33 2010 +0000
Update to 3.30.1 (fixes RHBZ #599778 and #564909)
.cvsignore | 2 +-
gtkhtml-dont-search-for-gnome-icon-theme.patch | 12 ++--
gtkhtml-make-gconf-optional.patch | 88 +++++++-----------------
gtkhtml-make-iso-codes-optional.patch | 14 ++--
mingw32-gtkhtml3.spec | 7 ++-
sources | 2 +-
6 files changed, 46 insertions(+), 79 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index a71e694..9bd3cf2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtkhtml-3.29.3.tar.bz2
+gtkhtml-3.30.1.tar.bz2
diff --git a/gtkhtml-dont-search-for-gnome-icon-theme.patch b/gtkhtml-dont-search-for-gnome-icon-theme.patch
index 57d795b..50cdeca 100644
--- a/gtkhtml-dont-search-for-gnome-icon-theme.patch
+++ b/gtkhtml-dont-search-for-gnome-icon-theme.patch
@@ -1,14 +1,14 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -178,11 +183,6 @@ AM_CONDITIONAL(HAVE_SOUP, test x$have_soup != xno)
+--- a/configure.ac.orig 2010-05-08 18:12:23.719940094 +0200
++++ b/configure.ac 2010-05-08 18:12:31.539933149 +0200
+@@ -192,11 +192,6 @@
AM_CONDITIONAL(HAVE_NEWSOUP, test x$HAVE_NEWSOUP != xno)
dnl **************************************************
--dnl * Gnome Icon Theme
+-dnl Gnome Icon Theme
-dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
-
-dnl **************************************************
- dnl * iso-codes
+ dnl iso-codes
dnl **************************************************
-
+ AC_MSG_CHECKING([for iso-codes package])
diff --git a/gtkhtml-make-gconf-optional.patch b/gtkhtml-make-gconf-optional.patch
index 8c65d45..c39e6e2 100644
--- a/gtkhtml-make-gconf-optional.patch
+++ b/gtkhtml-make-gconf-optional.patch
@@ -1,25 +1,5 @@
diff --git a/configure.ac b/configure.ac
index 2e28dbe..5d2f5a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,11 +136,16 @@ PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODULES)
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
-
--GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant gconf-2.0 iso-codes"
-+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
-+PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
-+if test "$have_gconf" = "true" ; then
-+ GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
-+fi
- PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
- AC_SUBST(GTKHTML_CFLAGS)
- AC_SUBST(GTKHTML_LIBS)
- AC_SUBST(GTKHTML_MODULES)
-+AM_CONDITIONAL(HAVE_GCONF, test x$have_gconf != xno)
-
- # Glade catalog files
- AC_ARG_WITH(glade-catalog,
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index 6ac2d02..9e781c0 100644
--- a/gtkhtml/Makefile.am
@@ -63,23 +43,14 @@ diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 6aa0cef..7ed2d0d 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
-@@ -128,8 +128,10 @@ struct _ClipboardContents {
-
- static GtkLayoutClass *parent_class = NULL;
-
-+#ifdef HAVE_GCONF
- static GConfClient *gconf_client = NULL;
- static GError *gconf_error = NULL;
-+#endif
-
- enum {
- TITLE_CHANGED,
-@@ -791,7 +793,9 @@ destroy (GtkObject *object)
+@@ -794,9 +794,11 @@
}
if (html->priv->notify_monospace_font_id) {
+#ifdef HAVE_GCONF
- gconf_client_notify_remove (gconf_client, html->priv->notify_monospace_font_id);
+ gconf_client_notify_remove (
+ gconf_client_get_default (),
+ html->priv->notify_monospace_font_id);
+#endif
html->priv->notify_monospace_font_id = 0;
}
@@ -153,22 +124,6 @@ index 6aa0cef..7ed2d0d 100644
if (!fixed_name) {
fixed_family = "Monospace";
-@@ -2365,6 +2383,7 @@ setup_class_properties (GtkHTML *html)
- if (!klass->properties) {
- klass->properties = gtk_html_class_properties_new (GTK_WIDGET (html));
-
-+#ifdef HAVE_GCONF
- if (!gconf_is_initialized ()) {
- gchar *argv[] = { (gchar *) "gtkhtml", NULL };
-
-@@ -2381,6 +2400,7 @@ setup_class_properties (GtkHTML *html)
- gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
- if (gconf_error)
- g_error ("gconf error: %s\n", gconf_error->message);
-+#endif
- }
- }
-
@@ -2751,13 +2771,16 @@ drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint t
static void
read_key_theme (GtkHTMLClass *html_class)
@@ -213,25 +168,14 @@ index 6aa0cef..7ed2d0d 100644
client = gconf_client_get_default ();
gconf_client_notify_add (client, "/desktop/gnome/interface/gtk_key_theme",
-@@ -3188,6 +3215,7 @@ gtk_html_class_init (GtkHTMLClass *klass)
+@@ -3207,6 +3207,7 @@
client_notify_cursor_blink (client, 0, NULL, NULL);
g_object_unref (client);
+#endif
}
- static void
-@@ -3195,8 +3223,10 @@ init_properties_widget (GtkHTML *html)
- {
- setup_class_properties (html);
-
-+#ifdef HAVE_GCONF
- if (!gconf_client)
- gconf_client = gconf_client_get_default ();
-+#endif
-
- }
-
+ void
@@ -3478,9 +3508,11 @@ gtk_html_init (GtkHTML* html)
g_signal_connect (G_OBJECT (html->priv->im_context), "delete_surrounding",
G_CALLBACK (gtk_html_im_delete_surrounding_cb), html);
@@ -256,3 +200,23 @@ index 6aa0cef..7ed2d0d 100644
}
static void
+--- a/configure.ac.orig 2010-04-26 06:58:42.000000000 +0200
++++ b/configure.ac 2010-05-08 12:19:55.308862096 +0200
+@@ -146,11 +146,16 @@
+ dnl **********************************
+ dnl GTKHTML modules
+ dnl **********************************
+-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
++GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
++PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
++if test "$have_gconf" = "true" ; then
++ GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
++fi
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
+ AC_SUBST(GTKHTML_MODULES)
++AM_CONDITIONAL(HAVE_GCONF, test x$have_gconf != xno)
+
+ dnl **********************************
+ dnl Glade catalog files
diff --git a/gtkhtml-make-iso-codes-optional.patch b/gtkhtml-make-iso-codes-optional.patch
index 8c227b8..03e2a7a 100644
--- a/gtkhtml-make-iso-codes-optional.patch
+++ b/gtkhtml-make-iso-codes-optional.patch
@@ -1,11 +1,11 @@
---- gtkhtml-3.28.0/configure.ac.orig 2009-09-24 19:01:36.394784545 +0200
-+++ gtkhtml-3.28.0/configure.ac 2009-09-24 19:01:56.310533792 +0200
-@@ -137,7 +137,7 @@
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
-
+--- a/configure.ac.orig 2010-05-08 18:13:14.000000000 +0200
++++ b/configure.ac 2010-05-08 18:14:05.606880865 +0200
+@@ -146,7 +146,7 @@
+ dnl **********************************
+ dnl GTKHTML modules
+ dnl **********************************
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant"
PKG_CHECK_MODULES(GCONF, gconf-2.0, have_gconf=yes, have_gconf=no)
if test "$have_gconf" = "true" ; then
- GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
+ GTKHTML_MODULES="$GTKHTML_MODULES gconf-2.0"
diff --git a/mingw32-gtkhtml3.spec b/mingw32-gtkhtml3.spec
index 9b77f8e..8530846 100644
--- a/mingw32-gtkhtml3.spec
+++ b/mingw32-gtkhtml3.spec
@@ -6,8 +6,8 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-gtkhtml3
-Version: 3.29.3
-Release: 2%{?dist}
+Version: 3.30.1
+Release: 1%{?dist}
Summary: MinGW library for embedding a lightweight web browser in GTK programs
License: LGPLv2+
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 11 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.30.1-1
+- Update to 3.30.1 (Fixes RHBZ #599778 and #564909)
+
* Fri Dec 11 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.29.3-2
- Looks like the original license tag was correct: LGPLv2+
- Bundle COPYING.LIB instead of COPYING
diff --git a/sources b/sources
index 1bfff72..93e2e9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1439783818e20933c69199fa08a87e19 gtkhtml-3.29.3.tar.bz2
+f858b359511f1e1437ad826f4ce0eda9 gtkhtml-3.30.1.tar.bz2
More information about the scm-commits
mailing list