Fix occasional misbehaviour of g_timeout_add_seconds

This commit is contained in:
Matthias Clasen 2008-04-03 05:42:42 +00:00
parent 130a126165
commit 89c9d4c973
2 changed files with 19 additions and 1 deletions

View File

@ -3,7 +3,7 @@
Summary: A library of handy utility functions
Name: glib2
Version: 2.16.2
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@ -19,6 +19,8 @@ BuildRequires: libselinux-devel
# for sys/inotify.h
BuildRequires: glibc-devel
# fixed in upstream svn
Patch0: timeout-wrap.patch
%description
GLib is the low-level core library that forms the basis
@ -51,6 +53,7 @@ of version 2 of the GLib library.
%prep
%setup -q -n glib-%{version}
%patch0 -p1 -b .timeout-wrap
%build
%configure --disable-gtk-doc --enable-static
@ -123,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lib*.a
%changelog
* Thu Apr 3 2008 Matthias Clasen <mclasen@redhat.com> - 2.16.2-2
- Fix occasional misbehaviour of g_timeout_add_seconds
* Tue Apr 1 2008 Matthias Clasen <mclasen@redhat.com> - 2.16.2-1
- Update to 2.16.2

12
timeout-wrap.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up glib-2.16.2/glib/gmain.c.timeout-wrap glib-2.16.2/glib/gmain.c
--- glib-2.16.2/glib/gmain.c.timeout-wrap 2008-04-03 01:39:46.000000000 -0400
+++ glib-2.16.2/glib/gmain.c 2008-04-03 01:40:08.000000000 -0400
@@ -3320,7 +3320,7 @@ g_timeout_set_expiration (GTimeoutSource
if (!session_bus_address)
session_bus_address = g_getenv ("HOSTNAME");
if (session_bus_address)
- timer_perturb = g_str_hash (session_bus_address);
+ timer_perturb = ABS (g_str_hash (session_bus_address));
else
timer_perturb = 0;
}