diff options
| author | joerg <joerg@pkgsrc.org> | 2012-11-11 22:24:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-11-11 22:24:01 +0000 |
| commit | b171962a59f8b7e11e28009f303fb6e619a57a45 (patch) | |
| tree | 6c13294c221e90fc8a93245221d2fb007fff566a /x11 | |
| parent | 4f3453087a8596c07a81e3e63bad545653099c01 (diff) | |
| download | pkgsrc-b171962a59f8b7e11e28009f303fb6e619a57a45.tar.gz | |
Don't use non-public legacy constructor of QString. Bump revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs4/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdelibs4/patches/patch-kparts_componentfactory.h | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index ead91e14565..035fc648bcb 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2012/10/08 23:01:03 adam Exp $ +# $NetBSD: Makefile,v 1.49 2012/11/11 22:24:01 joerg Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 68c529c8c6c..562ad12379d 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2012/07/07 11:52:29 markd Exp $ +$NetBSD: distinfo,v 1.32 2012/11/11 22:24:01 joerg Exp $ SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49 RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec @@ -20,6 +20,7 @@ SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a +SHA1 (patch-kparts_componentfactory.h) = e670cd8f35b5186bf76e0cc285da65cc8832b82f SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552 SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571 diff --git a/x11/kdelibs4/patches/patch-kparts_componentfactory.h b/x11/kdelibs4/patches/patch-kparts_componentfactory.h new file mode 100644 index 00000000000..3279e6981f3 --- /dev/null +++ b/x11/kdelibs4/patches/patch-kparts_componentfactory.h @@ -0,0 +1,13 @@ +$NetBSD: patch-kparts_componentfactory.h,v 1.1 2012/11/11 22:24:01 joerg Exp $ + +--- kparts/componentfactory.h.orig 2012-06-06 20:49:52.000000000 +0000 ++++ kparts/componentfactory.h +@@ -81,7 +81,7 @@ namespace KParts + const QStringList &args = QStringList(), + int *error = 0 ) + { +- KLibrary *library = KLibLoader::self()->library( QString( libraryName ) ); // compatibility hack ++ KLibrary *library = KLibLoader::self()->library( QString::fromAscii( libraryName ) ); // compatibility hack + if ( !library ) + { + if ( error ) |