-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.
Cheers
Luk
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFDQbDi5UTeB5t8Mo0RAh5FAJ9sCnc1qM62knpb667ysWaacF5hFwCfXQWn
mbg21XlH2YcW2GUxGWTWgDs=
=3CD9
-----END PGP SIGNATURE-----
diff -u koffice-1.3.5/debian/changelog koffice-1.3.5/debian/changelog
--- koffice-1.3.5/debian/changelog
+++ koffice-1.3.5/debian/changelog
@@ -1,3 +1,12 @@
+koffice (1:1.3.5-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuilt for the Qt/KDE transition
+ (closes: #327977, #317208, #330532, #322163)
+ * Patch to fix compilation (closes: #327396, #287164)
+
+ -- Luk Claes <[EMAIL PROTECTED]> Mon, 3 Oct 2005 18:02:10 +0200
+
koffice (1:1.3.5-4) unstable; urgency=high
* Fixed kpresenter templates for screen presentations (closes: #305989).
only in patch2:
unchanged:
--- koffice-1.3.5.orig/lib/kformula/kformuladocument.h
+++ koffice-1.3.5/lib/kformula/kformuladocument.h
@@ -40,7 +40,7 @@
class ContextStyle;
class SymbolAction;
class SymbolTable;
-
+class DocumentWrapper;
/**
* small utility class representing a sortable (by x,y position) list
only in patch2:
unchanged:
--- koffice-1.3.5.orig/lib/kotext/koAutoFormatDia.h
+++ koffice-1.3.5/lib/kotext/koAutoFormatDia.h
@@ -25,6 +25,7 @@
#include <qlineedit.h>
#include <koAutoFormat.h>
+class QComboBox;
class QPushButton;
class QCheckBox;
class QVBox;
only in patch2:
unchanged:
--- koffice-1.3.5.orig/filters/olefilters/winword97/msword.cc
+++ koffice-1.3.5/filters/olefilters/winword97/msword.cc
@@ -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!
only in patch2:
unchanged:
--- koffice-1.3.5.orig/filters/olefilters/winword97/properties.cc
+++ koffice-1.3.5/filters/olefilters/winword97/properties.cc
@@ -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)
only in patch2:
unchanged:
--- koffice-1.3.5.orig/filters/karbon/ai/aiparserbase.h
+++ koffice-1.3.5/filters/karbon/ai/aiparserbase.h
@@ -44,8 +44,8 @@
class ModuleHandlerBase;
class EmbeddedHandlerBase;
class TextHandlerBase;
-class Ai88Handler;
-class Ai3Handler;
+class AI88Handler;
+class AI3Handler;
/**
[EMAIL PROTECTED] Dirk Schönberger
only in patch2:
unchanged:
--- koffice-1.3.5.orig/filters/kword/mswrite/structures_generated.cpp
+++ koffice-1.3.5/filters/kword/mswrite/structures_generated.cpp
@@ -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;
only in patch2:
unchanged:
--- koffice-1.3.5.orig/kword/kwframe.h
+++ koffice-1.3.5/kword/kwframe.h
@@ -56,7 +56,7 @@
class KWFramePartMoveCommand;
class KWordFrameSetIface;
class DCOPObject;
-
+class KoTextDocument;
/**
* small utility class representing a sortable (by z-order) list of frames
only in patch2:
unchanged:
--- koffice-1.3.5.orig/kword/kwtablestylemanager.h
+++ koffice-1.3.5/kword/kwtablestylemanager.h
@@ -38,6 +38,7 @@
class KWDocument;
class KWStyle;
+class KoTextDocument;
/******************************************************************/
/* Class: KWTableStylePreview */
only in patch2:
unchanged:
--- koffice-1.3.5.orig/kword/kwformulaframe.h
+++ koffice-1.3.5/kword/kwformulaframe.h
@@ -28,6 +28,8 @@
class View;
}
+class KWFormulaFrameSetEdit;
+
/******************************************************************/
/* Class: KWFormulaFrameSet */
/******************************************************************/
