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

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-03-11 12:40:34 +0000 (Tue, 11 Mar 2008)
New Revision: 564

Added:
   trunk/debian/patches/10-fix-fox-resource-export.dpatch
Modified:
   trunk/debian/patches/00list
Log:
new patch, 10-fix-fox-resource-export, to fix wrong FoxResource export file


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-03-11 09:51:45 UTC (rev 563)
+++ trunk/debian/patches/00list	2008-03-11 12:40:34 UTC (rev 564)
@@ -5,6 +5,7 @@
 05-autoconf-fox
 07-autoconf-fix-gperf
 08-fix-perl-shebang
+10-fix-fox-resource-export
 15-fix-fltk-include
 34-bts386713
 50-prepatch-dummy-mark

Added: trunk/debian/patches/10-fix-fox-resource-export.dpatch
===================================================================
--- trunk/debian/patches/10-fix-fox-resource-export.dpatch	                        (rev 0)
+++ trunk/debian/patches/10-fix-fox-resource-export.dpatch	2008-03-11 12:40:34 UTC (rev 564)
@@ -0,0 +1,106 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix-fox-resource-export.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: regenerate the FoxResource export macro
+
+ at DPATCH@
+--- ACE_wrappers.orig/TAO/tao/FoxResource/TAO_FoxResource_Export.h
++++ ACE_wrappers/TAO/tao/FoxResource/TAO_FoxResource_Export.h
+@@ -1,58 +1,58 @@
+ 
+ // -*- C++ -*-
+-// $Id: TAO_FoxResource_Export.h 78087 2007-04-18 10:20:49Z johnnyw $
++// $Id$
+ // Definition for Win32 Export directives.
+-// This file is generated automatically by generate_export_file.pl -s TAO_TkResource
++// This file is generated automatically by generate_export_file.pl -s TAO_FoxResource
+ // ------------------------------
+-#ifndef TAO_TKRESOURCE_EXPORT_H
+-#define TAO_TKRESOURCE_EXPORT_H
++#ifndef TAO_FOXRESOURCE_EXPORT_H
++#define TAO_FOXRESOURCE_EXPORT_H
+ 
+ #include "ace/config-all.h"
+ 
+-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_TKRESOURCE_HAS_DLL)
+-#  define TAO_TKRESOURCE_HAS_DLL 0
+-#endif /* ACE_AS_STATIC_LIBS && TAO_TKRESOURCE_HAS_DLL */
+-
+-#if !defined (TAO_TKRESOURCE_HAS_DLL)
+-#  define TAO_TKRESOURCE_HAS_DLL 1
+-#endif /* ! TAO_TKRESOURCE_HAS_DLL */
+-
+-#if defined (TAO_TKRESOURCE_HAS_DLL) && (TAO_TKRESOURCE_HAS_DLL == 1)
+-#  if defined (TAO_TKRESOURCE_BUILD_DLL)
+-#    define TAO_TkResource_Export ACE_Proper_Export_Flag
+-#    define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+-#    define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+-#  else /* TAO_TKRESOURCE_BUILD_DLL */
+-#    define TAO_TkResource_Export ACE_Proper_Import_Flag
+-#    define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+-#    define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+-#  endif /* TAO_TKRESOURCE_BUILD_DLL */
+-#else /* TAO_TKRESOURCE_HAS_DLL == 1 */
+-#  define TAO_TkResource_Export
+-#  define TAO_TKRESOURCE_SINGLETON_DECLARATION(T)
+-#  define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+-#endif /* TAO_TKRESOURCE_HAS_DLL == 1 */
++#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_FOXRESOURCE_HAS_DLL)
++#  define TAO_FOXRESOURCE_HAS_DLL 0
++#endif /* ACE_AS_STATIC_LIBS && TAO_FOXRESOURCE_HAS_DLL */
++
++#if !defined (TAO_FOXRESOURCE_HAS_DLL)
++#  define TAO_FOXRESOURCE_HAS_DLL 1
++#endif /* ! TAO_FOXRESOURCE_HAS_DLL */
++
++#if defined (TAO_FOXRESOURCE_HAS_DLL) && (TAO_FOXRESOURCE_HAS_DLL == 1)
++#  if defined (TAO_FOXRESOURCE_BUILD_DLL)
++#    define TAO_FoxResource_Export ACE_Proper_Export_Flag
++#    define TAO_FOXRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
++#    define TAO_FOXRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
++#  else /* TAO_FOXRESOURCE_BUILD_DLL */
++#    define TAO_FoxResource_Export ACE_Proper_Import_Flag
++#    define TAO_FOXRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
++#    define TAO_FOXRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
++#  endif /* TAO_FOXRESOURCE_BUILD_DLL */
++#else /* TAO_FOXRESOURCE_HAS_DLL == 1 */
++#  define TAO_FoxResource_Export
++#  define TAO_FOXRESOURCE_SINGLETON_DECLARATION(T)
++#  define TAO_FOXRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
++#endif /* TAO_FOXRESOURCE_HAS_DLL == 1 */
+ 
+-// Set TAO_TKRESOURCE_NTRACE = 0 to turn on library specific tracing even if
++// Set TAO_FOXRESOURCE_NTRACE = 0 to turn on library specific tracing even if
+ // tracing is turned off for ACE.
+-#if !defined (TAO_TKRESOURCE_NTRACE)
++#if !defined (TAO_FOXRESOURCE_NTRACE)
+ #  if (ACE_NTRACE == 1)
+-#    define TAO_TKRESOURCE_NTRACE 1
++#    define TAO_FOXRESOURCE_NTRACE 1
+ #  else /* (ACE_NTRACE == 1) */
+-#    define TAO_TKRESOURCE_NTRACE 0
++#    define TAO_FOXRESOURCE_NTRACE 0
+ #  endif /* (ACE_NTRACE == 1) */
+-#endif /* !TAO_TKRESOURCE_NTRACE */
++#endif /* !TAO_FOXRESOURCE_NTRACE */
+ 
+-#if (TAO_TKRESOURCE_NTRACE == 1)
+-#  define TAO_TKRESOURCE_TRACE(X)
+-#else /* (TAO_TKRESOURCE_NTRACE == 1) */
++#if (TAO_FOXRESOURCE_NTRACE == 1)
++#  define TAO_FOXRESOURCE_TRACE(X)
++#else /* (TAO_FOXRESOURCE_NTRACE == 1) */
+ #  if !defined (ACE_HAS_TRACE)
+ #    define ACE_HAS_TRACE
+ #  endif /* ACE_HAS_TRACE */
+-#  define TAO_TKRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
++#  define TAO_FOXRESOURCE_TRACE(X) ACE_TRACE_IMPL(X)
+ #  include "ace/Trace.h"
+-#endif /* (TAO_TKRESOURCE_NTRACE == 1) */
++#endif /* (TAO_FOXRESOURCE_NTRACE == 1) */
+ 
+-#endif /* TAO_TKRESOURCE_EXPORT_H */
++#endif /* TAO_FOXRESOURCE_EXPORT_H */
+ 
+ // End of auto generated file.


Property changes on: trunk/debian/patches/10-fix-fox-resource-export.dpatch
___________________________________________________________________
Name: svn:executable
   + *