aboutsummaryrefslogtreecommitdiff
path: root/editors/koffice-kde4/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/koffice-kde4/files')
-rw-r--r--editors/koffice-kde4/files/patch-configure11
-rw-r--r--editors/koffice-kde4/files/patch-kspread_kspread_cell.cc11
-rw-r--r--editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff15
-rw-r--r--editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff41
4 files changed, 0 insertions, 78 deletions
diff --git a/editors/koffice-kde4/files/patch-configure b/editors/koffice-kde4/files/patch-configure
deleted file mode 100644
index 5147ed156f26..000000000000
--- a/editors/koffice-kde4/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Sat Oct 30 03:46:09 2004
-+++ configure Sat Oct 30 03:46:54 2004
-@@ -26335,7 +26335,7 @@
- PTHREAD_LIBS="$PTHREAD_LIBS_save"
- fi
-
-- if test -z "$LIBPTHREAD"; then
-+ if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
diff --git a/editors/koffice-kde4/files/patch-kspread_kspread_cell.cc b/editors/koffice-kde4/files/patch-kspread_kspread_cell.cc
deleted file mode 100644
index 4a02dc363cfa..000000000000
--- a/editors/koffice-kde4/files/patch-kspread_kspread_cell.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- kspread/kspread_cell.cc.orig Sun Feb 20 23:27:56 2005
-+++ kspread/kspread_cell.cc Sun Feb 20 23:29:21 2005
-@@ -2882,7 +2882,7 @@
- x = indent + cellRect.x() + m_dTextX;
- else
- x = indent + cellRect.x() + m_dTextX
-- - ( fm.descent() + fm.ascent() ) * sin( angle * M_PI / 180 );
-+ - doc->unzoomItX(( fm.descent() + fm.ascent() ) * sin( angle * M_PI / 180 ));
- double y;
- if ( angle > 0 )
- y = cellRect.y() + m_dTextY;
diff --git a/editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff b/editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff
deleted file mode 100644
index 4635b7562fac..000000000000
--- a/editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:35:33 -0000 1.6
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 20 Jan 2005 17:36:38 -0000 1.8
-@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
- } else {
- keyLength = 5;
- }
-+ if (keyLength < 1) {
-+ keyLength = 1;
-+ }
-+ if (keyLength > 16) {
-+ keyLength = 16;
-+ }
- permFlags = permissions.getInt();
- if (encVersion >= 1 && encVersion <= 2 &&
- encRevision >= 2 && encRevision <= 3) {
diff --git a/editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff b/editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff
deleted file mode 100644
index 929a3ba2964c..000000000000
--- a/editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -u -b -p -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/Gfx.cc 25 Jan 2003 23:17:44 -0000 1.3
-+++ filters/kword/pdf/xpdf/xpdf/Gfx.cc 22 Dec 2004 12:07:12 -0000 1.3.2.1
-@@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s
- haveMask = gFalse;
- dict->lookup("Mask", &maskObj);
- if (maskObj.isArray()) {
-- for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+ for (i = 0;
-+ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+ ++i) {
- maskObj.arrayGet(i, &obj1);
- maskColors[i] = obj1.getInt();
- obj1.free();
-diff -u -b -p -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/GfxState.cc 25 Jan 2003 23:17:44 -0000 1.3
-+++ filters/kword/pdf/xpdf/xpdf/GfxState.cc 22 Dec 2004 12:07:12 -0000 1.3.2.1
-@@ -682,6 +682,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
- }
- nCompsA = obj2.getInt();
- obj2.free();
-+ if (nCompsA > gfxColorMaxComps) {
-+ error(-1, "ICCBased color space with too many (%d > %d) components",
-+ nCompsA, gfxColorMaxComps);
-+ nCompsA = gfxColorMaxComps;
-+ }
- if (dict->lookup("Alternate", &obj2)->isNull() ||
- !(altA = GfxColorSpace::parse(&obj2))) {
- switch (nCompsA) {
-@@ -1023,6 +1028,11 @@ GfxColorSpace *GfxDeviceNColorSpace::par
- goto err2;
- }
- nCompsA = obj1.arrayGetLength();
-+ if (nCompsA > gfxColorMaxComps) {
-+ error(-1, "DeviceN color space with too many (%d > %d) components",
-+ nCompsA, gfxColorMaxComps);
-+ nCompsA = gfxColorMaxComps;
-+ }
- for (i = 0; i < nCompsA; ++i) {
- if (!obj1.arrayGet(i, &obj2)->isName()) {
- error(-1, "Bad DeviceN color space (names)");