office/pdfedit: Patched for gcc 4.7

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
dsomero 2012-09-25 18:50:55 -04:00
parent 1e14cdb1c3
commit ab89e742f0
2 changed files with 40 additions and 1 deletions

View file

@ -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);
+
//

View file

@ -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" \