OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

45 lines
1.7 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../log4cpp/gcc43.patch
  5. # Copyright (C) 2010 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Description: Fix to build with gcc >= 4.3
  17. http://log4cpp.cvs.sourceforge.net/viewvc/log4cpp/log4cpp/src/BasicLayout.cpp?r1=1.15&r2=1.16
  18. http://log4cpp.cvs.sourceforge.net/viewvc/log4cpp/log4cpp/src/PatternLayout.cpp?r1=1.27&r2=1.28
  19. diff -ruN log4cpp-1.0-orig/src/BasicLayout.cpp log4cpp-1.0/src/BasicLayout.cpp
  20. --- log4cpp-1.0-orig/src/BasicLayout.cpp 2006-09-30 08:03:20.000000000 +0200
  21. +++ log4cpp-1.0/src/BasicLayout.cpp 2010-08-16 12:52:23.544259365 +0200
  22. @@ -11,6 +11,8 @@
  23. #include <log4cpp/BasicLayout.hh>
  24. #include <log4cpp/Priority.hh>
  25. #include <log4cpp/FactoryParams.hh>
  26. +#include <memory>
  27. +
  28. #ifdef LOG4CPP_HAVE_SSTREAM
  29. #include <sstream>
  30. #endif
  31. diff -ruN log4cpp-1.0-orig/src/PatternLayout.cpp log4cpp-1.0/src/PatternLayout.cpp
  32. --- log4cpp-1.0-orig/src/PatternLayout.cpp 2007-08-28 09:54:12.000000000 +0200
  33. +++ log4cpp-1.0/src/PatternLayout.cpp 2010-08-16 12:51:33.856086575 +0200
  34. @@ -23,7 +23,7 @@
  35. #include <iomanip>
  36. #include <ctime>
  37. -#include <cmath>
  38. +#include <cstdlib>
  39. #include "Localtime.hh"
  40. #ifdef LOG4CPP_HAVE_INT64_T