diff options
| -rw-r--r-- | x11/kdelibs4/DESCR | 3 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 7 | ||||
| -rw-r--r-- | x11/kdelibs4/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/patches/patch-kio_kio_scheduler.cpp | 41 | ||||
| -rw-r--r-- | x11/kdelibs4/patches/patch-kio_kio_scheduler.h | 38 |
5 files changed, 87 insertions, 6 deletions
diff --git a/x11/kdelibs4/DESCR b/x11/kdelibs4/DESCR index d8e17049190..37851e4ce6f 100644 --- a/x11/kdelibs4/DESCR +++ b/x11/kdelibs4/DESCR @@ -14,8 +14,7 @@ Here is an alphabetical list: * kconf_update Auto-Updater for config files. * kde3support - This contains libraries that were part of KDE3, but have been - replaced for KDE4 + Libraries that were part of KDE3, but have been replaced for KDE4 * kdecore This is the core collection of KDE stuff. Non GUI classes reside here. * kded diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 5d4f7839bf9..8cb2c222528 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2012/01/13 10:55:49 obache Exp $ +# $NetBSD: Makefile,v 1.34 2012/01/18 22:03:23 abs Exp $ DISTNAME= kdelibs-${_KDE_VERSION} -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop @@ -93,11 +93,12 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4 .include "../../multimedia/phonon/buildlink3.mk" # Avahi ? rather than mDNSResponder +.include "../../devel/libdbusmenu-qt/buildlink3.mk" +.include "../../mk/fam.buildlink3.mk" .include "../../net/mDNSResponder/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/polkit-qt/buildlink3.mk" .include "../../security/qca2/buildlink3.mk" -.include "../../mk/fam.buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/enchant/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index ed54ad582df..0b9641ca0cd 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2011/11/20 02:08:10 markd Exp $ +$NetBSD: distinfo,v 1.22 2012/01/18 22:03:23 abs Exp $ SHA1 (kdelibs-4.5.5.tar.bz2) = 127a2b50fe31ff345e05660dd50f7c55ae78d854 RMD160 (kdelibs-4.5.5.tar.bz2) = 7c33afa12379119fbf7d70e8895c3f2ada9a2eba @@ -17,6 +17,8 @@ SHA1 (patch-an) = b5fe924970772bd8a5b420f8cc638ab8bf892c53 SHA1 (patch-cmake_modules_FindTaglib.cmake) = 97baf0e5c9f53a17582d89ee41cb4d99fbd15424 SHA1 (patch-kdeui_colors_kcolordialog.cpp) = f105006a778c42a93452fc4bf5d561aa62595a5c SHA1 (patch-khtml_khtml_part.cpp) = f8f5977b03463b6de909881178abed3ba351364c +SHA1 (patch-kio_kio_scheduler.cpp) = a32f9dadf021115a819d4ff94bf63e6ee109c965 +SHA1 (patch-kio_kio_scheduler.h) = b09d3fba61f68685037a6cfa62b58ab768de71c1 SHA1 (patch-kio_kssl_ksslcertificatebox.cpp) = 1f187968a49e251fbdbbf2569e4703ac05b474be SHA1 (patch-kioslave_http_http.cpp) = abd6446120fab21cd30da3e9e1fdc00218802d89 SHA1 (patch-kjs_JSImmediate.h) = 29949739140d766362d308ece28c96aef593ed73 diff --git a/x11/kdelibs4/patches/patch-kio_kio_scheduler.cpp b/x11/kdelibs4/patches/patch-kio_kio_scheduler.cpp new file mode 100644 index 00000000000..e55b5ea2d26 --- /dev/null +++ b/x11/kdelibs4/patches/patch-kio_kio_scheduler.cpp @@ -0,0 +1,41 @@ +$NetBSD: patch-kio_kio_scheduler.cpp,v 1.1 2012/01/18 22:03:24 abs Exp $ + +--- kio/kio/scheduler.cpp.orig 2010-07-07 17:08:31.000000000 +0000 ++++ kio/kio/scheduler.cpp +@@ -865,6 +865,36 @@ void Scheduler::emitReparseSlaveConfigur + emit self()->reparseSlaveConfiguration( QString() ); + } + ++void Scheduler::slotSlaveDied(Slave* slave) ++{ ++ schedulerPrivate->slotSlaveDied(slave); ++} ++ ++void Scheduler::slotSlaveStatus(pid_t pid, const QByteArray& protocol, const QString& host, bool connected) ++{ ++ schedulerPrivate->slotSlaveStatus(pid, protocol, host, connected); ++} ++ ++void Scheduler::slotReparseSlaveConfiguration(const QString& prot) ++{ ++ schedulerPrivate->slotReparseSlaveConfiguration(prot); ++} ++ ++void Scheduler::slotSlaveConnected() ++{ ++ schedulerPrivate->slotSlaveConnected(); ++} ++ ++void Scheduler::slotSlaveError(int error, const QString& errorMsg) ++{ ++ schedulerPrivate->slotSlaveError(error, errorMsg); ++} ++ ++void Scheduler::slotUnregisterWindow(QObject* obj) ++{ ++ schedulerPrivate->slotUnregisterWindow(obj); ++} ++ + + void SchedulerPrivate::slotReparseSlaveConfiguration(const QString &proto) + { diff --git a/x11/kdelibs4/patches/patch-kio_kio_scheduler.h b/x11/kdelibs4/patches/patch-kio_kio_scheduler.h new file mode 100644 index 00000000000..eef97228ce7 --- /dev/null +++ b/x11/kdelibs4/patches/patch-kio_kio_scheduler.h @@ -0,0 +1,38 @@ +$NetBSD: patch-kio_kio_scheduler.h,v 1.1 2012/01/18 22:03:24 abs Exp $ + +--- kio/kio/scheduler.h.orig 2010-02-03 08:50:40.000000000 +0000 ++++ kio/kio/scheduler.h +@@ -29,6 +29,8 @@ + #include <QtGui/QWidgetList> + #include <sys/types.h> // pid_t + ++class QDBusMessage; ++ + namespace KIO { + + class Slave; +@@ -278,16 +280,17 @@ namespace KIO { + + static Scheduler *self(); + +- Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveDied(KIO::Slave *slave)) +- Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveStatus(pid_t pid, const QByteArray &protocol, +- const QString &host, bool connected)) ++ private Q_SLOTS: ++ void slotSlaveDied(KIO::Slave *slave); ++ void slotSlaveStatus(pid_t pid, const QByteArray &protocol, ++ const QString &host, bool connected); + + // connected to D-Bus signal: +- Q_PRIVATE_SLOT(schedulerPrivate, void slotReparseSlaveConfiguration(const QString &)) ++ void slotReparseSlaveConfiguration(const QString &); ++ void slotSlaveConnected(); ++ void slotSlaveError(int error, const QString &errorMsg); ++ void slotUnregisterWindow(QObject *); + +- Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveConnected()) +- Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveError(int error, const QString &errorMsg)) +- Q_PRIVATE_SLOT(schedulerPrivate, void slotUnregisterWindow(QObject *)) + private: + friend class SchedulerPrivate; + SchedulerPrivate *const d; |