summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio Guidi <greg_g@gentoo.org>2005-04-05 12:22:07 +0000
committerGregorio Guidi <greg_g@gentoo.org>2005-04-05 12:22:07 +0000
commit81bd031a0e62167edea6145d2c961a19a7162c05 (patch)
tree61675636d84fde9f39e4d6d9be1965f063668248 /kde-base
parentCopyright Header change (diff)
downloadhistorical-81bd031a0e62167edea6145d2c961a19a7162c05.tar.gz
historical-81bd031a0e62167edea6145d2c961a19a7162c05.tar.bz2
historical-81bd031a0e62167edea6145d2c961a19a7162c05.zip
Remove old file.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdebase/files/kdebase-3.4.0_rc1-startkde-gentoo.patch51
-rw-r--r--kde-base/kdepim-kioslaves/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch89
-rw-r--r--kde-base/kdepim/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch89
-rw-r--r--kde-base/klaptopdaemon/files/acpi_helper.diff53
-rw-r--r--kde-base/kmtrace/files/liberty-link.diff11
-rw-r--r--kde-base/smoke/files/no_knotifywidgetbase.diff10
6 files changed, 0 insertions, 303 deletions
diff --git a/kde-base/kdebase/files/kdebase-3.4.0_rc1-startkde-gentoo.patch b/kde-base/kdebase/files/kdebase-3.4.0_rc1-startkde-gentoo.patch
deleted file mode 100644
index a0fada505e82..000000000000
--- a/kde-base/kdebase/files/kdebase-3.4.0_rc1-startkde-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
---- kdebase-3.4.0.orig/startkde 2005-02-23 12:24:24.000000000 +0100
-+++ kdebase-3.4.0/startkde 2005-02-26 21:53:58.587008144 +0100
-@@ -1,8 +1,46 @@
- #!/bin/sh
- #
--# DEFAULT KDE STARTUP SCRIPT ( KDE-3.4 )
-+# GENTOO CUSTOMIZED STARTUP SCRIPT ( KDE-3.4 )
- #
-
-+# Gentoo part:
-+export PATH="/usr/kde/3.4/bin:${PATH}"
-+
-+# handle ~/.kde* dirs - separate ones for separate KDEs
-+cd ${HOME}
-+if [ -e .kde ]; then
-+ if [ ! -L .kde ]; then
-+ mv -f .kde .kde.backup
-+ else
-+ rm -f .kde
-+ fi
-+fi
-+if [ ! -e .kde3.4 ]; then
-+ if [ -e .kde3.3 ]; then
-+ # migrate old config files
-+ cp -r .kde3.3 .kde3.4
-+ for file in share/apps/kdevdocumentation/search/htdig.conf \
-+ share/apps/kalarmd/clients \
-+ share/config/kdevdocumentationrc \
-+ share/config/katesyntaxhighlightingrc \
-+ share/config/ksysguardrc \
-+ share/config/kresources/calendar/stdrc \
-+ share/config/ksmserverrc \
-+ share/config/kcalrc; do
-+ if [ -e ".kde3.4/${file}" ]; then
-+ sed -i -e "s:$HOME/\.kde3\.3:$HOME/\.kde3\.4:g" \
-+ -e 's:$HOME/\.kde3\.3:$HOME/\.kde3\.4:g' \
-+ ".kde3.4/${file}"
-+ fi
-+ done
-+ else
-+ mkdir .kde3.4
-+ fi
-+fi
-+ln -sf .kde3.4 .kde
-+
-+# Gentoo part ends
-+
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
diff --git a/kde-base/kdepim-kioslaves/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch b/kde-base/kdepim-kioslaves/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch
deleted file mode 100644
index 59ea61bb4337..000000000000
--- a/kde-base/kdepim-kioslaves/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- kdepim-3.4.0/kioslaves/imap4/imap4.cc 2005-02-23 12:08:47.000000000 +0100
-+++ kdepim-3.4.0/kioslaves/imap4/imap4.cc 2005-02-27 00:39:39.231224880 +0100
-@@ -1220,9 +1220,9 @@
- void
- IMAP4Protocol::special (const QByteArray & aData)
- {
-+ kdDebug(7116) << "IMAP4Protocol::special" << endl;
- if (!makeLogin()) return;
-
-- kdDebug(7116) << "IMAP4Protocol::special" << endl;
- QDataStream stream(aData, IO_ReadOnly);
-
- int tmp;
-@@ -1249,6 +1249,12 @@
- {
- // NOOP
- imapCommand *cmd = doCommand(imapCommand::clientNoop());
-+ if (cmd->result () != "OK")
-+ {
-+ completeQueue.removeRef (cmd);
-+ error (ERR_CONNECTION_BROKEN, myHost);
-+ return;
-+ }
- completeQueue.removeRef (cmd);
- finished();
- break;
-@@ -1271,6 +1277,7 @@
- imapCommand *cmd = doCommand(imapCommand::clientUnsubscribe(aBox));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 "
- "failed. The server returned: %2")
- .arg(_url.prettyURL())
-@@ -1291,6 +1298,7 @@
- imapCommand *cmd = doCommand(imapCommand::clientSubscribe(aBox));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_SLAVE_DEFINED, i18n("Subscribe of folder %1 "
- "failed. The server returned: %2")
- .arg(_url.prettyURL())
-@@ -1340,6 +1348,7 @@
- "\\SEEN \\ANSWERED \\FLAGGED \\DRAFT"));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
- "failed.").arg(_url.prettyURL()));
- return;
-@@ -1351,6 +1360,7 @@
- clientStore (aSequence, "+FLAGS.SILENT", newFlags));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
- "failed.").arg(_url.prettyURL()));
- return;
-@@ -1632,10 +1642,9 @@
- void
- IMAP4Protocol::slave_status ()
- {
-- kdDebug(7116) << "IMAP4::slave_status" << endl;
--// KIO::TCPSlaveBase::slave_status();
-- slaveStatus (myHost, !(getState () == ISTATE_NO));
--// slaveStatus(QString::null,false);
-+ bool connected = (getState() != ISTATE_NO) && isConnectionValid();
-+ kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
-+ slaveStatus ( connected ? myHost : QString::null, connected );
- }
-
- void
-@@ -1838,6 +1847,7 @@
-
- kdDebug(7116) << "IMAP4::makeLogin - checking login" << endl;
- bool alreadyConnected = getState() == ISTATE_CONNECT;
-+ kdDebug(7116) << "IMAP4::makeLogin - alreadyConnected " << alreadyConnected << endl;
- if (alreadyConnected || connectToHost (myHost.latin1(), myPort))
- {
- // fcntl (m_iSock, F_SETFL, (fcntl (m_iSock, F_GETFL) | O_NDELAY));
-@@ -1982,6 +1992,8 @@
- }
- }
- completeQueue.removeRef (cmd);
-+ } else {
-+ kdDebug(7116) << "makeLogin - NO login" << endl;
- }
-
- return getState() == ISTATE_LOGIN;
diff --git a/kde-base/kdepim/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch b/kde-base/kdepim/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch
deleted file mode 100644
index 59ea61bb4337..000000000000
--- a/kde-base/kdepim/files/kdepim-3.4.0_rc1-dimap-cache-loss.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- kdepim-3.4.0/kioslaves/imap4/imap4.cc 2005-02-23 12:08:47.000000000 +0100
-+++ kdepim-3.4.0/kioslaves/imap4/imap4.cc 2005-02-27 00:39:39.231224880 +0100
-@@ -1220,9 +1220,9 @@
- void
- IMAP4Protocol::special (const QByteArray & aData)
- {
-+ kdDebug(7116) << "IMAP4Protocol::special" << endl;
- if (!makeLogin()) return;
-
-- kdDebug(7116) << "IMAP4Protocol::special" << endl;
- QDataStream stream(aData, IO_ReadOnly);
-
- int tmp;
-@@ -1249,6 +1249,12 @@
- {
- // NOOP
- imapCommand *cmd = doCommand(imapCommand::clientNoop());
-+ if (cmd->result () != "OK")
-+ {
-+ completeQueue.removeRef (cmd);
-+ error (ERR_CONNECTION_BROKEN, myHost);
-+ return;
-+ }
- completeQueue.removeRef (cmd);
- finished();
- break;
-@@ -1271,6 +1277,7 @@
- imapCommand *cmd = doCommand(imapCommand::clientUnsubscribe(aBox));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_SLAVE_DEFINED, i18n("Unsubscribe of folder %1 "
- "failed. The server returned: %2")
- .arg(_url.prettyURL())
-@@ -1291,6 +1298,7 @@
- imapCommand *cmd = doCommand(imapCommand::clientSubscribe(aBox));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_SLAVE_DEFINED, i18n("Subscribe of folder %1 "
- "failed. The server returned: %2")
- .arg(_url.prettyURL())
-@@ -1340,6 +1348,7 @@
- "\\SEEN \\ANSWERED \\FLAGGED \\DRAFT"));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
- "failed.").arg(_url.prettyURL()));
- return;
-@@ -1351,6 +1360,7 @@
- clientStore (aSequence, "+FLAGS.SILENT", newFlags));
- if (cmd->result () != "OK")
- {
-+ completeQueue.removeRef (cmd);
- error(ERR_COULD_NOT_WRITE, i18n("Changing the flags of message %1 "
- "failed.").arg(_url.prettyURL()));
- return;
-@@ -1632,10 +1642,9 @@
- void
- IMAP4Protocol::slave_status ()
- {
-- kdDebug(7116) << "IMAP4::slave_status" << endl;
--// KIO::TCPSlaveBase::slave_status();
-- slaveStatus (myHost, !(getState () == ISTATE_NO));
--// slaveStatus(QString::null,false);
-+ bool connected = (getState() != ISTATE_NO) && isConnectionValid();
-+ kdDebug(7116) << "IMAP4::slave_status " << connected << endl;
-+ slaveStatus ( connected ? myHost : QString::null, connected );
- }
-
- void
-@@ -1838,6 +1847,7 @@
-
- kdDebug(7116) << "IMAP4::makeLogin - checking login" << endl;
- bool alreadyConnected = getState() == ISTATE_CONNECT;
-+ kdDebug(7116) << "IMAP4::makeLogin - alreadyConnected " << alreadyConnected << endl;
- if (alreadyConnected || connectToHost (myHost.latin1(), myPort))
- {
- // fcntl (m_iSock, F_SETFL, (fcntl (m_iSock, F_GETFL) | O_NDELAY));
-@@ -1982,6 +1992,8 @@
- }
- }
- completeQueue.removeRef (cmd);
-+ } else {
-+ kdDebug(7116) << "makeLogin - NO login" << endl;
- }
-
- return getState() == ISTATE_LOGIN;
diff --git a/kde-base/klaptopdaemon/files/acpi_helper.diff b/kde-base/klaptopdaemon/files/acpi_helper.diff
deleted file mode 100644
index e826c047e5b6..000000000000
--- a/kde-base/klaptopdaemon/files/acpi_helper.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-cvs -f log -N -r1.13 acpi_helper.cpp
-
-RCS file: /home/kde/kdeutils/klaptopdaemon/acpi_helper.cpp,v
-Working file: acpi_helper.cpp
-head: 1.13
-branch:
-locks: strict
-access list:
-keyword substitution: kv
-total revisions: 14; selected revisions: 1
-description:
-----------------------------
-revision 1.13
-date: 2005/01/09 18:47:02; author: mueller; state: Exp; lines: +3 -3
-do not allow to overwrite files outside /proc
-CCBUG: 96644
-=============================================================================
-cvs -f diff -bp -u -r1.12 -r1.13 acpi_helper.cpp
-Index: acpi_helper.cpp
-===================================================================
-RCS file: /home/kde/kdeutils/klaptopdaemon/acpi_helper.cpp,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -b -p -u -r1.12 -r1.13
---- klaptopdaemon/acpi_helper.cpp 19 Aug 2003 21:16:36 -0000 1.12
-+++ klaptopdaemon/acpi_helper.cpp 9 Jan 2005 18:47:02 -0000 1.13
-@@ -123,7 +123,7 @@ main(int argc, char **argv)
- i++;
- if (i >= argc)
- break;
-- if (strlen(argv[i]) > 50)
-+ if (strlen(argv[i]) > 50 || strchr(argv[i], '/'))
- break;
- snprintf(tmp, sizeof(tmp), "/proc/acpi/processor/%s/throttling", argv[i]);
- tmp[sizeof(tmp)-1] = 0;
-@@ -151,7 +151,7 @@ main(int argc, char **argv)
- i++;
- if (i >= argc)
- break;
-- if (strlen(argv[i]) > 50)
-+ if (strlen(argv[i]) > 50 || strchr(argv[i], '/'))
- break;
- snprintf(tmp, sizeof(tmp), "/proc/acpi/processor/%s/performance", argv[i]);
- tmp[sizeof(tmp)-1] = 0;
-@@ -206,7 +206,7 @@ main(int argc, char **argv)
- if (strncmp(argv[i], "--cpufreq", 9) == 0 || strncmp(argv[i], "-cpufreq", 8) == 0) {
- if ((i+1) >= argc)
- break;
-- if (strlen(argv[i+1]) > 50)
-+ if (strlen(argv[i+1]) > 50 || strchr(argv[i+1], '/'))
- break;
- int val;
- char tmp[256];
diff --git a/kde-base/kmtrace/files/liberty-link.diff b/kde-base/kmtrace/files/liberty-link.diff
deleted file mode 100644
index 0a81db372ce5..000000000000
--- a/kde-base/kmtrace/files/liberty-link.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmtrace/Makefile.am.orig 2003-04-28 13:03:22.000000000 +0300
-+++ kmtrace/Makefile.am 2004-12-26 19:16:41.967300504 +0200
-@@ -18,7 +18,7 @@
- # Boston, MA 02111-1307, USA.
-
- AM_CPPFLAGS = -DQT_NO_ASCII_CAST -UQT_NO_COMPAT -O3
--LDADD = $(LIB_KDECORE) /usr/lib/libiberty.a
-+LDADD = $(LIB_KDECORE) -liberty
- INCLUDES = $(all_includes)
-
- bin_PROGRAMS = kmtrace demangle kmmatch
diff --git a/kde-base/smoke/files/no_knotifywidgetbase.diff b/kde-base/smoke/files/no_knotifywidgetbase.diff
deleted file mode 100644
index 9c93ce173e2f..000000000000
--- a/kde-base/smoke/files/no_knotifywidgetbase.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- smoke/kde/kde_header_list 2005-02-23 04:37:18.000000000 -0500
-+++ smoke/kde/kde_header_list.2 2005-02-28 15:09:33.702568096 -0500
-@@ -224,7 +224,6 @@
- kmultitabbar.h
- knotifyclient.h
- knotifydialog.h
--knotifywidgetbase.h
- knuminput.h
- knumvalidator.h
- kopenssl.h