rev 11225 - trunk/packages/koffice/debian/patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-06-30 07:08:24 +0000 (Mon, 30 Jun 2008)
New Revision: 11225

Modified:
   trunk/packages/koffice/debian/patches/11_krita_menu.diff
   trunk/packages/koffice/debian/patches/32_xpdf2-CVE-2007-4352-5392-5393.diff
   trunk/packages/koffice/debian/patches/33_g++_arm.diff
Log:
sync patches


Modified: trunk/packages/koffice/debian/patches/11_krita_menu.diff
===================================================================
--- trunk/packages/koffice/debian/patches/11_krita_menu.diff	2008-06-29 23:25:07 UTC (rev 11224)
+++ trunk/packages/koffice/debian/patches/11_krita_menu.diff	2008-06-30 07:08:24 UTC (rev 11225)
@@ -1,6 +1,8 @@
---- kde.orig/krita/krita.desktop
-+++ kde.patched/krita/krita.desktop
-@@ -27,7 +27,7 @@
+Index: koffice-1.6.3/krita/krita.desktop
+===================================================================
+--- koffice-1.6.3.orig/krita/krita.desktop	2007-05-30 23:41:33.000000000 +0200
++++ koffice-1.6.3/krita/krita.desktop	2008-06-30 02:08:57.000000000 +0200
+@@ -82,7 +82,7 @@
  MimeType=application/x-krita
  Type=Application
  Icon=krita

Modified: trunk/packages/koffice/debian/patches/32_xpdf2-CVE-2007-4352-5392-5393.diff
===================================================================
--- trunk/packages/koffice/debian/patches/32_xpdf2-CVE-2007-4352-5392-5393.diff	2008-06-29 23:25:07 UTC (rev 11224)
+++ trunk/packages/koffice/debian/patches/32_xpdf2-CVE-2007-4352-5392-5393.diff	2008-06-30 07:08:24 UTC (rev 11225)
@@ -1,6 +1,8 @@
---- filters/kword/pdf/xpdf/xpdf/Stream.cc
-+++ filters/kword/pdf/xpdf/xpdf/Stream.cc
-@@ -1239,6 +1239,7 @@
+Index: filters/kword/pdf/xpdf/xpdf/Stream.cc
+===================================================================
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc.orig	2008-06-30 02:09:42.000000000 +0200
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc	2008-06-30 02:09:55.000000000 +0200
+@@ -1235,6 +1235,7 @@
  // CCITTFaxStream
  //------------------------------------------------------------------------
  
@@ -8,7 +10,7 @@
  CCITTFaxStream::CCITTFaxStream(Stream *strA, int encodingA, GBool endOfLineA,
  			       GBool byteAlignA, int columnsA, int rowsA,
  			       GBool endOfBlockA, GBool blackA):
-@@ -1748,6 +1749,609 @@
+@@ -1744,6 +1745,609 @@
    }
    return (inputBuf >> (inputBits - n)) & (0xffff >> (16 - n));
  }
@@ -618,7 +620,7 @@
  
  GString *CCITTFaxStream::getPSFilter(const char *indent) {
    GString *s;
-@@ -1929,6 +2533,12 @@
+@@ -1925,6 +2529,12 @@
      // allocate a buffer for the whole image
      bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
      bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
@@ -631,7 +633,7 @@
      for (i = 0; i < numComps; ++i) {
        frameBuf[i] = (int *)gmalloc(bufWidth * bufHeight * sizeof(int));
        memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
-@@ -2975,6 +3585,11 @@
+@@ -2971,6 +3581,11 @@
    }
    scanInfo.firstCoeff = str->getChar();
    scanInfo.lastCoeff = str->getChar();
@@ -643,8 +645,10 @@
    c = str->getChar();
    scanInfo.ah = (c >> 4) & 0x0f;
    scanInfo.al = c & 0x0f;
---- filters/kword/pdf/xpdf/xpdf/Stream.h
-+++ filters/kword/pdf/xpdf/xpdf/Stream.h
+Index: filters/kword/pdf/xpdf/xpdf/Stream.h
+===================================================================
+--- filters/kword/pdf/xpdf/xpdf/Stream.h.orig	2007-05-30 23:39:18.000000000 +0200
++++ filters/kword/pdf/xpdf/xpdf/Stream.h	2008-06-30 02:09:55.000000000 +0200
 @@ -513,13 +513,17 @@
    int row;			// current row
    int inputBuf;			// input buffer

Modified: trunk/packages/koffice/debian/patches/33_g++_arm.diff
===================================================================
--- trunk/packages/koffice/debian/patches/33_g++_arm.diff	2008-06-29 23:25:07 UTC (rev 11224)
+++ trunk/packages/koffice/debian/patches/33_g++_arm.diff	2008-06-30 07:08:24 UTC (rev 11225)
@@ -5,8 +5,10 @@
 
 Currently this concerns arm and armel.
 
---- koffice-1.6.3.orig/filters/kword/wordperfect/import/TextRunStyle.cxx
-+++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
+Index: koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx
+===================================================================
+--- koffice-1.6.3.orig/filters/kword/wordperfect/import/TextRunStyle.cxx	2007-05-30 23:39:02.000000000 +0200
++++ koffice-1.6.3/filters/kword/wordperfect/import/TextRunStyle.cxx	2008-06-30 02:10:05.000000000 +0200
 @@ -33,6 +33,8 @@
  #include "WriterProperties.hxx"
  #include "DocumentElement.hxx"
@@ -16,8 +18,10 @@
  #ifdef _MSC_VER
  #include <minmax.h>
  #endif
---- koffice-1.6.3.orig/filters/kword/wordperfect/import/TableStyle.cxx
-+++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
+Index: koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx
+===================================================================
+--- koffice-1.6.3.orig/filters/kword/wordperfect/import/TableStyle.cxx	2007-05-30 23:39:02.000000000 +0200
++++ koffice-1.6.3/filters/kword/wordperfect/import/TableStyle.cxx	2008-06-30 02:10:05.000000000 +0200
 @@ -27,6 +27,7 @@
  /* "This product is not manufactured, approved, or supported by 
   * Corel Corporation or Corel Corporation Limited."
@@ -26,8 +30,10 @@
  #include <math.h>
  #include "FilterInternal.hxx"
  #include "TableStyle.hxx"
---- koffice-1.6.3.orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
-+++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+Index: koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+===================================================================
+--- koffice-1.6.3.orig/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2007-05-30 23:35:49.000000000 +0200
++++ koffice-1.6.3/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp	2008-06-30 02:10:05.000000000 +0200
 @@ -27,6 +27,8 @@
  #include <klocale.h>
  #include <kdebug.h>
@@ -36,3 +42,4 @@
 +
  using namespace KexiDB;
  
+