Cleanup and apply patch for debug build as recommended by upstream.

(Portage version: 2.2_rc44/cvs/Linux i686)

10 files changed, 31 insertions, 238 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index d677b20a37d7..2b6c194f5d07 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-irc/konversation
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.85 2009/10/04 09:41:26 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.86 2009/10/07 21:40:21 scarabeus Exp $
+
+*konversation-1.2_rc1-r1 (07 Oct 2009)
+
+  07 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.2_rc1-debug.patch, -files/konversation-1.0.1-crash.patch,
+  -files/konversation-1.0.1-konsolepanel.patch,
+  -files/konversation-1.0.1-media-script-vulnerability.patch,
+  -files/konversation-1.0.1-serverlist-compiz-workaround.patch,
+  -files/konversation-1.1-desktop-entry-fix.diff,
+  -konversation-1.2_alpha6.ebuild, -konversation-1.2_beta1.ebuild,
+  -konversation-1.2_rc1.ebuild, +konversation-1.2_rc1-r1.ebuild:
+  Cleanup and apply patch for debug build as recommended by upstream.
 
 *konversation-1.2_rc1 (04 Oct 2009)
 
diff --git a/net-irc/konversation/files/1.2_rc1-debug.patch b/net-irc/konversation/files/1.2_rc1-debug.patch
new file mode 100644
index 000000000000..1b5b4bff4c59
--- /dev/null
+++ b/net-irc/konversation/files/1.2_rc1-debug.patch
@@ -0,0 +1,13 @@
+Index: trunk/extragear/network/konversation/src/viewer/ircview.cpp
+===================================================================
+--- trunk/extragear/network/konversation/src/viewer/ircview.cpp	(revision 1032161)
++++ trunk/extragear/network/konversation/src/viewer/ircview.cpp	(revision 1032162)
+@@ -856,8 +856,6 @@
+ 
+     KTextBrowser::append(line);
+ 
+-    Q_ASSERT(document()->rootFrame()->childFrames().count() == 0); // no child frames, see SelectionPin
+-
+     QTextCursor formatCursor(document()->lastBlock());
+     QTextBlockFormat format = formatCursor.blockFormat();
+ 
diff --git a/net-irc/konversation/files/konversation-1.0.1-crash.patch b/net-irc/konversation/files/konversation-1.0.1-crash.patch
deleted file mode 100644
index b406e801e1d7..000000000000
--- a/net-irc/konversation/files/konversation-1.0.1-crash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- trunk/extragear/network/konversation/src/viewcontainer.cpp	2006/11/17 17:50:03	605661
-+++ trunk/extragear/network/konversation/src/viewcontainer.cpp	2006/11/17 22:04:32	605705
-@@ -2022,11 +2022,13 @@
-     if (m_frontServer)
-     {
-         DccChat* dccChatPanel=new DccChat(m_tabWidget, myNick,nick,arguments,listen);
--        addView(dccChatPanel, dccChatPanel->getName());
-         connect(dccChatPanel, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
-         if(listen)
-+	{
-             m_frontServer->queue(QString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001")
-               .arg(nick).arg(numericalIp).arg(dccChatPanel->getPort()));
-+	}
-+        addView(dccChatPanel, dccChatPanel->getName());
-     }
- }
- 
diff --git a/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch b/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch
deleted file mode 100644
index 646adc218c0a..000000000000
--- a/net-irc/konversation/files/konversation-1.0.1-konsolepanel.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- konversation~/src/konsolepanel.h	2006-10-06 18:43:29.000000000 +0200
-+++ konversation/src/konsolepanel.h	2007-08-16 16:25:09.000000000 +0200
-@@ -13,8 +13,10 @@
- #define KONSOLE_PANEL_H
- 
- #include "chatwindow.h"
-+
- #include <kparts/part.h>
- 
-+
- class KonsolePanel : public ChatWindow
- {
-     Q_OBJECT
-@@ -25,6 +27,8 @@
- 
-         virtual void setName(const QString& newName) { ChatWindow::setName(newName); }
- 
-+        QWidget* getWidget();
-+
-     signals:
-         void closeView(ChatWindow* view);
- 
---- konversation~/src/konsolepanel.cpp	2006-10-06 18:43:29.000000000 +0200
-+++ konversation/src/konsolepanel.cpp	2007-08-16 16:25:09.000000000 +0200
-@@ -9,15 +9,16 @@
-   Copyright (C) 2003 Mickael Marchand <marchand@kde.org>
- */
- 
-+#include "konsolepanel.h"
-+#include "common.h"
-+#include "viewcontainer.h"
-+
- #include <kdebug.h>
- #include <klibloader.h>
- #include <klocale.h>
- 
--#include "konsolepanel.h"
--#include "common.h"
--#include "viewcontainer.h"
- 
--KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p )
-+KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p ), k_part (0)
- {
-     setName(i18n("Konsole"));
-     setType(ChatWindow::Konsole);
-@@ -46,8 +47,17 @@
-     }
- }
- 
-+QWidget* KonsolePanel::getWidget()
-+{
-+    if (k_part)
-+        return k_part->widget();
-+    else
-+        return 0;
-+}
-+
- void KonsolePanel::childAdjustFocus()
- {
-+    if (k_part) k_part->widget()->setFocus();
- }
- 
- void KonsolePanel::partDestroyed()
diff --git a/net-irc/konversation/files/konversation-1.0.1-media-script-vulnerability.patch b/net-irc/konversation/files/konversation-1.0.1-media-script-vulnerability.patch
deleted file mode 100644
index 7c7bd32cf6e3..000000000000
--- a/net-irc/konversation/files/konversation-1.0.1-media-script-vulnerability.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -aur konversation-1.0.1/konversation/src/channel.cpp konversation-1.0.1-fixed/konversation/src/channel.cpp
---- konversation-1.0.1/konversation/src/channel.cpp	2006-10-06 18:43:29.000000000 +0200
-+++ konversation-1.0.1-fixed/konversation/src/channel.cpp	2007-09-05 01:10:52.000000000 +0200
-@@ -890,7 +890,7 @@
-     }
- 
-     // Send all strings, one after another
--    QStringList outList=QStringList::split('\n',outputAll);
-+    QStringList outList=QStringList::split(QRegExp("[\r\n]+"),outputAll);
-     for(unsigned int index=0;index<outList.count();index++)
-     {
-         QString output(outList[index]);
-diff -aur konversation-1.0.1/konversation/src/konvdcop.cpp konversation-1.0.1-fixed/konversation/src/konvdcop.cpp
---- konversation-1.0.1/konversation/src/konvdcop.cpp	2006-10-06 18:43:29.000000000 +0200
-+++ konversation-1.0.1-fixed/konversation/src/konvdcop.cpp	2007-09-05 01:11:08.000000000 +0200
-@@ -82,15 +82,23 @@
-     emit dcopMultiServerRaw("me " + message);
- }
- 
--void KonvDCOP::say(const QString& server,const QString& target,const QString& command)
-+void KonvDCOP::say(const QString& _server,const QString& _target,const QString& _command)
- {
-+    //Sadly, copy on write doesn't exist with QString::replace
-+    QString server(_server), target(_target), command(_command);
-+
-     // TODO: this just masks a greater problem - Server::addQuery will return a query for '' --argonel
-     // TODO: other DCOP calls need argument checking too --argonel
-     if (server.isEmpty() || target.isEmpty() || command.isEmpty())
-         kdDebug() <<  "KonvDCOP::say() requires 3 arguments." << endl;
-     else
-     {
--        kdDebug() << "KonvDCOP::say()" << endl;
-+        command.replace('\n',"\\n");
-+        command.replace('\r',"\\r");
-+        target.remove('\n');
-+        target.remove('\r');
-+        server.remove('\n');
-+        server.remove('\r');
-         // Act as if the user typed it
-         emit dcopSay(server,target,command);
-     }
diff --git a/net-irc/konversation/files/konversation-1.0.1-serverlist-compiz-workaround.patch b/net-irc/konversation/files/konversation-1.0.1-serverlist-compiz-workaround.patch
deleted file mode 100644
index 4f58d5ab0f76..000000000000
--- a/net-irc/konversation/files/konversation-1.0.1-serverlist-compiz-workaround.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- konversation-1.0.1/konversation/src/konversationapplication.cpp	2006-10-06 18:43:29.000000000 +0200
-+++ konversation-new/konversation/src/konversationapplication.cpp	2007-10-12 18:38:23.000000000 +0200
-@@ -126,7 +126,7 @@
-         emit appearanceChanged();
-         mainWindow->show();
- 
--        if (Preferences::showServerList()) mainWindow->openServerList();
-+        bool openServerList = Preferences::showServerList();
- 
-         // handle autoconnect on startup
-         Konversation::ServerGroupList serverGroups = Preferences::serverGroupList();
-@@ -135,12 +135,18 @@
-         {
-             for (Konversation::ServerGroupList::iterator it = serverGroups.begin(); it != serverGroups.end(); ++it)
-             {
--                if ((*it)->autoConnectEnabled()) connectToServer((*it)->id());
-+                if ((*it)->autoConnectEnabled())
-+                {
-+                    openServerList = false;
-+                    connectToServer((*it)->id());
-+                }
-             }
-         }
-         else
-             quickConnectToServer(m_hostName, m_port, m_channel, m_nick, m_password, m_useSSL);
- 
-+        if (openServerList) mainWindow->openServerList();
-+
-         // prepare dcop interface
-         dcopObject = new KonvDCOP;
-         kapp->dcopClient()->setDefaultObject(dcopObject->objId());
diff --git a/net-irc/konversation/files/konversation-1.1-desktop-entry-fix.diff b/net-irc/konversation/files/konversation-1.1-desktop-entry-fix.diff
deleted file mode 100644
index b3ec4af2eeae..000000000000
--- a/net-irc/konversation/files/konversation-1.1-desktop-entry-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./konversation/src/konversation.desktop.orig	2008-07-14 19:03:47.000000000 +0200
-+++ ./konversation/src/konversation.desktop	2008-07-14 19:20:10.000000000 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
--Exec=konversation -caption "%c" %i %m
-+Exec=konversation -caption "%c" %i
- Icon=konversation
--DocPath=konversation/index.html
-+X-DocPath=konversation/index.html
- GenericName=IRC Client
- GenericName[ar]=زبون IRC
- GenericName[bg]=IRC клиент
-@@ -45,4 +45,3 @@
- ServiceTypes=DCOP/InstantMessenger;DCOP/Unique
- X-DCOP-ServiceName=konversation
- X-DCOP-ServiceType=Unique
--Encoding=UTF-8
diff --git a/net-irc/konversation/konversation-1.2_alpha6.ebuild b/net-irc/konversation/konversation-1.2_alpha6.ebuild
deleted file mode 100644
index 7f75a935c7a4..000000000000
--- a/net-irc/konversation/konversation-1.2_alpha6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.2_alpha6.ebuild,v 1.1 2009/08/09 11:55:46 wired Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar bg ca da de el en_GB es et fr gl he hu it ja ko nds nl pt pt_BR ru sv
-tr uk zh_CN zh_TW"
-inherit kde4-base versionator
-
-MY_P="${PN}"-$(replace_version_separator 2 '-')
-
-DESCRIPTION="A user friendly IRC Client for KDE4"
-HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="+crypt debug"
-
-DEPEND="
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	crypt? ( app-crypt/qca:2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="$(cmake-utils_use_with crypt QCA2)"
-	kde4-base_src_configure
-}
diff --git a/net-irc/konversation/konversation-1.2_beta1.ebuild b/net-irc/konversation/konversation-1.2_beta1.ebuild
deleted file mode 100644
index 2a92d9994570..000000000000
--- a/net-irc/konversation/konversation-1.2_beta1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.2_beta1.ebuild,v 1.1 2009/09/21 11:32:41 scarabeus Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar bg ca  cs da de el en_GB es et fr gl hu it ja nds nl pa pt pt_BR ru sv
-tr uk zh_CN zh_TW"
-inherit kde4-base versionator
-
-MY_P="${PN}"-$(replace_version_separator 2 '-')
-
-DESCRIPTION="A user friendly IRC Client for KDE4"
-HOMEPAGE="http://konversation.kde.org"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="+crypt debug"
-
-DEPEND="
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
-	crypt? ( app-crypt/qca:2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	mycmakeargs="$(cmake-utils_use_with crypt QCA2)"
-	kde4-base_src_configure
-}
diff --git a/net-irc/konversation/konversation-1.2_rc1.ebuild b/net-irc/konversation/konversation-1.2_rc1-r1.ebuild
index e8270847e74b..4c0c91c5fc35 100644
--- a/net-irc/konversation/konversation-1.2_rc1.ebuild
+++ b/net-irc/konversation/konversation-1.2_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.2_rc1.ebuild,v 1.1 2009/10/04 09:41:26 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.2_rc1-r1.ebuild,v 1.1 2009/10/07 21:40:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -28,6 +28,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-debug.patch
+)
+
 src_configure() {
 	mycmakeargs="$(cmake-utils_use_with crypt QCA2)"
 	kde4-base_src_configure