diff options
| author | dsomero <xgizzmo@slackbuilds.org> | 2012-09-25 18:50:55 -0400 |
|---|---|---|
| committer | dsomero <xgizzmo@slackbuilds.org> | 2012-09-25 18:52:01 -0400 |
| commit | ab89e742f0435b9a22f2fb4c09246de7707514db (patch) | |
| tree | 2b864600cdb7ce8d35f67b423fa48fcb0fad43a9 /office | |
| parent | 1e14cdb1c3bb61ddf1f775c69011eb6782bce88e (diff) | |
office/pdfedit: Patched for gcc 4.7
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'office')
| -rw-r--r-- | office/pdfedit/gcc47.patch | 36 | ||||
| -rw-r--r-- | office/pdfedit/pdfedit.SlackBuild | 5 |
2 files changed, 40 insertions, 1 deletions
diff --git a/office/pdfedit/gcc47.patch b/office/pdfedit/gcc47.patch new file mode 100644 index 000000000000..10400bc07495 --- /dev/null +++ b/office/pdfedit/gcc47.patch @@ -0,0 +1,36 @@ +--- src/gui/rect2Darray.h.orig ++++ src/gui/rect2Darray.h +@@ -305,7 +305,7 @@ void RectArray<T>::myAppend ( const BBox + minY = std::min( minY, item->top() ); + maxY = std::max( maxY, item->bottom() ); + } +- append( item ); ++ this->append( item ); + } + + template <typename T> +@@ -461,7 +461,7 @@ void Rect2DArray<T>::myAppend( BBoxOfObj + if (toAppend) { + current = new RectArray<T>(); + current->myAppend( bbox ); +- append( current ); ++ this->append( current ); + } + } + +--- src/kernel/cobject2xpdf.cc 2009/09/11 12:02:56 1.22 ++++ src/kernel/cobject2xpdf.cc 2011/05/21 22:13:21 1.24 +@@ -727,6 +727,13 @@ + { + /*assert (!"operation not permitted...");*//*THIS IS FORBIDDEN IN THE CALLER*/ + } ++template void simpleValueFromXpdfObj<pBool, bool&> (const Object&, bool& val); ++template void simpleValueFromXpdfObj<pInt, int&> (const Object&, int& val); ++template void simpleValueFromXpdfObj<pReal, double&> (const Object&, double& val); ++template void simpleValueFromXpdfObj<pString, string&> (const Object&, string& val); ++template void simpleValueFromXpdfObj<pName, string&> (const Object&, string& val); ++template void simpleValueFromXpdfObj<pRef, IndiRef&> (const Object&, IndiRef& val); ++ + + + // diff --git a/office/pdfedit/pdfedit.SlackBuild b/office/pdfedit/pdfedit.SlackBuild index 091d9470cc3e..de6468cfb3d6 100644 --- a/office/pdfedit/pdfedit.SlackBuild +++ b/office/pdfedit/pdfedit.SlackBuild @@ -5,7 +5,7 @@ PRGNAM=pdfedit VERSION=0.4.5 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -50,6 +50,9 @@ chmod -R u+w,go+r-w,a-s . printf "/usr/share/xml/docbook/xsl-stylesheets-*/html\n" >> \ doc/tools/docbook_xslt_paths +# Patch for gcc 4.7. +patch -p0 -i $CWD/gcc47.patch + ARCH="" \ C_EXTRA="$SLKCFLAGS" \ CXX_EXTRA="$SLKCFLAGS" \ |