[Pkg-ace-commits] [pkg-ace] r566 - trunk/debian/patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-03-11 22:21:33 +0000 (Tue, 11 Mar 2008)
New Revision: 566

Added:
   trunk/debian/patches/12-fix-fox-include.dpatch
   trunk/debian/patches/13-fix-fox-errors.dpatch
Modified:
   trunk/debian/patches/00list
   trunk/debian/patches/10-fix-fox-resource-export.dpatch
Log:
last fixes for the FOX Toolkit


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-03-11 20:00:51 UTC (rev 565)
+++ trunk/debian/patches/00list	2008-03-11 22:21:33 UTC (rev 566)
@@ -7,6 +7,8 @@
 08-fix-perl-shebang
 10-fix-fox-resource-export
 11-fix-fox-reactor
+12-fix-fox-include
+13-fix-fox-errors
 15-fix-fltk-include
 34-bts386713
 50-prepatch-dummy-mark

Modified: trunk/debian/patches/10-fix-fox-resource-export.dpatch
===================================================================
--- trunk/debian/patches/10-fix-fox-resource-export.dpatch	2008-03-11 20:00:51 UTC (rev 565)
+++ trunk/debian/patches/10-fix-fox-resource-export.dpatch	2008-03-11 22:21:33 UTC (rev 566)
@@ -104,3 +104,13 @@
 +#endif /* TAO_FOXRESOURCE_EXPORT_H */
  
  // End of auto generated file.
+--- ACE_wrappers.orig/ace/FoxReactor/FoxReactor.h
++++ ACE_wrappers/ace/FoxReactor/FoxReactor.h
+@@ -19,6 +19,7 @@
+ #define ACE_FOXREACTOR_H
+ #include /**/ "ace/pre.h"
+ 
++#include "ace/FoxReactor/ACE_FoxReactor_export.h"
+ #include "ace/config-all.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)

Added: trunk/debian/patches/12-fix-fox-include.dpatch
===================================================================
--- trunk/debian/patches/12-fix-fox-include.dpatch	                        (rev 0)
+++ trunk/debian/patches/12-fix-fox-include.dpatch	2008-03-11 22:21:33 UTC (rev 566)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-fix-fox-include.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: drop fox/ prefix in include, it's correctly set by fox-config
+
+ at DPATCH@
+--- ACE_wrappers.orig/ace/FoxReactor/FoxReactor.h
++++ ACE_wrappers/ace/FoxReactor/FoxReactor.h
+@@ -27,7 +27,7 @@
+ 
+ #include "ace/Select_Reactor.h"
+ 
+-#include <fox/fx.h>
++#include <fx.h>
+ 
+ /**
+  * @class ACE_FoxReactor

Added: trunk/debian/patches/13-fix-fox-errors.dpatch
===================================================================
--- trunk/debian/patches/13-fix-fox-errors.dpatch	                        (rev 0)
+++ trunk/debian/patches/13-fix-fox-errors.dpatch	2008-03-11 22:21:33 UTC (rev 566)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-fix-fox-errors.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix FOX compilation bugs
+
+ at DPATCH@
+--- ACE_wrappers.orig/ace/FoxReactor/FoxReactor.cpp
++++ ACE_wrappers/ace/FoxReactor/FoxReactor.cpp
+@@ -248,9 +248,9 @@
+ 
+   if (max_wait_time != 0)
+     {
+-      float t = max_wait_time->sec () +
++      float t = max_wait_time->sec ()
+         max_wait_time->usec () / 1000000.0F;
+-      fxapp->addTimeout (this, 0, t*1000);
++      fxapp->addTimeout (t*1000, this, 0);
+     }
+ }
+ 
+--- ACE_wrappers.orig/TAO/tao/FoxResource/FoxResource_Loader.h
++++ ACE_wrappers/TAO/tao/FoxResource/FoxResource_Loader.h
+@@ -22,6 +22,8 @@
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
++#include <fx.h>
++
+ #include "tao/Versioned_Namespace.h"
+ 
+ TAO_BEGIN_VERSIONED_NAMESPACE_DECL