From d83df38604fe5341909ad4acef4f0de06b79a7a1 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sun, 28 Jan 2007 12:03:59 +0000 Subject: Remove a bunch of orphaned files. (Portage version: 2.1.2-r4) --- kde-base/kdewebdev/ChangeLog | 6 ++- .../kdewebdev/files/kxsldbg-3.4.3-fmt-str.patch | 11 ---- kde-base/kdewebdev/files/post-3.4-kdewebdev-2.diff | 63 ---------------------- 3 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 kde-base/kdewebdev/files/kxsldbg-3.4.3-fmt-str.patch delete mode 100644 kde-base/kdewebdev/files/post-3.4-kdewebdev-2.diff (limited to 'kde-base') diff --git a/kde-base/kdewebdev/ChangeLog b/kde-base/kdewebdev/ChangeLog index c492060ecf46..58f978016e57 100644 --- a/kde-base/kdewebdev/ChangeLog +++ b/kde-base/kdewebdev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdewebdev # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.126 2007/01/25 19:05:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.127 2007/01/28 12:03:59 flameeyes Exp $ + + 28 Jan 2007; Diego Pettenò + -files/kxsldbg-3.4.3-fmt-str.patch, -files/post-3.4-kdewebdev-2.diff: + Remove a bunch of orphaned files. 25 Jan 2007; Diego Pettenò kdewebdev-3.5.6.ebuild: Drop ~hppa and ~mips keywords because of missing kdelibs-3.5.6 keywording. diff --git a/kde-base/kdewebdev/files/kxsldbg-3.4.3-fmt-str.patch b/kde-base/kdewebdev/files/kxsldbg-3.4.3-fmt-str.patch deleted file mode 100644 index 7e47eff1a2bb..000000000000 --- a/kde-base/kdewebdev/files/kxsldbg-3.4.3-fmt-str.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp.orig 2005-12-04 11:02:02.000000000 +0100 -+++ ./kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp 2005-12-04 11:04:00.000000000 +0100 -@@ -175,7 +175,7 @@ - } else { - xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg))); - } -- xsltGenericError(xsltGenericErrorContext, buffer); -+ xsltGenericError(xsltGenericErrorContext, "%s", buffer); - } - return result; - } diff --git a/kde-base/kdewebdev/files/post-3.4-kdewebdev-2.diff b/kde-base/kdewebdev/files/post-3.4-kdewebdev-2.diff deleted file mode 100644 index 5bf3f475f94b..000000000000 --- a/kde-base/kdewebdev/files/post-3.4-kdewebdev-2.diff +++ /dev/null @@ -1,63 +0,0 @@ -Index: instance.cpp -=================================================================== -RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v -retrieving revision 1.49 -diff -u -3 -d -p -r1.49 instance.cpp ---- kommander/executor/instance.cpp 29 Dec 2004 09:58:46 -0000 1.49 -+++ kommander/executor/instance.cpp 13 Apr 2005 19:18:57 -0000 -@@ -131,6 +131,35 @@ bool Instance::build(QFile *a_file) - - bool Instance::run(QFile *a_file) - { -+ // Check whether extension is *.kmdr -+ if (!m_uiFileName.fileName().endsWith(".kmdr")) { -+ KMessageBox::error(0, i18n("This file does not have a .kmdr extension. As a security precaution " -+ "Kommander will only run Kommander scripts with a clear identity."), -+ i18n("Wrong Extension")); -+ return false; -+ } -+ -+ // Check whether file is not in some temporary directory. -+ QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); -+ tmpDirs += KGlobal::dirs()->resourceDirs("cache"); -+ tmpDirs.append("/tmp/"); -+ tmpDirs.append("/var/tmp/"); -+ -+ bool inTemp = false; -+ for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I) -+ if (m_uiFileName.directory(false).startsWith(*I)) -+ inTemp = true; -+ -+ if (inTemp) -+ { -+ if (KMessageBox::warningYesNo(0, i18n("This dialog is running from your /tmp directory. " -+ " This may mean that it was run from a KMail attachment or from a webpage. " -+ "

Any script contained in this dialog will have write access to all of your home directory; " -+ "running such dialogs may be dangerous: " -+ "

are you sure you want to continue?")) == KMessageBox::No) -+ return false; -+ } -+ - /* add runtime arguments */ - if (m_cmdArguments) { - QString args; -@@ -143,18 +172,7 @@ bool Instance::run(QFile *a_file) - KommanderWidget::setGlobal("ARGS", args); - } - KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments)); -- -- if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") || -- m_uiFileName.directory().startsWith("/tmp/")) -- { -- if (KMessageBox::warningYesNo(0, i18n("This dialog is running from your /tmp directory. " -- " This may mean that it was run from a KMail attachment or from a webpage. " -- "

Any script contained in this dialog will have write access to all of your home directory; " -- "running such dialogs may be dangerous: " -- "

are you sure you want to continue?")) == KMessageBox::No) -- return false; -- } -- -+ - if (!m_uiFileName.isEmpty()) - { - KommanderWidget::setGlobal("_KDDIR", m_uiFileName.directory()); -- cgit v1.2.3-65-gdbad