rpms/wxGTK/F-11 wxGTK-2.8.10-wxTimer-fix.patch, NONE, 1.1 wxGTK.spec, 1.46, 1.47
Dan Horák
sharkcz at fedoraproject.org
Fri Oct 16 10:18:09 UTC 2009
- Previous message (by thread): rpms/wxGTK/F-12 wxGTK-2.8.10-wxTimer-fix.patch, NONE, 1.1 wxGTK.spec, 1.48, 1.49
- Next message (by thread): rpms/ocaml-postgresql/F-10 .cvsignore, 1.3, 1.4 ocaml-postgresql.spec, 1.6, 1.7 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/pkgs/rpms/wxGTK/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10730
Modified Files:
wxGTK.spec
Added Files:
wxGTK-2.8.10-wxTimer-fix.patch
Log Message:
* Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-3
- add fix for excessive CPU usage (#494425)
wxGTK-2.8.10-wxTimer-fix.patch:
app.cpp | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
--- NEW FILE wxGTK-2.8.10-wxTimer-fix.patch ---
Index: src/gtk/app.cpp
===================================================================
--- src/gtk/app.cpp (revision 62396)
+++ src/gtk/app.cpp (revision 62397)
@@ -149,9 +149,11 @@
// One-shot emission hook for "event" signal, to install idle handler.
// This will be called when the "event" signal is issued on any GtkWidget object.
static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
{
wxapp_install_idle_handler();
+ bool* hook_installed = (bool*)data;
+ *hook_installed = false;
// remove hook
return false;
}
@@ -159,12 +161,17 @@
// add emission hook for "event" signal, to re-install idle handler when needed
static inline void wxAddEmissionHook()
{
+ static bool hook_installed;
GType widgetType = GTK_TYPE_WIDGET;
- // if GtkWidget type is loaded
- if (g_type_class_peek(widgetType) != NULL)
+ // if hook not installed and GtkWidget type is loaded
+ if (!hook_installed && g_type_class_peek(widgetType))
{
- guint sig_id = g_signal_lookup("event", widgetType);
- g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+ static guint sig_id;
+ if (sig_id == 0)
+ sig_id = g_signal_lookup("event", widgetType);
+ hook_installed = true;
+ g_signal_add_emission_hook(
+ sig_id, 0, event_emission_hook, &hook_installed, NULL);
}
}
Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/F-11/wxGTK.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- wxGTK.spec 15 Jul 2009 17:52:34 -0000 1.46
+++ wxGTK.spec 16 Oct 2009 10:18:09 -0000 1.47
@@ -4,7 +4,7 @@
Name: wxGTK
Version: 2.8.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GTK2 port of the wxWidgets GUI library
# The wxWindows licence is the LGPL with a specific exemption allowing
# distribution of derived binaries under any terms. (This will eventually
@@ -16,6 +16,8 @@ Source0: http://dl.sf.net/wxwindo
# http://trac.wxwidgets.org/ticket/10993
Patch0: %{name}-2.8.10-CVE-2009-2369.patch
+# http://trac.wxwidgets.org/ticket/11315
+Patch1: %{name}-2.8.10-wxTimer-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +100,7 @@ libraries or the X Window System.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p0 -b .CVE-2009-2369
+%patch1 -p0 -b .wxTimer-fix
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@@ -250,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-3
+- add fix for excessive CPU usage (#494425)
+
* Wed Jul 15 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-2
- add fix for CVE-2009-2369 (#511279)
- Previous message (by thread): rpms/wxGTK/F-12 wxGTK-2.8.10-wxTimer-fix.patch, NONE, 1.1 wxGTK.spec, 1.48, 1.49
- Next message (by thread): rpms/ocaml-postgresql/F-10 .cvsignore, 1.3, 1.4 ocaml-postgresql.spec, 1.6, 1.7 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list