diff -rupdN ace-5.6.3.orig/debian/patches/00list ace-5.6.3/debian/patches/00list --- ace-5.6.3.orig/debian/patches/00list 2009-04-09 11:53:40.000000000 +1000 +++ ace-5.6.3/debian/patches/00list 2009-04-09 11:59:54.000000000 +1000 @@ -1,6 +1,7 @@ 01-change-tao-sonames 02-fltk-no-gl 02-qt4 +02-qtreactor.dpatch 04-reduce-opt 05-autoconf-fox 06-fix-kokyu-mpc diff -rupdN ace-5.6.3.orig/debian/patches/02-qtreactor.dpatch ace-5.6.3/debian/patches/02-qtreactor.dpatch --- ace-5.6.3.orig/debian/patches/02-qtreactor.dpatch 1970-01-01 10:00:00.000000000 +1000 +++ ace-5.6.3/debian/patches/02-qtreactor.dpatch 2009-04-09 11:56:50.000000000 +1000 @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-qtreactor.dpatch by Matt Wlazlo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix write handler registration bug + +@DPATCH@ +--- ACE_wrappers/ace/QtReactor/QtReactor.h- 2007-06-26 13:54:04.000000000 +0000 ++++ ACE_wrappers/ace/QtReactor/QtReactor.h 2007-06-26 13:54:19.000000000 +0000 +@@ -31,8 +31,8 @@ + #if QT_VERSION >= 0x040000 + #include /**/ + #include /**/ +-#include /**/ +-#include /**/ ++#include /**/ ++#include /**/ + #else + #include /**/ + #include /**/ +--- /tmp/ACE_wrappers/ace/QtReactor/QtReactor.cpp 2008-09-16 19:35:44.000000000 +1000 ++++ ACE_wrappers/ace/QtReactor/QtReactor.cpp 2009-04-06 18:37:33.000000000 +1000 +@@ -271,22 +271,12 @@ + if ((result = ACE_Select_Reactor::bit_ops (handle, mask, handle_set, ops)) == -1) + return -1; + +- // disable or enable the notifiers based on handle_set and mask +- int enableFlag = -1; +- if (&handle_set == &this->suspend_set_) +- enableFlag = 0; +- else if (&handle_set == &this->wait_set_) +- enableFlag = 1; +- else +- // We have no work to do here, so just return +- return result; +- + switch (ops) + { + case ACE_Reactor::SET_MASK: + case ACE_Reactor::ADD_MASK: + // Enable or disable notifiers based on the specified masks +- if (this->set_enable_flag_by_mask (enableFlag, handle, mask) == -1) ++ if (this->set_enable_flag_by_mask (1, handle, mask) == -1) + { + // We can't just return -1 here because we'll have half-changed things. + // So, we need to restore the old handle_set, then return -1. +@@ -296,7 +286,7 @@ + break; + + case ACE_Reactor::CLR_MASK: +- if (this->set_enable_flag_by_mask (!enableFlag, handle, mask) == -1) ++ if (this->set_enable_flag_by_mask (0, handle, mask) == -1) + { + handle_set = preserved_handle_set; + return -1;