diff options
author | hans <hans> | 2012-03-31 21:46:55 +0000 |
---|---|---|
committer | hans <hans> | 2012-03-31 21:46:55 +0000 |
commit | b2dd3a448f5d6ecb7587554a5c79f21dd8e60aed (patch) | |
tree | 21a1027161335217f4609e9a3f9a8cbb02ba5dd6 /x11 | |
parent | 862b1fb7b1baa5ecfd311ac38f91d43337d26f25 (diff) | |
download | pkgsrc-b2dd3a448f5d6ecb7587554a5c79f21dd8e60aed.tar.gz |
Restore the fixes needed to build this on SunOS.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kdelibs4/Makefile | 9 | ||||
-rw-r--r-- | x11/kdelibs4/PLIST | 3 | ||||
-rw-r--r-- | x11/kdelibs4/distinfo | 3 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-kjs_JSImmediate.h | 13 |
4 files changed, 25 insertions, 3 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 3be57b7cf7e..d07499c10b2 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2012/03/22 22:08:29 markd Exp $ +# $NetBSD: Makefile,v 1.39 2012/03/31 21:46:55 hans Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -62,6 +62,7 @@ SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/_usr/pkg/share/kde/apps/ SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::' USE_TOOLS+= flex gmake +PLIST_VARS+= kgrantpty .include "../../mk/bsd.prefs.mk" @@ -70,6 +71,12 @@ USE_TOOLS+= flex gmake DEPENDS+= zonetab-[0-9]*:../../time/zonetab .endif +.if ${OPSYS} == "SunOS" +PLIST.kgrantpty= yes +.endif + +LDFLAGS.SunOS+= -lintl + BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST index f3f12ae4f86..9cbc8bcbd33 100644 --- a/x11/kdelibs4/PLIST +++ b/x11/kdelibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2012/03/19 11:28:48 markd Exp $ +@comment $NetBSD: PLIST,v 1.10 2012/03/31 21:46:55 hans Exp $ bin/checkXML bin/kbuildsycoca4 bin/kconfig_compiler @@ -1935,6 +1935,7 @@ lib/kde4/libexec/fileshareset lib/kde4/libexec/kauth-policy-gen lib/kde4/libexec/kconf_update lib/kde4/libexec/kdesu_stub +${PLIST.kgrantpty}lib/kde4/libexec/kgrantpty lib/kde4/libexec/kio_http_cache_cleaner lib/kde4/libexec/kioslave lib/kde4/libexec/klauncher diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index f3e3b9475bc..f715555e25b 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2012/03/22 22:08:29 markd Exp $ +$NetBSD: distinfo,v 1.26 2012/03/31 21:46:55 hans Exp $ SHA1 (kdelibs-4.8.0.tar.bz2) = 5e4744405734e6c3ce572ef7d16054390692b38a RMD160 (kdelibs-4.8.0.tar.bz2) = b5fd03eec81a390ea74d4713d6459b685352d362 @@ -17,3 +17,4 @@ SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be SHA1 (patch-cmake_modules_FindXine.cmake) = 292d8e4b44367b66e3a737d2be045c2ff075e8cb SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 +SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a diff --git a/x11/kdelibs4/patches/patch-kjs_JSImmediate.h b/x11/kdelibs4/patches/patch-kjs_JSImmediate.h new file mode 100644 index 00000000000..96c0feaac0f --- /dev/null +++ b/x11/kdelibs4/patches/patch-kjs_JSImmediate.h @@ -0,0 +1,13 @@ +$NetBSD: patch-kjs_JSImmediate.h,v 1.3 2012/03/31 21:46:55 hans Exp $ + +--- kjs/JSImmediate.h.orig 2010-05-16 22:04:04.000000000 +0200 ++++ kjs/JSImmediate.h 2011-10-24 17:26:02.608429864 +0200 +@@ -33,7 +33,7 @@ + #endif + #include <stdlib.h> + +-#if PLATFORM(SOLARIS_OS) ++#if PLATFORM(SOLARIS_OS) && COMPILER(GCC) && (__GNUC__ <= 4 && __GNUC_MINOR__ < 6) + static inline int signbit(double x) + { + return (x<0.0) ? 1 : 0; |