Package: gnudatalanguage
Version: 0.9.1-1
Followup-For: Bug #647802
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Debian sid, the attached patch can be applied to achieve the following:
* Add use_std_namespace patch to resolve FTBFS. Backported upstream
r1.27 src/gdlgstream.cpp, r1.28 src/gdlgstream.hpp,
r1.46 src/devicex.hpp, r1.17 src/devicez.hpp, r1.17 src/deviceps.hpp,
r1.6 src/devicesvg.hpp. (Closes: #647802)
Note that the source package does not FTBFS due to a configure error (which
was unreproducible locally in a current sid amd64 sbuild) but due to namespace
ambiguities that are fixed upstream already. Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one
--- gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one 2011-02-15 16:46:12.000000000 -0500
+++ gnudatalanguage-0.9.1/debian/patches/build-with-debian-antlr-instead-embedded-one 2011-11-07 15:46:02.000000000 -0500
@@ -2,11 +2,11 @@
embedded copy in src/antlr. Patch by Axel Beckert <a...@debian.org>,
15-Feb-2011
-Index: gnudatalanguage/configure
+Index: gnudatalanguage-0.9.1/configure
===================================================================
---- gnudatalanguage.orig/configure 2011-02-15 22:26:31.000000000 +0100
-+++ gnudatalanguage/configure 2011-02-15 22:37:02.635803162 +0100
-@@ -17709,7 +17709,7 @@
+--- gnudatalanguage-0.9.1.orig/configure 2011-11-07 15:45:55.000000000 -0500
++++ gnudatalanguage-0.9.1/configure 2011-11-07 15:45:59.000000000 -0500
+@@ -17952,7 +17952,7 @@
@@ -15,7 +15,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -18800,7 +18800,6 @@
+@@ -19043,7 +19043,6 @@
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -23,10 +23,10 @@
"src/pro/Makefile") CONFIG_FILES="$CONFIG_FILES src/pro/Makefile" ;;
"src/pro/dicom/Makefile") CONFIG_FILES="$CONFIG_FILES src/pro/dicom/Makefile" ;;
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
-Index: gnudatalanguage/src/Makefile.in
+Index: gnudatalanguage-0.9.1/src/Makefile.in
===================================================================
---- gnudatalanguage.orig/src/Makefile.in 2010-08-25 15:57:07.000000000 +0200
-+++ gnudatalanguage/src/Makefile.in 2011-02-15 22:37:02.635803162 +0100
+--- gnudatalanguage-0.9.1.orig/src/Makefile.in 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/Makefile.in 2011-11-07 15:45:59.000000000 -0500
@@ -71,8 +71,7 @@
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
@@ -47,7 +47,7 @@
gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
$(gdl_LDFLAGS) $(LDFLAGS) -o $@
-@@ -454,7 +452,7 @@
+@@ -463,7 +461,7 @@
# set the include path found by configure
INCLUDES = $(EXT_INCLUDES) $(all_includes)
@@ -56,7 +56,7 @@
noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
-@@ -504,7 +502,7 @@
+@@ -513,7 +511,7 @@
@BUILDASLIBRARY_FALSE@gdl_CXXFLAGS = $(AM_CXXFLAGS)
# the library search path.
@BUILDASLIBRARY_FALSE@gdl_LDFLAGS = $(all_libraries)
@@ -65,7 +65,7 @@
# build as library (for python module)
@BUILDASLIBRARY_TRUE@lib_LTLIBRARIES = libgdl.la
-@@ -514,7 +512,7 @@
+@@ -523,7 +521,7 @@
# netCDF and HDF define some same symbols
# hence -z muldefs has to be passed to the linker
@BUILDASLIBRARY_TRUE@@DARWIN_TRUE@libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
@@ -74,8 +74,10 @@
all: all-recursive
.SUFFIXES:
---- gnudatalanguage-0.9.orig/src/getfmtast.hpp
-+++ gnudatalanguage-0.9/src/getfmtast.hpp
+Index: gnudatalanguage-0.9.1/src/getfmtast.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/getfmtast.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/getfmtast.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -22,7 +22,7 @@
#include "basegdl.hpp"
@@ -85,8 +87,10 @@
extern antlr::ASTFactory FMTNodeFactory;
---- gnudatalanguage-0.9.orig/src/getfmtast.cpp
-+++ gnudatalanguage-0.9/src/getfmtast.cpp
+Index: gnudatalanguage-0.9.1/src/getfmtast.cpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/getfmtast.cpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/getfmtast.cpp 2011-11-07 15:45:59.000000000 -0500
@@ -27,7 +27,7 @@
#include "FMTLexer.hpp"
#include "FMTParser.hpp"
@@ -96,9 +100,11 @@
using namespace std;
---- gnudatalanguage-0.9.orig/src/gdlc.g
-+++ gnudatalanguage-0.9/src/gdlc.g
-@@ -34,12 +34,12 @@ header {
+Index: gnudatalanguage-0.9.1/src/gdlc.g
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/gdlc.g 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/gdlc.g 2011-11-07 15:45:59.000000000 -0500
+@@ -34,12 +34,12 @@
#include "objects.hpp"
#include "initsysvar.hpp"
@@ -116,8 +122,10 @@
//#include "dinterpreter.hpp"
---- gnudatalanguage-0.9.orig/src/dpro.hpp
-+++ gnudatalanguage-0.9/src/dpro.hpp
+Index: gnudatalanguage-0.9.1/src/dpro.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/dpro.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/dpro.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -30,7 +30,7 @@
#include "prognode.hpp"
#include "str.hpp"
@@ -127,8 +135,10 @@
template<typename T> class Is_eq: public std::unary_function<T,bool>
{
---- gnudatalanguage-0.9.orig/src/print_tree.hpp
-+++ gnudatalanguage-0.9/src/print_tree.hpp
+Index: gnudatalanguage-0.9.1/src/print_tree.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/print_tree.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/print_tree.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -15,8 +15,8 @@
#include "typedefs.hpp"
#include "prognode.hpp"
@@ -140,8 +150,10 @@
namespace antlr {
---- gnudatalanguage-0.9.orig/src/gdlexception.hpp
-+++ gnudatalanguage-0.9/src/gdlexception.hpp
+Index: gnudatalanguage-0.9.1/src/gdlexception.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/gdlexception.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/gdlexception.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -23,7 +23,7 @@
#include "prognode.hpp"
@@ -151,8 +163,10 @@
//using namespace std;
---- gnudatalanguage-0.9.orig/src/dnode.hpp
-+++ gnudatalanguage-0.9/src/dnode.hpp
+Index: gnudatalanguage-0.9.1/src/dnode.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/dnode.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/dnode.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -26,7 +26,7 @@
#include "GDLTokenTypes.hpp"
@@ -162,8 +176,10 @@
//ANTLR_USING_NAMESPACE(std)
//ANTLR_USING_NAMESPACE(antlr)
---- gnudatalanguage-0.9.orig/src/FMTParser.hpp
-+++ gnudatalanguage-0.9/src/FMTParser.hpp
+Index: gnudatalanguage-0.9.1/src/FMTParser.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/FMTParser.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/FMTParser.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -17,7 +17,7 @@
#include "CFMTLexer.hpp"
@@ -173,8 +189,10 @@
//using namespace antlr;
---- gnudatalanguage-0.9.orig/src/dnodefactory.hpp
-+++ gnudatalanguage-0.9/src/dnodefactory.hpp
+Index: gnudatalanguage-0.9.1/src/dnodefactory.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/dnodefactory.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/dnodefactory.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -21,7 +21,7 @@
#include "dnode.hpp"
@@ -184,8 +202,10 @@
//ANTLR_USING_NAMESPACE(std)
//ANTLR_USING_NAMESPACE(antlr)
---- gnudatalanguage-0.9.orig/src/GDLLexer.hpp
-+++ gnudatalanguage-0.9/src/GDLLexer.hpp
+Index: gnudatalanguage-0.9.1/src/GDLLexer.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/GDLLexer.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/GDLLexer.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -18,12 +18,12 @@
#include "objects.hpp"
#include "initsysvar.hpp"
@@ -204,8 +224,10 @@
//#include "dinterpreter.hpp"
---- gnudatalanguage-0.9.orig/src/CFMTLexer.cpp
-+++ gnudatalanguage-0.9/src/CFMTLexer.cpp
+Index: gnudatalanguage-0.9.1/src/CFMTLexer.cpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/CFMTLexer.cpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/CFMTLexer.cpp 2011-11-07 15:45:59.000000000 -0500
@@ -1,6 +1,7 @@
/* $ANTLR 2.7.7 (20091222): "cformat.g" -> "CFMTLexer.cpp"$ */
@@ -214,8 +236,10 @@
#include "CFMTLexer.hpp"
#include <antlr/CharBuffer.hpp>
---- gnudatalanguage-0.9.orig/src/cformat.g
-+++ gnudatalanguage-0.9/src/cformat.g
+Index: gnudatalanguage-0.9.1/src/cformat.g
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/cformat.g 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/cformat.g 2011-11-07 15:45:59.000000000 -0500
@@ -17,10 +17,11 @@
header "pre_include_cpp" {
@@ -229,8 +253,10 @@
// using namespace antlr;
}
---- gnudatalanguage-0.9.orig/src/FMTLexer.hpp
-+++ gnudatalanguage-0.9/src/FMTLexer.hpp
+Index: gnudatalanguage-0.9.1/src/FMTLexer.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/FMTLexer.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/FMTLexer.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -17,7 +17,7 @@
#include "CFMTLexer.hpp"
@@ -240,8 +266,10 @@
//using namespace antlr;
---- gnudatalanguage-0.9.orig/src/CFMTLexer.hpp
-+++ gnudatalanguage-0.9/src/CFMTLexer.hpp
+Index: gnudatalanguage-0.9.1/src/CFMTLexer.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/CFMTLexer.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/CFMTLexer.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -9,7 +9,7 @@
#include "CFMTTokenTypes.hpp"
#include <antlr/CharScanner.hpp>
@@ -251,8 +279,10 @@
// using namespace antlr;
---- gnudatalanguage-0.9.orig/src/fmtnode.hpp
-+++ gnudatalanguage-0.9/src/fmtnode.hpp
+Index: gnudatalanguage-0.9.1/src/fmtnode.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/fmtnode.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/fmtnode.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -22,7 +22,7 @@
#include "FMTTokenTypes.hpp"
@@ -262,8 +292,10 @@
//ANTLR_USING_NAMESPACE(std)
//ANTLR_USING_NAMESPACE(antlr)
---- gnudatalanguage-0.9.orig/src/Makefile.am
-+++ gnudatalanguage-0.9/src/Makefile.am
+Index: gnudatalanguage-0.9.1/src/Makefile.am
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/Makefile.am 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/Makefile.am 2011-11-07 15:45:59.000000000 -0500
@@ -1,6 +1,6 @@
# set the include path found by configure
INCLUDES = $(EXT_INCLUDES) $(all_includes)
@@ -272,7 +304,7 @@
noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
-@@ -57,7 +57,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
+@@ -57,7 +57,7 @@
gdl_CXXFLAGS = $(AM_CXXFLAGS)
# the library search path.
gdl_LDFLAGS = $(all_libraries)
@@ -281,7 +313,7 @@
endif
# build as library (for python module)
-@@ -73,6 +73,6 @@ else
+@@ -73,6 +73,6 @@
libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
endif
@@ -289,8 +321,10 @@
+libgdl_la_LIBADD = /usr/lib/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
endif
---- gnudatalanguage-0.9.orig/src/GDLParser.hpp
-+++ gnudatalanguage-0.9/src/GDLParser.hpp
+Index: gnudatalanguage-0.9.1/src/GDLParser.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/GDLParser.hpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/GDLParser.hpp 2011-11-07 15:45:59.000000000 -0500
@@ -18,12 +18,12 @@
#include "objects.hpp"
#include "initsysvar.hpp"
@@ -309,8 +343,10 @@
//#include "dinterpreter.hpp"
---- gnudatalanguage-0.9.orig/src/dnode.cpp
-+++ gnudatalanguage-0.9/src/dnode.cpp
+Index: gnudatalanguage-0.9.1/src/dnode.cpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/dnode.cpp 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/dnode.cpp 2011-11-07 15:45:59.000000000 -0500
@@ -20,8 +20,8 @@
#include <string>
#include <limits>
@@ -322,9 +358,11 @@
#include "dnode.hpp"
#include "datatypes.hpp"
---- gnudatalanguage-0.9.orig/src/format.g
-+++ gnudatalanguage-0.9/src/format.g
-@@ -28,7 +28,7 @@ header {
+Index: gnudatalanguage-0.9.1/src/format.g
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/format.g 2011-11-07 15:45:46.000000000 -0500
++++ gnudatalanguage-0.9.1/src/format.g 2011-11-07 15:45:59.000000000 -0500
+@@ -28,7 +28,7 @@
#include "CFMTLexer.hpp"
@@ -333,9 +371,11 @@
//using namespace antlr;
}
---- gnudatalanguage-0.9.orig/configure.in
-+++ gnudatalanguage-0.9/configure.in
-@@ -1074,7 +1074,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
+Index: gnudatalanguage-0.9.1/configure.in
+===================================================================
+--- gnudatalanguage-0.9.1.orig/configure.in 2011-11-07 15:45:55.000000000 -0500
++++ gnudatalanguage-0.9.1/configure.in 2011-11-07 15:45:59.000000000 -0500
+@@ -1077,7 +1077,7 @@
dnl perform program name transformation
dnl AC_ARG_PROGRAM
diff -Nru gnudatalanguage-0.9.1/debian/patches/fix-muldefs gnudatalanguage-0.9.1/debian/patches/fix-muldefs
--- gnudatalanguage-0.9.1/debian/patches/fix-muldefs 2011-03-31 17:42:53.000000000 -0400
+++ gnudatalanguage-0.9.1/debian/patches/fix-muldefs 2011-11-07 15:45:57.000000000 -0500
@@ -1,11 +1,11 @@
Patch configure.in to pass linker flags properly to compiler to fix
FTBFS on some architectures. (Closes: #545849)
-Index: gnudatalanguage-0.9/configure
+Index: gnudatalanguage-0.9.1/configure
===================================================================
---- gnudatalanguage-0.9.orig/configure 2011-03-09 00:41:25.000000000 +0000
-+++ gnudatalanguage-0.9/configure 2011-03-09 00:43:14.000000000 +0000
-@@ -17617,7 +17617,7 @@
+--- gnudatalanguage-0.9.1.orig/configure 2011-11-07 15:45:52.000000000 -0500
++++ gnudatalanguage-0.9.1/configure 2011-11-07 15:45:55.000000000 -0500
+@@ -17860,7 +17860,7 @@
;;
*linux*)
@@ -14,11 +14,11 @@
;;
*solaris* )
-Index: gnudatalanguage-0.9/configure.in
+Index: gnudatalanguage-0.9.1/configure.in
===================================================================
---- gnudatalanguage-0.9.orig/configure.in 2011-03-09 00:41:25.000000000 +0000
-+++ gnudatalanguage-0.9/configure.in 2011-03-09 00:42:41.000000000 +0000
-@@ -958,7 +958,7 @@
+--- gnudatalanguage-0.9.1.orig/configure.in 2011-11-07 15:45:47.000000000 -0500
++++ gnudatalanguage-0.9.1/configure.in 2011-11-07 15:45:55.000000000 -0500
+@@ -961,7 +961,7 @@
dnl LINKIMAGE support
dnl (-ltermcap was reported to solve problems with readline)
dnl LDFLAGS="$LDFLAGS -ltermcap -rdynamic -z muldefs"
diff -Nru gnudatalanguage-0.9.1/debian/patches/series gnudatalanguage-0.9.1/debian/patches/series
--- gnudatalanguage-0.9.1/debian/patches/series 2011-03-09 05:03:43.000000000 -0500
+++ gnudatalanguage-0.9.1/debian/patches/series 2011-11-07 00:46:29.000000000 -0500
@@ -1,3 +1,4 @@
autoreconf-result
fix-muldefs
build-with-debian-antlr-instead-embedded-one
+use_std_namespace
diff -Nru gnudatalanguage-0.9.1/debian/patches/use_std_namespace gnudatalanguage-0.9.1/debian/patches/use_std_namespace
--- gnudatalanguage-0.9.1/debian/patches/use_std_namespace 1969-12-31 19:00:00.000000000 -0500
+++ gnudatalanguage-0.9.1/debian/patches/use_std_namespace 2011-11-07 16:07:12.000000000 -0500
@@ -0,0 +1,180 @@
+Index: gnudatalanguage-0.9.1/src/gdlgstream.cpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/gdlgstream.cpp 2011-11-07 16:06:39.000000000 -0500
++++ gnudatalanguage-0.9.1/src/gdlgstream.cpp 2011-11-07 16:06:42.000000000 -0500
+@@ -201,7 +201,7 @@
+ // skip conversion if the string is empty
+ if (len == 0) return in;
+
+- const string fonts[] = {
++ const std::string fonts[] = {
+ "#fn", // !0 : unused
+ "#fn", // !1 : unused
+ "#fn", // !2 : unused
+@@ -240,7 +240,7 @@
+ int curr_lev = 0; // (incremented with #u, decremented with #d)
+ int curr_pos = 0; // (current position in string)
+ int save_pos = 0; // (position in string used in !S/!R save/restore)
+- string out = string("");
++ std::string out = std::string("");
+
+ for (size_t i = 0; i < len; i++) {
+ if (in[i] == '!' && in[i + 1] != '!')
+Index: gnudatalanguage-0.9.1/src/gdlgstream.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/gdlgstream.hpp 2011-11-07 16:06:39.000000000 -0500
++++ gnudatalanguage-0.9.1/src/gdlgstream.hpp 2011-11-07 16:06:42.000000000 -0500
+@@ -50,7 +50,7 @@
+ {
+ // std::cerr << "GDLGStream()" << std::endl;
+ if (!checkPlplotDriver(driver))
+- ThrowGDLException(string("PLplot installation lacks the requested driver: ") + driver);
++ ThrowGDLException(std::string("PLplot installation lacks the requested driver: ") + driver);
+ }
+
+ virtual ~GDLGStream()
+@@ -103,7 +103,7 @@
+
+ // devNames = new std::vector<std::string>( numdevs_plus_one - 1);
+ for( int i = 0; i < numdevs_plus_one - 1; ++i)
+- devNames.push_back(string(devnames[ i]));
++ devNames.push_back(std::string(devnames[ i]));
+
+ free(devnames);
+ }
+@@ -111,7 +111,7 @@
+ // for debug
+ std::vector<std::string> devnamesDbg = devNames;
+
+-return std::find( devNames.begin(), devNames.end(), string( driver)) != devNames.end();
++return std::find( devNames.begin(), devNames.end(), std::string( driver)) != devNames.end();
+
+ // checking if a given driver is in the list
+ // bool supported = false;
+Index: gnudatalanguage-0.9.1/src/deviceps.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/deviceps.hpp 2011-11-07 16:06:39.000000000 -0500
++++ gnudatalanguage-0.9.1/src/deviceps.hpp 2011-11-07 16:06:42.000000000 -0500
+@@ -22,6 +22,12 @@
+ #include "gdlpsstream.hpp"
+ #include "initsysvar.hpp"
+
++#ifdef HAVE_OLDPLPLOT
++#define SETOPT SetOpt
++#else
++#define SETOPT setopt
++#endif
++
+ class DevicePS: public Graphics
+ {
+ std::string fileName;
+@@ -60,14 +66,14 @@
+ if (XPageSize != 0. && YPageSize == 0.) {a=XPageSize/16.5*540/720; scale=1.;}
+ char as[32];
+ sprintf(as, "%f",a);
+- actStream->SetOpt( "a", as); // this necessary to keep labels from looking stretched (plplot bug)
++ actStream->SETOPT( "a", as); // this necessary to keep labels from looking stretched (plplot bug)
+ // but plrender -a is also buggy: aspect ratios are not exactly correct
+ xleng=static_cast<PLINT>(floor(scale*540. +0.5));
+ yleng=static_cast<PLINT>(floor(scale*720. +0.5));
+ // setting this without plrender -a makes the labels stretched (plplot bug)
+ actStream->spage( xp, yp, xleng, yleng, xoff, yoff);
+
+- actStream->SetOpt( "ori","1"); // portrait (upright)
++ actStream->SETOPT( "ori","1"); // portrait (upright)
+
+ // no pause on destruction
+ actStream->spause( false);
+@@ -84,8 +90,8 @@
+
+ // default: black+white (IDL behaviour)
+ //actStream->scolor( color); // has no effect
+- if (color == 0) { actStream->SetOpt( "drvopt","text=0,color=0"); }
+- else { actStream->SetOpt( "drvopt","text=0,color=1");}
++ if (color == 0) { actStream->SETOPT( "drvopt","text=0,color=0"); }
++ else { actStream->SETOPT( "drvopt","text=0,color=1");}
+ color=0;
+
+ actStream->Init();
+Index: gnudatalanguage-0.9.1/src/devicex.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/devicex.hpp 2011-11-07 16:06:39.000000000 -0500
++++ gnudatalanguage-0.9.1/src/devicex.hpp 2011-11-07 16:06:42.000000000 -0500
+@@ -38,6 +38,12 @@
+ if (a != NULL) { free((void *) a); a = NULL; }
+ #endif
+
++#ifdef HAVE_OLDPLPLOT
++#define SETOPT SetOpt
++#else
++#define SETOPT setopt
++#endif
++
+ const int maxWin=32;
+
+ class DeviceX: public Graphics
+@@ -431,10 +437,10 @@
+ static char buf[ 256];
+ strncpy( buf, title.c_str(), 255);
+ buf[ 255] = 0;
+- winList[ wIx]->SetOpt( "plwindow", buf);
++ winList[ wIx]->SETOPT( "plwindow", buf);
+
+ // we use our own window handling
+- winList[ wIx]->SetOpt( "drvopt","usepth=0");
++ winList[ wIx]->SETOPT( "drvopt","usepth=0");
+
+ // set color map
+ PLINT r[ctSize], g[ctSize], b[ctSize];
+Index: gnudatalanguage-0.9.1/src/devicez.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/devicez.hpp 2011-11-07 16:06:39.000000000 -0500
++++ gnudatalanguage-0.9.1/src/devicez.hpp 2011-11-07 16:06:42.000000000 -0500
+@@ -21,6 +21,12 @@
+ //#include "dstructgdl.hpp"
+ #include "gdlzstream.hpp"
+
++#ifdef HAVE_OLDPLPLOT
++#define SETOPT SetOpt
++#else
++#define SETOPT setopt
++#endif
++
+ class DeviceZ: public Graphics
+ {
+ GDLZStream* actStream;
+@@ -129,7 +135,7 @@
+ { r[ i] = g[ i] = b[ i] = i;}
+ actStream->scmap1( r, g, b, ctSize);
+
+- actStream->SetOpt( "drvopt","text=0"); // clear drvopt
++ actStream->SETOPT( "drvopt","text=0"); // clear drvopt
+
+ actStream->Init();
+
+Index: gnudatalanguage-0.9.1/src/devicesvg.hpp
+===================================================================
+--- gnudatalanguage-0.9.1.orig/src/devicesvg.hpp 2011-11-07 16:07:09.000000000 -0500
++++ gnudatalanguage-0.9.1/src/devicesvg.hpp 2011-11-07 16:07:07.000000000 -0500
+@@ -20,6 +20,12 @@
+
+ #include "gdlsvgstream.hpp"
+
++#ifdef HAVE_OLDPLPLOT
++#define SETOPT SetOpt
++#else
++#define SETOPT setopt
++#endif
++
+ class DeviceSVG : public Graphics
+ {
+ std::string fileName;
+@@ -55,7 +61,7 @@
+ // actStream->scmap0( r, g, b, ctSize);
+ actStream->scmap1( r, g, b, ctSize);
+
+- actStream->SetOpt( "drvopt","text_clipping=1"); // clear drvopt
++ actStream->SETOPT( "drvopt","text_clipping=1"); // clear drvopt
+
+ actStream->Init();
+
