Thu Jan 19 08:44:11 2017 UTC ()
Update kdelibs4 to 4.14.27

bugfixes.


(markd)
diff -r1.88 -r1.89 pkgsrc/x11/kdelibs4/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/kdelibs4/distinfo
cvs diff -r1.88 -r1.89 pkgsrc/x11/kdelibs4/Makefile (switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2017/01/01 16:06:02 1.88
+++ pkgsrc/x11/kdelibs4/Makefile 2017/01/19 08:44:10 1.89
@@ -1,136 +1,135 @@ @@ -1,136 +1,135 @@
1# $NetBSD: Makefile,v 1.88 2017/01/01 16:06:02 adam Exp $ 1# $NetBSD: Makefile,v 1.89 2017/01/19 08:44:10 markd Exp $
2 2
3DISTNAME= kdelibs-4.14.15 3DISTNAME= kdelibs-4.14.27
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 4 
6CATEGORIES= x11 5CATEGORIES= x11
7COMMENT= Support libraries for the KDE integrated X11 desktop 6COMMENT= Support libraries for the KDE integrated X11 desktop
8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/} 7MASTER_SITES= ${MASTER_SITE_KDE:=applications/16.12.0/src/}
9 8
10#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 9#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
11# http://mirrors.isc.org/pub/kde/security_patches/ 10# http://mirrors.isc.org/pub/kde/security_patches/
12#PATCHFILES= post-kde-4.0.3-khtml.diff 11#PATCHFILES= post-kde-4.0.3-khtml.diff
13 12
14.include "../../meta-pkgs/kde4/Makefile.kde4" 13.include "../../meta-pkgs/kde4/Makefile.kde4"
15 14
16CONFLICTS= kdelibs-[0-9]* 15CONFLICTS= kdelibs-[0-9]*
17 16
18# BUILD_MAKE_FLAGS+= VERBOSE=1 17# BUILD_MAKE_FLAGS+= VERBOSE=1
19#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug 18#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
20 19
21CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDELibsDependencies.cmake 20CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDELibsDependencies.cmake
22CMAKE_DEPENDENCIES_REWRITE+= _KDE_build/KDELibsDependenciesInternal.cmake 21CMAKE_DEPENDENCIES_REWRITE+= _KDE_build/KDELibsDependenciesInternal.cmake
23CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt 22CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt
24 23
25CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc" 24CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc"
26CMAKE_ARGS+= -DWITH_Avahi:BOOL=off 25CMAKE_ARGS+= -DWITH_Avahi:BOOL=off
27CMAKE_ARGS+= -DWITH_Soprano:BOOL=off 26CMAKE_ARGS+= -DWITH_Soprano:BOOL=off
28CMAKE_ARGS+= -DWITH_SharedDesktopOntologies:BOOL=off 27CMAKE_ARGS+= -DWITH_SharedDesktopOntologies:BOOL=off
29 28
30CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include 29CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
31CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so 30CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
32 31
33MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus 32MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus
34CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \ 33CONF_FILES+= ${PREFIX}/share/examples/kdelibs4/applications.menu \
35 ${PKG_SYSCONFDIR}/xdg/menus/applications.menu 34 ${PKG_SYSCONFDIR}/xdg/menus/applications.menu
36CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \ 35CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \
37 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf 36 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf
38 37
39DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml 38DEPENDS+= docbook-xml>=4.2:../../textproc/docbook-xml
40DEPENDS+= docbook-xsl>=1.75:../../textproc/docbook-xsl 39DEPENDS+= docbook-xsl>=1.75:../../textproc/docbook-xsl
41 40
42INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8 41INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
43 42
44REPLACE_PERL+= \ 43REPLACE_PERL+= \
45 kio/proxytype.pl \ 44 kio/proxytype.pl \
46 kio/useragent.pl \ 45 kio/useragent.pl \
47 kio/misc/fileshareset \ 46 kio/misc/fileshareset \
48 kioslave/http/kcookiejar/kcookiescfg.pl \ 47 kioslave/http/kcookiejar/kcookiescfg.pl \
49 kdeui/preparetips \ 48 kdeui/preparetips \
50 plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl 49 plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl
51 50
52CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh 51CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh
53 52
54SUBST_CLASSES+= kdelibsfix 53SUBST_CLASSES+= kdelibsfix
55SUBST_STAGE.kdelibsfix= pre-configure 54SUBST_STAGE.kdelibsfix= pre-configure
56SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths. 55SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths.
57SUBST_FILES.kdelibsfix= kde3support/kdeui/k3sconfig.cpp 56SUBST_FILES.kdelibsfix= kde3support/kdeui/k3sconfig.cpp
58SUBST_FILES.kdelibsfix+= kio/kssl/kopenssl.cpp 57SUBST_FILES.kdelibsfix+= kio/kssl/kopenssl.cpp
59SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' 58SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g'
60 59
61# Avoid the WRKDIR path in the installed cmake file 60# Avoid the WRKDIR path in the installed cmake file
62SUBST_CLASSES+= phononrelpath 61SUBST_CLASSES+= phononrelpath
63SUBST_STAGE.phononrelpath= post-configure 62SUBST_STAGE.phononrelpath= post-configure
64SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path 63SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path
65SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake 64SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake
66SUBST_FILES.phononrelpath+= _KDE_build/experimental/libkdeclarative/CMakeFiles/Export/${LOCALBASE:S^/^_^}/lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET_NAME}.cmake 65SUBST_FILES.phononrelpath+= _KDE_build/experimental/libkdeclarative/CMakeFiles/Export/${LOCALBASE:S^/^_^}/lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET_NAME}.cmake
67SUBST_SED.phononrelpath= -e 's:${BUILDLINK_DIR}:${PREFIX}:' 66SUBST_SED.phononrelpath= -e 's:${BUILDLINK_DIR}:${PREFIX}:'
68 67
69USE_TOOLS+= flex gmake 68USE_TOOLS+= flex gmake
70PLIST_VARS+= kgrantpty mac notmac 69PLIST_VARS+= kgrantpty mac notmac
71 70
72.include "../../mk/bsd.prefs.mk" 71.include "../../mk/bsd.prefs.mk"
73 72
74.if ${OPSYS} == "Darwin" 73.if ${OPSYS} == "Darwin"
75PLIST.mac= yes 74PLIST.mac= yes
76.else 75.else
77PLIST.notmac= yes 76PLIST.notmac= yes
78.endif 77.endif
79 78
80.if ${OPSYS} == "NetBSD" 79.if ${OPSYS} == "NetBSD"
81# make sure zone.tab is installed 80# make sure zone.tab is installed
82DEPENDS+= zonetab-[0-9]*:../../time/zonetab 81DEPENDS+= zonetab-[0-9]*:../../time/zonetab
83.endif 82.endif
84 83
85.if ${OPSYS} == "SunOS" 84.if ${OPSYS} == "SunOS"
86PLIST.kgrantpty= yes 85PLIST.kgrantpty= yes
87.endif 86.endif
88 87
89CFLAGS.SunOS+= -D__EXTENSIONS__ 88CFLAGS.SunOS+= -D__EXTENSIONS__
90LDFLAGS.SunOS+= -lintl 89LDFLAGS.SunOS+= -lintl
91 90
92# jasper uses SIZE_MAX and friends in its headers. 91# jasper uses SIZE_MAX and friends in its headers.
93CXXFLAGS+= -D__STDC_LIMIT_MACROS 92CXXFLAGS+= -D__STDC_LIMIT_MACROS
94 93
95BUILDLINK_DEPMETHOD.qt4-tools= full 94BUILDLINK_DEPMETHOD.qt4-tools= full
96.include "../../meta-pkgs/kde4/kde4.mk" 95.include "../../meta-pkgs/kde4/kde4.mk"
97 96
98BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 97BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
99#BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60 98#BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60
100#BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0 99#BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0
101 100
102.include "../../archivers/bzip2/buildlink3.mk" 101.include "../../archivers/bzip2/buildlink3.mk"
103.include "../../archivers/xz/buildlink3.mk" 102.include "../../archivers/xz/buildlink3.mk"
104.include "../../sysutils/strigi/buildlink3.mk" 103.include "../../sysutils/strigi/buildlink3.mk"
105#.include "../../textproc/soprano/buildlink3.mk" 104#.include "../../textproc/soprano/buildlink3.mk"
106.include "../../databases/shared-mime-info/buildlink3.mk" 105.include "../../databases/shared-mime-info/buildlink3.mk"
107.include "../../devel/grantlee/buildlink3.mk" 106.include "../../devel/grantlee/buildlink3.mk"
108.include "../../devel/libdbusmenu-qt/buildlink3.mk" 107.include "../../devel/libdbusmenu-qt/buildlink3.mk"
109.include "../../devel/pcre/buildlink3.mk" 108.include "../../devel/pcre/buildlink3.mk"
110.include "../../devel/zlib/buildlink3.mk" 109.include "../../devel/zlib/buildlink3.mk"
111.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 110.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
112.include "../../graphics/jasper/buildlink3.mk" 111.include "../../graphics/jasper/buildlink3.mk"
113.include "../../mk/jpeg.buildlink3.mk" 112.include "../../mk/jpeg.buildlink3.mk"
114.include "../../graphics/giflib/buildlink3.mk" 113.include "../../graphics/giflib/buildlink3.mk"
115.include "../../graphics/openexr/buildlink3.mk" 114.include "../../graphics/openexr/buildlink3.mk"
116.include "../../misc/attica/buildlink3.mk" 115.include "../../misc/attica/buildlink3.mk"
117.include "../../multimedia/phonon/buildlink3.mk" 116.include "../../multimedia/phonon/buildlink3.mk"
118 117
119# Avahi ? rather than mDNSResponder 118# Avahi ? rather than mDNSResponder
120.include "../../net/mDNSResponder/buildlink3.mk" 119.include "../../net/mDNSResponder/buildlink3.mk"
121.include "../../security/openssl/buildlink3.mk" 120.include "../../security/openssl/buildlink3.mk"
122.include "../../security/polkit-qt/buildlink3.mk" 121.include "../../security/polkit-qt/buildlink3.mk"
123.include "../../security/qca2/buildlink3.mk" 122.include "../../security/qca2/buildlink3.mk"
124.include "../../mk/fam.buildlink3.mk" 123.include "../../mk/fam.buildlink3.mk"
125.include "../../textproc/aspell/buildlink3.mk" 124.include "../../textproc/aspell/buildlink3.mk"
126.include "../../textproc/enchant/buildlink3.mk" 125.include "../../textproc/enchant/buildlink3.mk"
127.include "../../textproc/libxml2/buildlink3.mk" 126.include "../../textproc/libxml2/buildlink3.mk"
128.include "../../textproc/libxslt/buildlink3.mk" 127.include "../../textproc/libxslt/buildlink3.mk"
129#.include "../../textproc/shared-desktop-ontologies/buildlink3.mk" 128#.include "../../textproc/shared-desktop-ontologies/buildlink3.mk"
130.include "../../x11/libXScrnSaver/buildlink3.mk" 129.include "../../x11/libXScrnSaver/buildlink3.mk"
131.include "../../x11/libXinerama/buildlink3.mk" 130.include "../../x11/libXinerama/buildlink3.mk"
132.include "../../x11/libXpm/buildlink3.mk" 131.include "../../x11/libXpm/buildlink3.mk"
133.include "../../x11/libXtst/buildlink3.mk" 132.include "../../x11/libXtst/buildlink3.mk"
134.include "../../mk/krb5.buildlink3.mk" 133.include "../../mk/krb5.buildlink3.mk"
135.include "../../sysutils/desktop-file-utils/desktopdb.mk" 134.include "../../sysutils/desktop-file-utils/desktopdb.mk"
136.include "../../mk/bsd.pkg.mk" 135.include "../../mk/bsd.pkg.mk"
cvs diff -r1.48 -r1.49 pkgsrc/x11/kdelibs4/distinfo (switch to unified diff)

--- pkgsrc/x11/kdelibs4/distinfo 2016/02/18 23:24:45 1.48
+++ pkgsrc/x11/kdelibs4/distinfo 2017/01/19 08:44:10 1.49
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: distinfo,v 1.48 2016/02/18 23:24:45 jperkin Exp $ 1$NetBSD: distinfo,v 1.49 2017/01/19 08:44:10 markd Exp $
2 2
3SHA1 (kdelibs-4.14.15.tar.xz) = 7a50824fbcd2a4a72c8780da7b1425b038415419 3SHA1 (kdelibs-4.14.27.tar.xz) = e7aaf7e11151eed4309ffff9a5a6b033b04819f5
4RMD160 (kdelibs-4.14.15.tar.xz) = f56c85a572817c344ef3897512385c125a9046ac 4RMD160 (kdelibs-4.14.27.tar.xz) = 3a91207a8db272fa0a92e843fdc09eeef16303f4
5SHA512 (kdelibs-4.14.15.tar.xz) = a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df 5SHA512 (kdelibs-4.14.27.tar.xz) = 52a76c6e5cb8366bf353a1eee8286f4165fcdf962ac0da5545a96e066bb513a9eedbbacd7ee6981d9034e08a84f795c68d26fa2f02774938ac1a4971a8a18427
6Size (kdelibs-4.14.15.tar.xz) = 11633836 bytes 6Size (kdelibs-4.14.27.tar.xz) = 11641732 bytes
7SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4 7SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
8SHA1 (patch-aa) = 86c801869ba1fd2608256519cc92088225c4dafc 8SHA1 (patch-aa) = 86c801869ba1fd2608256519cc92088225c4dafc
9SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae 9SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
10SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505 10SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
11SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976 11SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976
12SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd 12SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd
13SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f 13SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
14SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 14SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
15SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 15SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
16SHA1 (patch-al) = 20212d740191a699f7aa35db8c23a3b3cb55904e 16SHA1 (patch-al) = 20212d740191a699f7aa35db8c23a3b3cb55904e
17SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 17SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
18SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = becfce89d45fd9b70c2ca08a83ca0e650004996a 18SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = becfce89d45fd9b70c2ca08a83ca0e650004996a
19SHA1 (patch-kdecore_io_kdirwatch__p.h) = 3c14e26f3962743f7d450e2a5ea2df43bc7524b5 19SHA1 (patch-kdecore_io_kdirwatch__p.h) = 3c14e26f3962743f7d450e2a5ea2df43bc7524b5
20SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 20SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
21SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 21SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
22SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f 22SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
23SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 23SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
24SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364 24SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364
25SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a 25SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
26SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241 26SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
27SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2 27SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
28SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 28SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8