Package: koffice
Version: 1:1.3.5-4
Severity: normal
Tags: patch
When building 'koffice' on unstable,
I get the following error:
/usr/share/qt3/bin/moc ../../../lib/kotext/koAutoFormatDia.h -o
koAutoFormatDia.moc
if /bin/sh ../../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H
-I. -I../../../lib/kotext -I../.. -I../../../lib/kofficecore
-I../../lib/kofficecore -I../../../lib/kofficeui -I../../lib/kofficeui
-I../../../lib/kospell -I../../lib/kospell -I/usr/include/kde
-I/usr/share/qt3/include -I. -DQT_THREAD_SUPPORT -D_REENTRANT
-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500
-D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W
-Wpointer-arith -Wwrite-strings -DNDEBUG -DNO_DEBUG -O2 -Wformat-security
-Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common
-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT
-DQT_NO_TRANSLATION -fexceptions -MT koAutoFormatDia.lo -MD -MP -MF
".deps/koAutoFormatDia.Tpo" \
-c -o koAutoFormatDia.lo `test -f '../../../lib/kotext/koAutoFormatDia.cc' ||
echo '../../../lib/kotext/'`../../../lib/kotext/koAutoFormatDia.cc; \
then mv -f ".deps/koAutoFormatDia.Tpo" ".deps/koAutoFormatDia.Plo"; \
else rm -f ".deps/koAutoFormatDia.Tpo"; exit 1; \
fi
../../../lib/kotext/koAutoFormatDia.h:117: error: ISO C++ forbids declaration
of 'QComboBox' with no type
With the attached patch 'koffice' can be compiled on unstable using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/koffice-1.3.5/filters/karbon/ai/aiparserbase.h
./filters/karbon/ai/aiparserbase.h
--- ../tmp-orig/koffice-1.3.5/filters/karbon/ai/aiparserbase.h 2002-10-29
20:22:19.000000000 +0000
+++ ./filters/karbon/ai/aiparserbase.h 2005-09-09 17:27:57.000000000 +0000
@@ -44,8 +44,8 @@
class ModuleHandlerBase;
class EmbeddedHandlerBase;
class TextHandlerBase;
-class Ai88Handler;
-class Ai3Handler;
+class AI88Handler;
+class AI3Handler;
/**
[EMAIL PROTECTED] Dirk Schönberger
diff -urN
../tmp-orig/koffice-1.3.5/filters/kword/mswrite/structures_generated.cpp
./filters/kword/mswrite/structures_generated.cpp
--- ../tmp-orig/koffice-1.3.5/filters/kword/mswrite/structures_generated.cpp
2003-08-20 10:39:36.000000000 +0000
+++ ./filters/kword/mswrite/structures_generated.cpp 2005-09-09
15:10:40.000000000 +0000
@@ -93,7 +93,7 @@
if (!Verify (Error::InvalidFormat, m_magic2 == 0xAB00, DWord
(m_magic2))) return false;
for (int i = 0; i < 4; i++)
{
- if (!Verify (Error::InvalidFormat, m_zero2 [i] == 0,
DWord (m_zero2))) return false;
+ if (!Verify (Error::InvalidFormat, m_zero2 [i] == 0,
long (m_zero2))) return false;
}
if (!Verify (Error::InvalidFormat, m_numCharBytesPlus128 >=
128, DWord (m_numCharBytesPlus128))) return false;
// m_pageParaInfo will not be checked
@@ -104,7 +104,7 @@
// m_pageFontTable will not be checked
for (int i = 0; i < 33; i++)
{
- if (!Verify (Error::Warn, m_zero3 [i] == 0, DWord
(m_zero3))) return false;
+ if (!Verify (Error::Warn, m_zero3 [i] == 0, long
(m_zero3))) return false;
}
if (!Verify (Error::InvalidFormat, m_numPages > 0, DWord
(m_numPages))) return false;
return true;
@@ -1243,7 +1243,7 @@
// m_lineSpacing will not be checked
for (int i = 0; i < 2; i++)
{
- if (!Verify (Error::Warn, m_zero [i] == 0, DWord
(m_zero))) return false;
+ if (!Verify (Error::Warn, m_zero [i] == 0, long
(m_zero))) return false;
}
// m_headerOrFooter will not be checked
// m_isNotNormalParagraph will not be checked
@@ -1252,7 +1252,7 @@
if (!Verify (Error::Warn, m_zero2 == 0, DWord (m_zero2)))
return false;
for (int i = 0; i < 5; i++)
{
- if (!Verify (Error::Warn, m_zero3 [i] == 0, DWord
(m_zero3))) return false;
+ if (!Verify (Error::Warn, m_zero3 [i] == 0, long
(m_zero3))) return false;
}
for (int i = 0; i < 14; i++)
{
@@ -1493,7 +1493,7 @@
// m_totalBytes will not be checked
for (int i = 0; i < 2; i++)
{
- if (!Verify (Error::Warn, m_zero [i] == 0, DWord
(m_zero))) return false;
+ if (!Verify (Error::Warn, m_zero [i] == 0, long
(m_zero))) return false;
}
// m_actualImageOffset will not be checked
return true;
diff -urN ../tmp-orig/koffice-1.3.5/filters/olefilters/winword97/msword.cc
./filters/olefilters/winword97/msword.cc
--- ../tmp-orig/koffice-1.3.5/filters/olefilters/winword97/msword.cc
2003-08-20 10:43:02.000000000 +0000
+++ ./filters/olefilters/winword97/msword.cc 2005-09-09 15:10:42.000000000
+0000
@@ -1613,7 +1613,7 @@
// The grupx reader code has to know about the alignment of the STD. We
// choose to store this in a convenient field.
- out->fScratch = ((int)in & 1);
+ out->fScratch = ((long)in & 1);
// If the baseInFile is less than 10, then the style name is not stored in
unicode!
diff -urN ../tmp-orig/koffice-1.3.5/filters/olefilters/winword97/properties.cc
./filters/olefilters/winword97/properties.cc
--- ../tmp-orig/koffice-1.3.5/filters/olefilters/winword97/properties.cc
2002-06-23 07:24:44.000000000 +0000
+++ ./filters/olefilters/winword97/properties.cc 2005-09-09
15:10:42.000000000 +0000
@@ -1089,7 +1089,7 @@
// Align to an even-byte offset *within* the STD. The alignment
// of the STD was stored in fScratch.
- if (((int)grpprl & 1) ^ style.fScratch)
+ if (((long)grpprl & 1) ^ style.fScratch)
grpprl++;
grpprl += MsWordGenerated::read(grpprl, &cbUpx);
if (cbUpx)
@@ -1112,7 +1112,7 @@
// Align to an even-byte offset *within* the STD. The alignment
// of the STD was stored in fScratch.
- if (((int)grpprl & 1) ^ style.fScratch)
+ if (((long)grpprl & 1) ^ style.fScratch)
grpprl++;
grpprl += MsWordGenerated::read(grpprl, &cbUpx);
if (cbUpx)
diff -urN ../tmp-orig/koffice-1.3.5/kword/kwformulaframe.h
./kword/kwformulaframe.h
--- ../tmp-orig/koffice-1.3.5/kword/kwformulaframe.h 2003-03-15
13:46:30.000000000 +0000
+++ ./kword/kwformulaframe.h 2005-09-09 16:57:02.000000000 +0000
@@ -28,6 +28,8 @@
class View;
}
+class KWFormulaFrameSetEdit;
+
/******************************************************************/
/* Class: KWFormulaFrameSet */
/******************************************************************/
diff -urN ../tmp-orig/koffice-1.3.5/kword/kwframe.h ./kword/kwframe.h
--- ../tmp-orig/koffice-1.3.5/kword/kwframe.h 2004-02-03 17:13:47.000000000
+0000
+++ ./kword/kwframe.h 2005-09-09 17:13:03.000000000 +0000
@@ -56,6 +56,7 @@
class KWFramePartMoveCommand;
class KWordFrameSetIface;
class DCOPObject;
+class KoTextDocument;
/**
diff -urN ../tmp-orig/koffice-1.3.5/kword/kwtablestylemanager.h
./kword/kwtablestylemanager.h
--- ../tmp-orig/koffice-1.3.5/kword/kwtablestylemanager.h 2003-08-20
10:55:14.000000000 +0000
+++ ./kword/kwtablestylemanager.h 2005-09-09 17:14:54.000000000 +0000
@@ -38,6 +38,7 @@
class KWDocument;
class KWStyle;
+class KoTextDocument;
/******************************************************************/
/* Class: KWTableStylePreview */
diff -urN ../tmp-orig/koffice-1.3.5/lib/kformula/kformuladocument.h
./lib/kformula/kformuladocument.h
--- ../tmp-orig/koffice-1.3.5/lib/kformula/kformuladocument.h 2003-03-15
17:25:23.000000000 +0000
+++ ./lib/kformula/kformuladocument.h 2005-09-09 15:54:53.000000000 +0000
@@ -40,6 +40,7 @@
class ContextStyle;
class SymbolAction;
class SymbolTable;
+class DocumentWrapper;
/**
diff -urN ../tmp-orig/koffice-1.3.5/lib/kotext/koAutoFormatDia.h
./lib/kotext/koAutoFormatDia.h
--- ../tmp-orig/koffice-1.3.5/lib/kotext/koAutoFormatDia.h 2002-11-08
16:36:18.000000000 +0000
+++ ./lib/kotext/koAutoFormatDia.h 2005-09-09 15:15:22.000000000 +0000
@@ -25,6 +25,7 @@
#include <qlineedit.h>
#include <koAutoFormat.h>
+class QComboBox;
class QPushButton;
class QCheckBox;
class QVBox;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
