Sat Mar 31 21:46:55 2012 UTC ()
Restore the fixes needed to build this on SunOS.


(hans)
diff -r1.38 -r1.39 pkgsrc/x11/kdelibs4/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/kdelibs4/PLIST
diff -r1.25 -r1.26 pkgsrc/x11/kdelibs4/distinfo
diff -r0 -r1.3 pkgsrc/x11/kdelibs4/patches/patch-kjs_JSImmediate.h
cvs diff -r1.38 -r1.39 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2012/03/22 22:08:29 1.38
+++ pkgsrc/x11/kdelibs4/Makefile 2012/03/31 21:46:55 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.38 2012/03/22 22:08:29 markd Exp $ 1# $NetBSD: Makefile,v 1.39 2012/03/31 21:46:55 hans Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Support libraries for the KDE integrated X11 desktop 7COMMENT= Support libraries for the KDE integrated X11 desktop
8 8
9#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 9#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
10# http://mirrors.isc.org/pub/kde/security_patches/ 10# http://mirrors.isc.org/pub/kde/security_patches/
11#PATCHFILES= post-kde-4.0.3-khtml.diff 11#PATCHFILES= post-kde-4.0.3-khtml.diff
12 12
13.include "../../meta-pkgs/kde4/Makefile.kde4" 13.include "../../meta-pkgs/kde4/Makefile.kde4"
14 14
@@ -52,34 +52,41 @@ SUBST_MESSAGE.kdelibsfix= Fixing hardcod @@ -52,34 +52,41 @@ SUBST_MESSAGE.kdelibsfix= Fixing hardcod
52SUBST_FILES.kdelibsfix= \ 52SUBST_FILES.kdelibsfix= \
53 kde3support/kdeui/k3sconfig.cpp \ 53 kde3support/kdeui/k3sconfig.cpp \
54 kio/kssl/kopenssl.cpp 54 kio/kssl/kopenssl.cpp
55SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' 55SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g'
56 56
57# XXX this is an ugly hack to avoid the WRKDIR path in the installed cmake file 57# XXX this is an ugly hack to avoid the WRKDIR path in the installed cmake file
58SUBST_CLASSES+= phononrelpath 58SUBST_CLASSES+= phononrelpath
59SUBST_STAGE.phononrelpath= post-configure 59SUBST_STAGE.phononrelpath= post-configure
60SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path 60SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path
61SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/_usr/pkg/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake 61SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/_usr/pkg/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake
62SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::' 62SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::'
63 63
64USE_TOOLS+= flex gmake 64USE_TOOLS+= flex gmake
 65PLIST_VARS+= kgrantpty
65 66
66.include "../../mk/bsd.prefs.mk" 67.include "../../mk/bsd.prefs.mk"
67 68
68.if ${OPSYS} == "NetBSD" 69.if ${OPSYS} == "NetBSD"
69# make sure zone.tab is installed 70# make sure zone.tab is installed
70DEPENDS+= zonetab-[0-9]*:../../time/zonetab 71DEPENDS+= zonetab-[0-9]*:../../time/zonetab
71.endif 72.endif
72 73
 74.if ${OPSYS} == "SunOS"
 75PLIST.kgrantpty= yes
 76.endif
 77
 78LDFLAGS.SunOS+= -lintl
 79
73BUILDLINK_DEPMETHOD.qt4-tools= full 80BUILDLINK_DEPMETHOD.qt4-tools= full
74.include "../../meta-pkgs/kde4/kde4.mk" 81.include "../../meta-pkgs/kde4/kde4.mk"
75 82
76BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 83BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
77BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60 84BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60
78BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.6.5 85BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.6.5
79 86
80.include "../../archivers/bzip2/buildlink3.mk" 87.include "../../archivers/bzip2/buildlink3.mk"
81.include "../../archivers/xz/buildlink3.mk" 88.include "../../archivers/xz/buildlink3.mk"
82.include "../../sysutils/strigi/buildlink3.mk" 89.include "../../sysutils/strigi/buildlink3.mk"
83.include "../../textproc/soprano/buildlink3.mk" 90.include "../../textproc/soprano/buildlink3.mk"
84.include "../../databases/shared-mime-info/buildlink3.mk" 91.include "../../databases/shared-mime-info/buildlink3.mk"
85.include "../../devel/libdbusmenu-qt/buildlink3.mk" 92.include "../../devel/libdbusmenu-qt/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/x11/kdelibs4/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/PLIST 2012/03/19 11:28:48 1.9
+++ pkgsrc/x11/kdelibs4/PLIST 2012/03/31 21:46:55 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2012/03/19 11:28:48 markd Exp $ 1@comment $NetBSD: PLIST,v 1.10 2012/03/31 21:46:55 hans Exp $
2bin/checkXML 2bin/checkXML
3bin/kbuildsycoca4 3bin/kbuildsycoca4
4bin/kconfig_compiler 4bin/kconfig_compiler
5bin/kcookiejar4 5bin/kcookiejar4
6bin/kde4-config 6bin/kde4-config
7bin/kded4 7bin/kded4
8bin/kdeinit4 8bin/kdeinit4
9bin/kdeinit4_shutdown 9bin/kdeinit4_shutdown
10bin/kdeinit4_wrapper 10bin/kdeinit4_wrapper
11bin/kfilemetadatareader 11bin/kfilemetadatareader
12bin/kjs 12bin/kjs
13bin/kjscmd 13bin/kjscmd
14bin/kross 14bin/kross
@@ -1925,26 +1925,27 @@ lib/kde4/kio_metainfo.so @@ -1925,26 +1925,27 @@ lib/kde4/kio_metainfo.so
1925lib/kde4/kjavaappletviewer.so 1925lib/kde4/kjavaappletviewer.so
1926lib/kde4/krosskjs.so 1926lib/kde4/krosskjs.so
1927lib/kde4/krossmoduleforms.so 1927lib/kde4/krossmoduleforms.so
1928lib/kde4/krossmodulekdetranslation.so 1928lib/kde4/krossmodulekdetranslation.so
1929lib/kde4/krossqts.so 1929lib/kde4/krossqts.so
1930lib/kde4/kspell_aspell.so 1930lib/kde4/kspell_aspell.so
1931lib/kde4/kspell_enchant.so 1931lib/kde4/kspell_enchant.so
1932lib/kde4/ktranscript.so 1932lib/kde4/ktranscript.so
1933lib/kde4/libexec/filesharelist 1933lib/kde4/libexec/filesharelist
1934lib/kde4/libexec/fileshareset 1934lib/kde4/libexec/fileshareset
1935lib/kde4/libexec/kauth-policy-gen 1935lib/kde4/libexec/kauth-policy-gen
1936lib/kde4/libexec/kconf_update 1936lib/kde4/libexec/kconf_update
1937lib/kde4/libexec/kdesu_stub 1937lib/kde4/libexec/kdesu_stub
 1938${PLIST.kgrantpty}lib/kde4/libexec/kgrantpty
1938lib/kde4/libexec/kio_http_cache_cleaner 1939lib/kde4/libexec/kio_http_cache_cleaner
1939lib/kde4/libexec/kioslave 1940lib/kde4/libexec/kioslave
1940lib/kde4/libexec/klauncher 1941lib/kde4/libexec/klauncher
1941lib/kde4/libexec/kmailservice 1942lib/kde4/libexec/kmailservice
1942lib/kde4/libexec/kpac_dhcp_helper 1943lib/kde4/libexec/kpac_dhcp_helper
1943lib/kde4/libexec/ksendbugmail 1944lib/kde4/libexec/ksendbugmail
1944lib/kde4/libexec/ktelnetservice 1945lib/kde4/libexec/ktelnetservice
1945lib/kde4/libexec/lnusertemp 1946lib/kde4/libexec/lnusertemp
1946lib/kde4/libexec/start_kdeinit 1947lib/kde4/libexec/start_kdeinit
1947lib/kde4/libexec/start_kdeinit_wrapper 1948lib/kde4/libexec/start_kdeinit_wrapper
1948lib/kde4/libkhtmlpart.so 1949lib/kde4/libkhtmlpart.so
1949lib/kde4/libkmultipart.so 1950lib/kde4/libkmultipart.so
1950lib/kde4/notepadpart.so 1951lib/kde4/notepadpart.so
cvs diff -r1.25 -r1.26 pkgsrc/x11/kdelibs4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/distinfo 2012/03/22 22:08:29 1.25
+++ pkgsrc/x11/kdelibs4/distinfo 2012/03/31 21:46:55 1.26
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.25 2012/03/22 22:08:29 markd Exp $ 1$NetBSD: distinfo,v 1.26 2012/03/31 21:46:55 hans Exp $
2 2
3SHA1 (kdelibs-4.8.0.tar.bz2) = 5e4744405734e6c3ce572ef7d16054390692b38a 3SHA1 (kdelibs-4.8.0.tar.bz2) = 5e4744405734e6c3ce572ef7d16054390692b38a
4RMD160 (kdelibs-4.8.0.tar.bz2) = b5fd03eec81a390ea74d4713d6459b685352d362 4RMD160 (kdelibs-4.8.0.tar.bz2) = b5fd03eec81a390ea74d4713d6459b685352d362
5Size (kdelibs-4.8.0.tar.bz2) = 13044553 bytes 5Size (kdelibs-4.8.0.tar.bz2) = 13044553 bytes
6SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d 6SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
7SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae 7SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
8SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505 8SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
9SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976 9SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976
10SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd 10SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd
11SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f 11SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
12SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 12SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
13SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 13SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
14SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f 14SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
15SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 15SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
16SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4 16SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
17SHA1 (patch-cmake_modules_FindXine.cmake) = 292d8e4b44367b66e3a737d2be045c2ff075e8cb 17SHA1 (patch-cmake_modules_FindXine.cmake) = 292d8e4b44367b66e3a737d2be045c2ff075e8cb
18SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 18SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
19SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 19SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 20SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
File Added: pkgsrc/x11/kdelibs4/patches/patch-kjs_JSImmediate.h
$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;