diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/kdewebdev/Makefile | 1 | ||||
-rw-r--r-- | www/kdewebdev/distinfo | 4 | ||||
-rw-r--r-- | www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander | 43 | ||||
-rw-r--r-- | www/kdewebdev/pkg-plist | 3 | ||||
-rw-r--r-- | www/kdewebdev4/Makefile | 1 | ||||
-rw-r--r-- | www/kdewebdev4/distinfo | 4 | ||||
-rw-r--r-- | www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander | 43 | ||||
-rw-r--r-- | www/kdewebdev4/pkg-plist | 3 |
8 files changed, 10 insertions, 92 deletions
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index 9b13290c52d4..f81aa6b56a28 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdewebdev PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/www/kdewebdev/distinfo b/www/kdewebdev/distinfo index 6a4ec334e55c..40a85a634a53 100644 --- a/www/kdewebdev/distinfo +++ b/www/kdewebdev/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdewebdev-3.4.0.tar.bz2) = a131b9a14c5da402417b43ed8bc61df1 -SIZE (KDE/kdewebdev-3.4.0.tar.bz2) = 6243584 +MD5 (KDE/kdewebdev-3.4.1.tar.bz2) = d5c9e5c72731aead950ab29a4d620af8 +SIZE (KDE/kdewebdev-3.4.1.tar.bz2) = 5966577 diff --git a/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander b/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander deleted file mode 100644 index 5260fb2f0404..000000000000 --- a/www/kdewebdev/files/patch-post-3.4.0-kdewebdev-kommander +++ /dev/null @@ -1,43 +0,0 @@ -Index: kommander/executor/instance.cpp -=================================================================== -RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v -retrieving revision 1.49 -retrieving revision 1.49.2.3 -diff -u -3 -d -p -r1.49 -r1.49.2.3 ---- kommander/executor/instance.cpp 29 Dec 2004 09:58:46 -0000 1.49 -+++ kommander/executor/instance.cpp 17 Apr 2005 08:56:01 -0000 1.49.2.3 -@@ -131,6 +131,14 @@ 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("<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution " -+ "Kommander will only run Kommander scripts with a clear identity.</qt>"), -+ i18n("Wrong Extension")); -+ return false; -+ } -+ - /* add runtime arguments */ - if (m_cmdArguments) { - QString args; -@@ -144,8 +152,17 @@ bool Instance::run(QFile *a_file) - } - KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments)); - -- if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") || -- m_uiFileName.directory().startsWith("/tmp/")) -+ 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("<qt>This dialog is running from your <i>/tmp</i> directory. " - " This may mean that it was run from a KMail attachment or from a webpage. " diff --git a/www/kdewebdev/pkg-plist b/www/kdewebdev/pkg-plist index 5f65786de7f5..06d16e34ad8d 100644 --- a/www/kdewebdev/pkg-plist +++ b/www/kdewebdev/pkg-plist @@ -66,6 +66,7 @@ share/apps/kimagemapeditor/removepointcursor.png share/apps/klinkstatus/klinkstatus_shell.rc share/apps/klinkstatuspart/klinkstatus_part.rc share/apps/klinkstatuspart/pics/304.png +share/apps/kmdr-editor/pics/kommandersplash.png share/apps/kxsldbg/kxsldbg_shell.rc share/apps/kxsldbgpart/kxsldbg_part.rc share/apps/quanta/actions.rc @@ -1700,6 +1701,8 @@ share/servicetypes/quantadebugger.desktop @dirrm share/apps/quanta @dirrm share/apps/kxsldbgpart @dirrm share/apps/kxsldbg +@dirrm share/apps/kmdr-editor/pics +@dirrm share/apps/kmdr-editor @dirrm share/apps/klinkstatuspart/pics @dirrm share/apps/klinkstatuspart @dirrm share/apps/klinkstatus diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index 9b13290c52d4..f81aa6b56a28 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdewebdev PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo index 6a4ec334e55c..40a85a634a53 100644 --- a/www/kdewebdev4/distinfo +++ b/www/kdewebdev4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdewebdev-3.4.0.tar.bz2) = a131b9a14c5da402417b43ed8bc61df1 -SIZE (KDE/kdewebdev-3.4.0.tar.bz2) = 6243584 +MD5 (KDE/kdewebdev-3.4.1.tar.bz2) = d5c9e5c72731aead950ab29a4d620af8 +SIZE (KDE/kdewebdev-3.4.1.tar.bz2) = 5966577 diff --git a/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander b/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander deleted file mode 100644 index 5260fb2f0404..000000000000 --- a/www/kdewebdev4/files/patch-post-3.4.0-kdewebdev-kommander +++ /dev/null @@ -1,43 +0,0 @@ -Index: kommander/executor/instance.cpp -=================================================================== -RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v -retrieving revision 1.49 -retrieving revision 1.49.2.3 -diff -u -3 -d -p -r1.49 -r1.49.2.3 ---- kommander/executor/instance.cpp 29 Dec 2004 09:58:46 -0000 1.49 -+++ kommander/executor/instance.cpp 17 Apr 2005 08:56:01 -0000 1.49.2.3 -@@ -131,6 +131,14 @@ 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("<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution " -+ "Kommander will only run Kommander scripts with a clear identity.</qt>"), -+ i18n("Wrong Extension")); -+ return false; -+ } -+ - /* add runtime arguments */ - if (m_cmdArguments) { - QString args; -@@ -144,8 +152,17 @@ bool Instance::run(QFile *a_file) - } - KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments)); - -- if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") || -- m_uiFileName.directory().startsWith("/tmp/")) -+ 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("<qt>This dialog is running from your <i>/tmp</i> directory. " - " This may mean that it was run from a KMail attachment or from a webpage. " diff --git a/www/kdewebdev4/pkg-plist b/www/kdewebdev4/pkg-plist index 5f65786de7f5..06d16e34ad8d 100644 --- a/www/kdewebdev4/pkg-plist +++ b/www/kdewebdev4/pkg-plist @@ -66,6 +66,7 @@ share/apps/kimagemapeditor/removepointcursor.png share/apps/klinkstatus/klinkstatus_shell.rc share/apps/klinkstatuspart/klinkstatus_part.rc share/apps/klinkstatuspart/pics/304.png +share/apps/kmdr-editor/pics/kommandersplash.png share/apps/kxsldbg/kxsldbg_shell.rc share/apps/kxsldbgpart/kxsldbg_part.rc share/apps/quanta/actions.rc @@ -1700,6 +1701,8 @@ share/servicetypes/quantadebugger.desktop @dirrm share/apps/quanta @dirrm share/apps/kxsldbgpart @dirrm share/apps/kxsldbg +@dirrm share/apps/kmdr-editor/pics +@dirrm share/apps/kmdr-editor @dirrm share/apps/klinkstatuspart/pics @dirrm share/apps/klinkstatuspart @dirrm share/apps/klinkstatus |