summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch31
-rw-r--r--kde-base/kicker/files/kicker-visibility.diff58
-rw-r--r--kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch31
3 files changed, 0 insertions, 120 deletions
diff --git a/kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch b/kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch
deleted file mode 100644
index bd14ca666cd6..000000000000
--- a/kde-base/kdegraphics/files/CAN-2005-0064_kde-3.4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- kpdf/xpdf/xpdf/Decrypt.cc.jn 2002-12-06 00:44:32.000000000 +0100
-+++ kpdf/xpdf/xpdf/Decrypt.cc 2005-01-14 13:38:48.192647128 +0100
-@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi
- Guchar *buf;
- Guchar test[32];
- Guchar fState[256];
-- Guchar tmpKey[16];
-+ Guchar *tmpKey;
- Guchar fx, fy;
- int len, i, j;
- GBool ok;
-
-+ // check whether we have non-zero keyLength
-+ if ( !keyLength ) {
-+ return gFalse;
-+ }
-+
- // generate file key
- buf = (Guchar *)gmalloc(68 + fileID->getLength());
-+ tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
- if (userPassword) {
- len = userPassword->getLength();
- if (len < 32) {
-@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi
- ok = gFalse;
- }
-
-+ gfree(tmpKey);
- gfree(buf);
- return ok;
- }
diff --git a/kde-base/kicker/files/kicker-visibility.diff b/kde-base/kicker/files/kicker-visibility.diff
deleted file mode 100644
index 8f295409f19d..000000000000
--- a/kde-base/kicker/files/kicker-visibility.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: global.h
-===================================================================
-RCS file: /home/kde/kdebase/kicker/share/global.h,v
-retrieving revision 1.29
-retrieving revision 1.30
-diff -u -p -r1.29 -r1.30
---- kicker/share/global.h 4 Feb 2005 14:56:46 -0000 1.29
-+++ kicker/share/global.h 4 Feb 2005 15:23:59 -0000 1.30
-@@ -33,26 +33,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE
- namespace KickerLib
- {
-
--KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
--KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
--KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
--int sizeValue(KPanelExtension::Size s);
--QString copyDesktopFile(const KURL&url);
--QString newDesktopFile(const KURL&url);
-+KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d);
-+KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d);
-+KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p);
-+KDE_EXPORT int sizeValue(KPanelExtension::Size s);
-+KDE_EXPORT QString copyDesktopFile(const KURL&url);
-+KDE_EXPORT QString newDesktopFile(const KURL&url);
-
- /**
- * Calculate the appropriate position for a popup menu based on the
- * direction, the size of the menu, the widget geometry, and a optional
- * point in the local coordinates of the widget.
- */
--QPoint popupPosition(KPanelApplet::Direction d,
-+KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d,
- const QWidget* popup,
- const QWidget* source);
--QPoint popupPosition(KPanelApplet::Direction d,
-+KDE_EXPORT QPoint popupPosition(KPanelApplet::Direction d,
- const QWidget* popup,
- const QWidget* source,
- const QPoint& p);
--void colorize(QImage& image);
-+KDE_EXPORT void colorize(QImage& image);
-
- }
-
-Index: kickerSettings.kcfgc
-===================================================================
-RCS file: /home/kde/kdebase/kicker/share/kickerSettings.kcfgc,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -p -r1.2 -r1.3
---- kicker/share/kickerSettings.kcfgc 3 Feb 2005 09:22:01 -0000 1.2
-+++ kicker/share/kickerSettings.kcfgc 4 Feb 2005 15:23:59 -0000 1.3
-@@ -2,4 +2,5 @@ File=kickerSettings.kcfg
- Singleton=true
- ClassName=KickerSettings
- Mutators=true
-+Visibility=KDE_EXPORT
- IncludeFiles=qapplication.h
diff --git a/kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch b/kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch
deleted file mode 100644
index bd14ca666cd6..000000000000
--- a/kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- kpdf/xpdf/xpdf/Decrypt.cc.jn 2002-12-06 00:44:32.000000000 +0100
-+++ kpdf/xpdf/xpdf/Decrypt.cc 2005-01-14 13:38:48.192647128 +0100
-@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi
- Guchar *buf;
- Guchar test[32];
- Guchar fState[256];
-- Guchar tmpKey[16];
-+ Guchar *tmpKey;
- Guchar fx, fy;
- int len, i, j;
- GBool ok;
-
-+ // check whether we have non-zero keyLength
-+ if ( !keyLength ) {
-+ return gFalse;
-+ }
-+
- // generate file key
- buf = (Guchar *)gmalloc(68 + fileID->getLength());
-+ tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
- if (userPassword) {
- len = userPassword->getLength();
- if (len < 32) {
-@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi
- ok = gFalse;
- }
-
-+ gfree(tmpKey);
- gfree(buf);
- return ok;
- }