diff options
| author | markd <markd> | 2010-10-26 11:46:57 +0000 |
|---|---|---|
| committer | markd <markd> | 2010-10-26 11:46:57 +0000 |
| commit | 3f53df30aacdf4b16c5e848c7cf8134950f028bf (patch) | |
| tree | ae16f61cf990c2fde9189e5b49c85804f0366d07 /x11/kdelibs4 | |
| parent | b50fd9abaa8fe114d133102451153bbfe06c2494 (diff) | |
| download | pkgsrc-3f53df30aacdf4b16c5e848c7cf8134950f028bf.tar.gz | |
Note dependency on docbook-xml and docbook-xsl and rework the handling
of the lack of pthread_mutexattr_setpshared() on NetBSD. Bump PKGREVISION
Diffstat (limited to 'x11/kdelibs4')
| -rw-r--r-- | x11/kdelibs4/Makefile | 6 | ||||
| -rw-r--r-- | x11/kdelibs4/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/patches/patch-an | 26 |
3 files changed, 19 insertions, 17 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index d4341a49610..ad1579da602 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2010/10/25 20:55:28 markd Exp $ +# $NetBSD: Makefile,v 1.15 2010/10/26 11:46:57 markd Exp $ DISTNAME= kdelibs-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop @@ -27,6 +28,9 @@ CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \ CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \ ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf +DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml +DEPENDS+= docbook-xsl>=1.75:../../textproc/docbook-xsl + INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8 REPLACE_PERL+= \ diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 4c76dd4a662..c4f6abe2c1e 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2010/10/25 20:55:28 markd Exp $ +$NetBSD: distinfo,v 1.13 2010/10/26 11:46:58 markd Exp $ SHA1 (kdelibs-4.5.2.tar.bz2) = e5b3c643aa10275571be6a637333e8791ed013b6 RMD160 (kdelibs-4.5.2.tar.bz2) = 9d8830a0f9b9062ead1d18918da0ce25d24f5cbe @@ -13,4 +13,4 @@ SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618 SHA1 (patch-ak) = 03883c05a2a600737d98a889034a2fb9984a5d58 SHA1 (patch-al) = a3c48e8552ca39496134696f3d415a7b6a4db7d8 SHA1 (patch-am) = da04e0450885dc4bca38a4e9b91822746d936639 -SHA1 (patch-an) = 1a5e6f05cc8f20e5188f8e5dedf220fb934af0ea +SHA1 (patch-an) = b5fe924970772bd8a5b420f8cc638ab8bf892c53 diff --git a/x11/kdelibs4/patches/patch-an b/x11/kdelibs4/patches/patch-an index 3f9381bb53c..05a3166dfe2 100644 --- a/x11/kdelibs4/patches/patch-an +++ b/x11/kdelibs4/patches/patch-an @@ -1,18 +1,16 @@ -$NetBSD: patch-an,v 1.1 2010/10/25 20:55:29 markd Exp $ +$NetBSD: patch-an,v 1.2 2010/10/26 11:46:58 markd Exp $ --- kdecore/util/kshareddatacache.cpp.orig 2010-09-30 21:19:05.000000000 +0000 +++ kdecore/util/kshareddatacache.cpp -@@ -60,6 +60,13 @@ - #define MAP_ANONYMOUS MAP_ANON - #endif - -+#ifdef __NetBSD__ -+int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared) -+{ -+ kError(264) << "Actually called pthread_mutexattr_setpshared()."; -+} +@@ -307,7 +307,10 @@ struct SharedMemory + // Initialize attributes, enable process-shared primitives, and setup + // the mutex. + if (pthread_mutexattr_init(&mutexAttr) == 0) { +- if (pthread_mutexattr_setpshared(&mutexAttr, PTHREAD_PROCESS_SHARED) != 0 || ++ if ( ++#ifdef _POSIX_THREAD_PROCESS_SHARED ++ pthread_mutexattr_setpshared(&mutexAttr, PTHREAD_PROCESS_SHARED) != 0 || +#endif -+ - /** - * This is the hash function used for our pixmap data to hopefully make the - * hashing used to place the pixmaps as efficient as possible. + pthread_mutex_init(&lockMutex, &mutexAttr) != 0) + { + pthread_mutexattr_destroy(&mutexAttr); |