Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8ae8db52796873a06b1f2d85646ce781c7d6118
commit d8ae8db52796873a06b1f2d85646ce781c7d6118 Author: crazy <[EMAIL PROTECTED]> Date: Thu Jun 26 11:02:17 2008 +0200 wxgtk-2.8.8-1-x86_64 * Version bump diff --git a/source/xlib-extra/wxgtk/FrugalBuild b/source/xlib-extra/wxgtk/FrugalBuild index d40f230..f6717b0 100644 --- a/source/xlib-extra/wxgtk/FrugalBuild +++ b/source/xlib-extra/wxgtk/FrugalBuild @@ -3,15 +3,14 @@ # Contributor: Miklos Nemeth <[EMAIL PROTECTED]> pkgname=wxgtk -pkgver=2.8.7 -pkgrel=2 +pkgver=2.8.8 +pkgrel=1 pkgdesc="GTK+ implementation of wxWidgets API for GUI'" _F_sourceforge_dirname="wxwindows" _F_sourceforge_name="wxGTK" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.wxwidgets.org/"; -source=($source race-fix.patch) # TODO: gst* depends=('libdrm' 'sdl' 'gtk+2' 'libgl' 'freetype2' 'libxcb' 'glib2') groups=('xlib-extra') @@ -20,6 +19,7 @@ options=('scriptlet') replaces=('wxgtk-devel') conflicts=('wxgtk-devel') VER="2.8" +sha1sums=('ba33ca7efad2847c538d3df524d31b8b4011ad8a') subpkgs=("$pkgname-locale" "$pkgname-u8") subdescs=('Locale files for wxWidgets' "GTK+ implementation of wxWidgets API for GUI (unicode).") @@ -84,6 +84,4 @@ build() Fsplit $pkgname-locale usr/share/locale } -sha1sums=('07247cce8f6602ab532666b766c15bf3c7cdea3f' \ - '0d98de48b4f4f5fa06c33fc1c2aa2b3f9a775417') # optimization OK diff --git a/source/xlib-extra/wxgtk/race-fix.patch b/source/xlib-extra/wxgtk/race-fix.patch deleted file mode 100644 index c58f395..0000000 --- a/source/xlib-extra/wxgtk/race-fix.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- wxWidgets/src/gtk/app.cpp 2008/03/13 02:56:21 52464 -+++ wxWidgets/src/gtk/app.cpp 2008/03/13 04:37:03 52465 -@@ -174,59 +174,63 @@ - if (!wxTheApp) - return false; - -- bool moreIdles = false; -- -+ guint idleID_save; -+ { -+ // Allow another idle source to be added while this one is busy. -+ // Needed if an idle event handler runs a new event loop, -+ // for example by showing a dialog. -+#if wxUSE_THREADS -+ wxMutexLocker lock(gs_idleTagsMutex); -+#endif -+ idleID_save = wxTheApp->m_idleTag; -+ wxTheApp->m_idleTag = 0; -+ g_isIdle = true; -+ wxAddEmissionHook(); -+ } - #ifdef __WXDEBUG__ - // don't generate the idle events while the assert modal dialog is shown, - // this matches the behavior of wxMSW -- if (!wxTheApp->IsInAssert()) -+ if (wxTheApp->IsInAssert()) -+ return false; - #endif // __WXDEBUG__ -- { -- guint idleID_save; -- { -- // Allow another idle source to be added while this one is busy. -- // Needed if an idle event handler runs a new event loop, -- // for example by showing a dialog. --#if wxUSE_THREADS -- wxMutexLocker lock(gs_idleTagsMutex); --#endif -- idleID_save = wxTheApp->m_idleTag; -- wxTheApp->m_idleTag = 0; -- g_isIdle = true; -- wxAddEmissionHook(); -- } - -- // When getting called from GDK's time-out handler -- // we are no longer within GDK's grab on the GUI -- // thread so we must lock it here ourselves. -- gdk_threads_enter(); -- -- // Send idle event to all who request them as long as -- // no events have popped up in the event queue. -- do { -- moreIdles = wxTheApp->ProcessIdle(); -- } while (moreIdles && gtk_events_pending() == 0); -+ // When getting called from GDK's time-out handler -+ // we are no longer within GDK's grab on the GUI -+ // thread so we must lock it here ourselves. -+ gdk_threads_enter(); - -- // Release lock again -- gdk_threads_leave(); -- -- { -- // If another idle source was added, remove it -+ // Send idle event to all who request them as long as -+ // no events have popped up in the event queue. -+ bool moreIdles; -+ do { -+ moreIdles = wxTheApp->ProcessIdle(); -+ } while (moreIdles && gtk_events_pending() == 0); -+ -+ // Release lock again -+ gdk_threads_leave(); -+ - #if wxUSE_THREADS -- wxMutexLocker lock(gs_idleTagsMutex); -+ wxMutexLocker lock(gs_idleTagsMutex); - #endif -- if (wxTheApp->m_idleTag != 0) -- g_source_remove(wxTheApp->m_idleTag); -- wxTheApp->m_idleTag = idleID_save; -- g_isIdle = false; -- } -- } -+ // If another idle source was added, remove it -+ if (wxTheApp->m_idleTag != 0) -+ g_source_remove(wxTheApp->m_idleTag); -+ wxTheApp->m_idleTag = idleID_save; -+ g_isIdle = false; - -- if (!moreIdles) -- { - #if wxUSE_THREADS -- wxMutexLocker lock(gs_idleTagsMutex); -+ if (wxPendingEventsLocker) -+ wxPendingEventsLocker->Enter(); - #endif -+ // Pending events can be added asynchronously, -+ // need to keep idle source if any have appeared -+ moreIdles = moreIdles || (wxPendingEvents && !wxPendingEvents->IsEmpty()); -+#if wxUSE_THREADS -+ if (wxPendingEventsLocker) -+ wxPendingEventsLocker->Leave(); -+#endif -+ if (!moreIdles) -+ { - // Indicate that we are now in idle mode and event handlers - // will have to reinstall the idle handler again. - g_isIdle = true; - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
