[Plplot-cvs] SF.net SVN: plplot: [8095] trunk/debian

[<and...@us...>]

Revision: 8095
          http://plplot.svn.sourceforge.net/plplot/?rev=8095&view=rev
Author:   andrewross
Date:     2007-12-13 01:29:53 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
Add patch from SVN to fix C++ includes for the examples. Enables building with gcc 4.3. 
Closes #456040.

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/patches/00list

Added Paths:
-----------
    trunk/debian/patches/08_fix_cxx_includes.dpatch

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-13 09:28:06 UTC (rev 8094)
+++ trunk/debian/changelog	2007-12-13 09:29:53 UTC (rev 8095)
@@ -1,3 +1,11 @@
+plplot (5.8.0-5) UNRELEASED; urgency=low
+
+  * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for 
+    the c++ examples. This patch should ensure the examples build with gcc 4.3. 
+    (closes: #456040)
+
+ -- Andrew Ross <and...@us...>  Thu, 13 Dec 2007 09:24:51 +0000
+
 plplot (5.8.0-4) unstable; urgency=low
 
   * debian/rules: rewrite the rules so the documentation is only built for

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-12-13 09:28:06 UTC (rev 8094)
+++ trunk/debian/patches/00list	2007-12-13 09:29:53 UTC (rev 8095)
@@ -4,3 +4,4 @@
 05_octave_documentation
 06_build_dir_use_physical_path
 07_octave_prune_examples
+08_fix_cxx_includes

Added: trunk/debian/patches/08_fix_cxx_includes.dpatch
===================================================================
--- trunk/debian/patches/08_fix_cxx_includes.dpatch	                        (rev 0)
+++ trunk/debian/patches/08_fix_cxx_includes.dpatch	2007-12-13 09:29:53 UTC (rev 8095)
@@ -0,0 +1,37 @@
+! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_cxx_includes.dpatch by Andrew Ross <and...@us...urceforge.n
+et>
+##
+## DP: Add in missing include files for C++ examples to fix compile errors
+## DP: with gcc 4.3. (This patch was taken from the upstream SVN repository.)
+
+@DPATCH@
+
+--- examples/c++/plc++demos.h	(revision 8091)
++++ examples/c++/plc++demos.h	(working copy)
+@@ -8,7 +8,14 @@
+ 
+ /* common includes */
+ #include "plstream.h"
++
++/* plplot actually includes the C versions of these 2, but
++ * add here for completeness */
++#include <cstdio>
++#include <cstdlib>
++
+ #include <iostream>
++#include <cstring>
+ #include <cmath>
+ 
+ /* common defines */
+--- examples/c++/x21.cc	(revision 8092)
++++ examples/c++/x21.cc	(working copy)
+@@ -27,7 +27,7 @@
+ //---------------------------------------------------------------------------//
+ 
+ #include "plc++demos.h"
+-#include <time.h>
++#include <ctime>
+ 
+ #if !defined(HAVE_ISNAN)
+   #define isnan(x) ((x) != (x))


Property changes on: trunk/debian/patches/08_fix_cxx_includes.dpatch
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.