diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-15 10:41:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-15 10:41:42 -0400 |
| commit | a29b83c1244f3934511421fd9e772badb57c3727 (patch) | |
| tree | cb4f0066082d0af17640738e4e90ae0e58eba27a | |
| parent | 89738cc3c230cfad84dd38bfa1477b40146010a2 (diff) | |
fix namespace issue with demangle on systems without execinfo.h
| -rw-r--r-- | libs/pbd/stacktrace.cc | 2 | ||||
| -rwxr-xr-x | tools/linux_packaging/build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index 021c9b7c04..b89ebcc8a9 100644 --- a/libs/pbd/stacktrace.cc +++ b/libs/pbd/stacktrace.cc @@ -97,7 +97,7 @@ PBD::stacktrace (std::ostream& out, int levels) #else std::string -PBD::demangle (std::string const & l) +demangle (std::string const & l) { return string(); } diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index d24aec4f8e..37d2dfe403 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -304,7 +304,7 @@ fi cp -R $GTKSTACK_ROOT/etc/* $Etc echo "Copying all Pango modules ..." -cp -R $GTKSTACK_ROOT/lib/pango/1.6.0/modules/*.so $Modules +cp -R $GTKSTACK_ROOT/lib/pango/1.8.0/modules/*.so $Modules echo "Copying all GDK Pixbuf loaders ..." cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Loaders @@ -314,7 +314,7 @@ cat > pangorc <<EOF [Pango] ModulesPath=$GTKSTACK_ROOT/lib/pango/1.6.0/modules EOF -env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/?@ROOTDIR@/?" > $Etc/pango.modules.in +env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.8.0/?@ROOTDIR@/?" > $Etc/pango.modules.in rm pangorc # Ditto for gdk-pixbuf loaders |