pkg/46097: kdenetwork4 no virtual inheritance of QObject since Qt 4.8 patches

[davshao%gmail.com@localhost]

>Number:         46097
>Category:       pkg
>Synopsis:       kdenetwork4 no virtual inheritance of QObject since Qt 4.8 
>patches
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 25 18:05:00 +0000 2012
>Originator:     David Shao
>Release:        NetBSD 6.99.3
>Organization:
>Environment:
NetBSD 6.99.3 (GENERIC) /usr/obj/sys/arch/amd64/compile/GENERIC amd64
>Description:
Since Qt 4.8, QObject is not permitted to have virtual inheritance, breaking 
the build of various parts of KDE prior to 4.7.  There are fixes in KDE 4.8 
that can be backported to KDE 4.5.  The following fixes apply to building 
net/kdenetwork4 in pkgsrc current, taken from

http://websvn.kde.org/trunk/KDE/kdenetwork/kopete/libkopete/


>How-To-Repeat:
Using pkgsrc current, in net/kdenetwork4
make install
>Fix:
Below are the two patches used for kdenetwork4 to build; however, functionality 
of kdenetwork4 has not been tested.

--- kopete/libkopete/kopetepassword.h.orig      2008-01-04 23:59:16.000000000 
+0000
+++ kopete/libkopete/kopetepassword.h
@@ -183,9 +183,12 @@ private:
  * @internal
  * @see KopetePassword
  */
-class KopetePasswordRequestBase : public virtual QObject
+class KopetePasswordRequestBase : public QObject
 {
        Q_OBJECT
+public:
+       KopetePasswordRequestBase(QObject *parent)
+       :QObject(parent) {};
 signals:
        void requestFinished( const QString &password );
 public slots:

--- kopete/libkopete/kopetepassword.cpp.orig    2009-06-09 16:08:46.000000000 
+0000
+++ kopete/libkopete/kopetepassword.cpp
@@ -77,7 +77,7 @@ class KopetePasswordRequest : public Kop
 {
 public:
        KopetePasswordRequest( QObject *owner, Kopete::Password &pass )
-        : QObject( owner ), mPassword( pass ), mWallet( 0 )
+        : KopetePasswordRequestBase( owner), mPassword( pass ), mWallet( 0 )
        {
        }