[gtkhtml3] Add patch for RH bug #1120291 (missing chain-up-s for constructed() method)

Milan Crha mcrha at fedoraproject.org
Thu Jul 17 08:52:39 UTC 2014


commit cf0c7a989c909ea6158586c2b9eeadad309374f0
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Jul 17 10:52:55 2014 +0200

    Add patch for RH bug #1120291 (missing chain-up-s for constructed() method)

 gtkhtml-4.8.3-missing-chainups.patch |   28 ++++++++++++++++++++++++++++
 gtkhtml3.spec                        |    9 ++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/gtkhtml-4.8.3-missing-chainups.patch b/gtkhtml-4.8.3-missing-chainups.patch
new file mode 100644
index 0000000..16a8d66
--- /dev/null
+++ b/gtkhtml-4.8.3-missing-chainups.patch
@@ -0,0 +1,28 @@
+diff --git a/components/editor/gtkhtml-combo-box.c b/components/editor/gtkhtml-combo-box.c
+index ea46e42..d6a2064 100644
+--- a/components/editor/gtkhtml-combo-box.c
++++ b/components/editor/gtkhtml-combo-box.c
+@@ -282,6 +282,9 @@ combo_box_constructed (GObject *object)
+ 
+ 	combo_box = GTK_COMBO_BOX (object);
+ 
++	/* Chain up to parent's method. */
++	G_OBJECT_CLASS (parent_class)->constructed (object);
++
+ 	/* This needs to happen after constructor properties are set
+ 	 * so that GtkCellLayout.get_area() returns something valid. */
+ 
+diff --git a/components/editor/gtkhtml-image-chooser-dialog.c b/components/editor/gtkhtml-image-chooser-dialog.c
+index 90d4bc4..2b31d9a 100644
+--- a/components/editor/gtkhtml-image-chooser-dialog.c
++++ b/components/editor/gtkhtml-image-chooser-dialog.c
+@@ -149,6 +149,9 @@ image_chooser_dialog_constructed (GObject *object)
+ 	GtkFileChooser *file_chooser;
+ 	GtkFileFilter *file_filter;
+ 
++	/* Chain up to parent's method. */
++	G_OBJECT_CLASS (gtkhtml_image_chooser_dialog_parent_class)->constructed (object);
++
+ 	file_chooser = GTK_FILE_CHOOSER (object);
+ 	gtk_file_chooser_set_local_only (file_chooser, FALSE);
+ 
diff --git a/gtkhtml3.spec b/gtkhtml3.spec
index c152806..8d3a2f3 100644
--- a/gtkhtml3.spec
+++ b/gtkhtml3.spec
@@ -5,13 +5,16 @@
 
 Name: gtkhtml3
 Version: 4.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: GtkHTML library
 License: LGPLv2+ and GPLv2
 URL: http://projects.gnome.org/evolution/
 Source: http://download.gnome.org/sources/gtkhtml/4.8/gtkhtml-%{version}.tar.xz
 
+# RH bug #1120291
+Patch01: gtkhtml-4.8.3-missing-chainups.patch
+
 ### Build Dependencies ###
 
 BuildRequires: gettext
@@ -43,6 +46,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n gtkhtml-%{version}
+%patch01 -p1 -b .missing-chainups
 
 %build
 autoreconf -fi
@@ -75,6 +79,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jul 17 2014 Milan Crha <mcrha at redhat.com> - 4.8.3-2
+- Add patch for RH bug #1120291 (missing chain-up-s for constructed() method)
+
 * Mon Jul 14 2014 Milan Crha <mcrha at redhat.com> - 4.8.3-1
 - Update to 4.8.3
 


More information about the scm-commits mailing list