Update to KDE 3.5.6 / KOffice 1.6.2

3 files changed, 30 insertions, 74 deletions

diff --git a/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh b/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh
new file mode 100644
index 000000000000..1fb0916c33a0
--- /dev/null
+++ b/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh
@@ -0,0 +1,15 @@
+--- kexi/examples/build_kexi_file.sh.orig	Mon Mar  5 01:50:05 2007
++++ kexi/examples/build_kexi_file.sh	Mon Mar  5 01:50:31 2007
+@@ -7,9 +7,9 @@
+ # Only .kexi file that is older than .sql file is recreated.
+ # ksqlite is needed on the $PATH.
+ 
+-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
+-PATH=$PATH:$KEXISQL3PATH
+-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
++export PATH=$PATH:$KEXISQL3PATH
++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
+ which ksqlite > /dev/null || exit 1
+ 
+ [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1
diff --git a/editors/calligra/files/patch-kexi_examples-update_sql_files.sh b/editors/calligra/files/patch-kexi_examples-update_sql_files.sh
new file mode 100644
index 000000000000..1c869369a21e
--- /dev/null
+++ b/editors/calligra/files/patch-kexi_examples-update_sql_files.sh
@@ -0,0 +1,15 @@
+--- kexi/examples/update_sql_files.sh.orig	Sun Mar  4 13:49:03 2007
++++ kexi/examples/update_sql_files.sh	Sun Mar  4 13:49:14 2007
+@@ -4,9 +4,9 @@
+ # Only .sql file that is older than .kexi file is recreated.
+ # ksqlite is needed on the PATH
+ 
+-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
+-PATH=$PATH:$KEXISQL3PATH
+-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/
++export PATH=$PATH:$KEXISQL3PATH
++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH
+ which ksqlite > /dev/null || exit 1
+ 
+ for f in `ls -1 *.kexi` ; do
diff --git a/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff b/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff
deleted file mode 100644
index f5e51a1c706e..000000000000
--- a/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-------------------------------------------------------------------------
-r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines
-Changed paths:
-   M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc
-   M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h
-
-Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue.
-
-------------------------------------------------------------------------
-Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc
-===================================================================
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc	(revision 622462)
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc	(revision 622463)
-@@ -24,6 +24,12 @@
- #include "Link.h"
- #include "Catalog.h"
- 
-+// This define is used to limit the depth of recursive readPageTree calls
-+// This is needed because the page tree nodes can reference their parents
-+// leaving us in an infinite loop
-+// Most sane pdf documents don't have a call depth higher than 10
-+#define MAX_CALL_DEPTH 1000
-+
- //------------------------------------------------------------------------
- // Catalog
- //------------------------------------------------------------------------
-@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) {
-     pageRefs[i].num = -1;
-     pageRefs[i].gen = -1;
-   }
--  numPages = readPageTree(pagesDict.getDict(), NULL, 0);
-+  numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0);
-   if (numPages != numPages0) {
-     error(-1, "Page count in top-level pages object is incorrect");
-   }
-@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() {
-   return s;
- }
- 
--int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) {
-+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) {
-   Object kids;
-   Object kid;
-   Object kidRef;
-@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic
-     // This should really be isDict("Pages"), but I've seen at least one
-     // PDF file where the /Type entry is missing.
-     } else if (kid.isDict()) {
--      if ((start = readPageTree(kid.getDict(), attrs1, start))
--	  < 0)
--	goto err2;
-+      if (callDepth > MAX_CALL_DEPTH) {
-+        error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH);
-+      } else {
-+        if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1))
-+	    < 0)
-+	  goto err2;
-+      }
-     } else {
-       error(-1, "Kid object (page %d) is wrong type (%s)",
- 	    start+1, kid.getTypeName());
-Index: filters/kword/pdf/xpdf/xpdf/Catalog.h
-===================================================================
---- filters/kword/pdf/xpdf/xpdf/Catalog.h	(revision 622462)
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.h	(revision 622463)
-@@ -82,7 +82,7 @@ private:
-   Object outline;		// outline dictionary
-   GBool ok;			// true if catalog is valid
- 
--  int readPageTree(Dict *pages, PageAttrs *attrs, int start);
-+  int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth);
-   Object *findDestInTree(Object *tree, GString *name, Object *obj);
- };
-