pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/kdelibs4 kdelibs4: update to 4.14.38
details: https://anonhg.NetBSD.org/pkgsrc/rev/f433361f6318
branches: trunk
changeset: 374165:f433361f6318
user: markd <markd%pkgsrc.org@localhost>
date: Wed Jan 17 18:53:25 2018 +0000
description:
kdelibs4: update to 4.14.38
Bugfixes and add support for openssl 1.1
diffstat:
x11/kdelibs4/Makefile | 7 +-
x11/kdelibs4/distinfo | 21 +-
x11/kdelibs4/patches/patch-ac | 195 -
x11/kdelibs4/patches/patch-kdeui_CMakeLists.txt | 16 -
x11/kdelibs4/patches/patch-khtml_dom_dom2_traversal.h | 15 +
x11/kdelibs4/patches/patch-kio_CMakeLists.txt | 14 +
x11/kdelibs4/patches/patch-kio_kssl_kopenssl.cpp | 2120 +++++++++++++++
x11/kdelibs4/patches/patch-kio_kssl_kopenssl.h | 1623 +++++++++++
x11/kdelibs4/patches/patch-kio_kssl_kssl.cpp | 15 +
x11/kdelibs4/patches/patch-kio_kssl_ksslcallback.c | 35 +
x11/kdelibs4/patches/patch-kio_kssl_ksslcertchain.cpp | 23 +
x11/kdelibs4/patches/patch-kio_kssl_ksslcertificate.cpp | 247 +
x11/kdelibs4/patches/patch-kio_kssl_ksslutils.cpp | 15 +
13 files changed, 4124 insertions(+), 222 deletions(-)
diffs (truncated from 4420 to 300 lines):
diff -r a4d747403716 -r f433361f6318 x11/kdelibs4/Makefile
--- a/x11/kdelibs4/Makefile Wed Jan 17 18:48:26 2018 +0000
+++ b/x11/kdelibs4/Makefile Wed Jan 17 18:53:25 2018 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.92 2018/01/01 21:18:13 adam Exp $
+# $NetBSD: Makefile,v 1.93 2018/01/17 18:53:25 markd Exp $
-DISTNAME= kdelibs-4.14.27
+DISTNAME= kdelibs-4.14.38
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 3
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
-MASTER_SITES= ${MASTER_SITE_KDE:=applications/16.12.0/src/}
+MASTER_SITES= ${MASTER_SITE_KDE:=applications/17.08.3/src/}
#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
# http://mirrors.isc.org/pub/kde/security_patches/
diff -r a4d747403716 -r f433361f6318 x11/kdelibs4/distinfo
--- a/x11/kdelibs4/distinfo Wed Jan 17 18:48:26 2018 +0000
+++ b/x11/kdelibs4/distinfo Wed Jan 17 18:53:25 2018 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.50 2017/07/22 13:40:54 maya Exp $
+$NetBSD: distinfo,v 1.51 2018/01/17 18:53:25 markd Exp $
-SHA1 (kdelibs-4.14.27.tar.xz) = e7aaf7e11151eed4309ffff9a5a6b033b04819f5
-RMD160 (kdelibs-4.14.27.tar.xz) = 3a91207a8db272fa0a92e843fdc09eeef16303f4
-SHA512 (kdelibs-4.14.27.tar.xz) = 52a76c6e5cb8366bf353a1eee8286f4165fcdf962ac0da5545a96e066bb513a9eedbbacd7ee6981d9034e08a84f795c68d26fa2f02774938ac1a4971a8a18427
-Size (kdelibs-4.14.27.tar.xz) = 11641732 bytes
+SHA1 (kdelibs-4.14.38.tar.xz) = 2271f8b38cd5b6b55fa31c567271e3ca37ef641a
+RMD160 (kdelibs-4.14.38.tar.xz) = edf16e14842237950655bf44c073070c5bb7d74b
+SHA512 (kdelibs-4.14.38.tar.xz) = 54fbbb9b2f12a47d5aca21c152164ed03cc6a6619bf285e2b93c8e9260042ffd728ef41e1badb217e552de6478687cab5d3caf14af7b32da8caca3468d469e45
+Size (kdelibs-4.14.38.tar.xz) = 11644900 bytes
SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
SHA1 (patch-aa) = 86c801869ba1fd2608256519cc92088225c4dafc
SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
-SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976
SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd
SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
@@ -21,8 +20,16 @@
SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
-SHA1 (patch-kdeui_CMakeLists.txt) = 66ebec96997d0c65254bbd3aa31eb4fce11f6d6a
+SHA1 (patch-khtml_dom_dom2_traversal.h) = b001fc3825fcfea8f25b7219057e59d5b87723e4
SHA1 (patch-kinit_CMakeLists.txt) = bcbf273d79702a4f1a617df0c86c2d5771447364
+SHA1 (patch-kio_CMakeLists.txt) = 3033fe7d31555e83f197f889cf1aa15949a3c14e
+SHA1 (patch-kio_kssl_kopenssl.cpp) = 4d9319966f4be0b8c09501105f7664481af2834e
+SHA1 (patch-kio_kssl_kopenssl.h) = c6f27f3a8911929684d62cc96849b6171e2ade8c
+SHA1 (patch-kio_kssl_kssl.cpp) = b5ff02a2a96e667096143fec9e681cb2980aa7e3
+SHA1 (patch-kio_kssl_ksslcallback.c) = f9d74b19e365ad11c7eab6706019b4631e42598a
+SHA1 (patch-kio_kssl_ksslcertchain.cpp) = f26c2d4ac8a3a107ad5a06b71df4fd9a244fdfe5
+SHA1 (patch-kio_kssl_ksslcertificate.cpp) = 177546af1bf2a770d7bb6650f7a4a1dca6f8f716
+SHA1 (patch-kio_kssl_ksslutils.cpp) = 359075855a8582693e5e4fab9aa5ad5afbe7b4a1
SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
diff -r a4d747403716 -r f433361f6318 x11/kdelibs4/patches/patch-ac
--- a/x11/kdelibs4/patches/patch-ac Wed Jan 17 18:48:26 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2012/03/19 11:28:49 markd Exp $
-
---- kio/kssl/kopenssl.cpp.orig 2011-04-01 13:55:51.000000000 +0000
-+++ kio/kssl/kopenssl.cpp
-@@ -236,7 +236,7 @@ void KOpenSSLProxy::destroy() {
- delete x;
- }
-
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <QtCore/QDir>
- #include <QtCore/QString>
- #include <QtCore/QStringList>
-@@ -259,10 +259,20 @@ static QString findMostRecentLib(QString
- for (QStringList::const_iterator it = l.begin(); it != l.end(); ++it) {
- QString numberpart = (*it).mid(s);
- uint endmaj = numberpart.indexOf('.');
-- if (endmaj == -1)
-- continue;
- bool ok;
-- int maj = numberpart.left(endmaj).toInt(&ok);
-+ int maj;
-+ if (endmaj == -1) {
-+ int maj = numberpart.toInt(&ok);
-+ if (!ok)
-+ continue;
-+ if (maj <= bestmaj)
-+ continue;
-+ bestmaj = maj;
-+ bestmin = -1;
-+ best = (*it);
-+ continue;
-+ }
-+ maj = numberpart.left(endmaj).toInt(&ok);
- if (!ok)
- continue;
- int min = numberpart.mid(endmaj+1).toInt(&ok);
-@@ -295,49 +305,23 @@ KOpenSSLProxy::KOpenSSLProxy()
- if (!upath.isEmpty())
- libpaths << upath;
-
--#ifdef Q_OS_WIN
-- d->cryptoLib = new KLibrary("libeay32.dll");
-- if (!d->cryptoLib->load()) {
-- delete d->cryptoLib;
-- d->cryptoLib = 0;
-- }
--#elif defined(__OpenBSD__)
-- {
-- QString libname = findMostRecentLib("/usr/lib" KDELIBSUFF, "crypto");
-- if (!libname.isNull()) {
-- d->cryptoLib = new KLibrary(libname);
-- d->cryptoLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-- if (!d->cryptoLib->load()) {
-- delete d->cryptoLib;
-- d->cryptoLib = 0;
-- }
-- }
-- }
--#elif defined(__CYGWIN__)
-- libpaths << "/usr/bin/"
-- << "";
--
-- libnamess << "cygssl-0.9.8.dll"
-- << "cygssl-0.9.7.dll"
-- << "";
--
-- libnamesc << "cygcrypto-0.9.8.dll"
-- << "cygcrypto-0.9.7.dll"
-- << "";
--#else
- libpaths
-- #ifdef _AIX
-+#ifdef _AIX
- << "/opt/freeware/lib/"
-- #endif
-+#endif
- << "/usr/lib" KDELIBSUFF "/"
-+ << "/usr/pkg/lib/"
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
- << "/usr/ssl/lib" KDELIBSUFF "/"
- << "/usr/local/lib" KDELIBSUFF "/"
- << "/usr/local/openssl/lib" KDELIBSUFF "/"
- << "/usr/local/ssl/lib" KDELIBSUFF "/"
- << "/opt/openssl/lib" KDELIBSUFF "/"
- << "/lib" KDELIBSUFF "/"
-+#endif
- << "";
-
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
- // FIXME: #define here for the various OS types to optimize
- libnamess
- #ifdef hpux
-@@ -352,8 +336,12 @@ KOpenSSLProxy::KOpenSSLProxy()
- << "libssl.so." SHLIB_VERSION_NUMBER
- #endif
- << "libssl.so"
-+ #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ << "libssl.so.1"
-+ #else
- << "libssl.so.0"
- #endif
-+ #endif
- ;
-
- libnamesc
-@@ -369,7 +357,11 @@ KOpenSSLProxy::KOpenSSLProxy()
- << "libcrypto.so." SHLIB_VERSION_NUMBER
- #endif
- << "libcrypto.so"
-+ #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ << "libcrypto.so.1"
-+ #else
- << "libcrypto.so.0"
-+ #endif
- #endif
- ;
- #endif
-@@ -377,6 +369,17 @@ KOpenSSLProxy::KOpenSSLProxy()
- for (QStringList::const_iterator it = libpaths.constBegin();
- it != libpaths.constEnd();
- ++it) {
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+ QString libname = findMostRecentLib(*it, "crypto");
-+ if (!libname.isNull()) {
-+ d->cryptoLib = new KLibrary(libname);
-+ d->cryptoLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-+ if (!d->cryptoLib->load()) {
-+ delete d->cryptoLib;
-+ d->cryptoLib = 0;
-+ }
-+ }
-+#else
- for (QStringList::const_iterator shit = libnamesc.constBegin();
- shit != libnamesc.constEnd();
- ++shit) {
-@@ -399,6 +402,7 @@ KOpenSSLProxy::KOpenSSLProxy()
- d->cryptoLib = 0;
- }
- }
-+#endif
- if (d->cryptoLib) break;
- }
-
-@@ -528,28 +532,20 @@ KOpenSSLProxy::KOpenSSLProxy()
- #endif
- }
-
--#ifdef Q_OS_WIN
-- d->sslLib = new KLibrary("ssleay32.dll");
-- if (!d->sslLib->load()) {
-- delete d->sslLib;
-- d->sslLib = 0;
-- }
--#elif defined(__OpenBSD__)
-- {
-- QString libname = findMostRecentLib("/usr/lib", "ssl");
-- if (!libname.isNull()) {
-- d->sslLib = new KLibrary(libname);
-- d->sslLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-- if (!d->sslLib->load()) {
-- delete d->sslLib;
-- d->sslLib = 0;
-- }
-- }
-- }
--#else
- for (QStringList::const_iterator it = libpaths.constBegin();
- it != libpaths.constEnd();
- ++it) {
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+ QString libname = findMostRecentLib(*it, "ssl");
-+ if (!libname.isNull()) {
-+ d->sslLib = new KLibrary(libname);
-+ d->sslLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
-+ if (!d->sslLib->load()) {
-+ delete d->sslLib;
-+ d->sslLib = 0;
-+ }
-+ }
-+#else
- for (QStringList::const_iterator shit = libnamess.constBegin();
- shit != libnamess.constEnd();
- ++shit) {
-@@ -571,9 +567,9 @@ KOpenSSLProxy::KOpenSSLProxy()
- d->sslLib = 0;
- }
- }
-+#endif
- if (d->sslLib) break;
- }
--#endif
-
- if (d->sslLib) {
- #ifdef KSSL_HAVE_SSL
diff -r a4d747403716 -r f433361f6318 x11/kdelibs4/patches/patch-kdeui_CMakeLists.txt
--- a/x11/kdelibs4/patches/patch-kdeui_CMakeLists.txt Wed Jan 17 18:48:26 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-kdeui_CMakeLists.txt,v 1.1 2017/07/22 13:40:54 maya Exp $
-
-fix copy paste error, duplicate else case
-fails with cmake 3.9.0
-
---- kdeui/CMakeLists.txt.orig 2016-12-08 18:44:10.000000000 +0000
-+++ kdeui/CMakeLists.txt
-@@ -313,8 +313,6 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
- add_definitions(-DMAC_USE_OSXKEYCHAIN)
- else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
--else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
-- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp)
- endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN)
-
- if(NOT WINCE)
diff -r a4d747403716 -r f433361f6318 x11/kdelibs4/patches/patch-khtml_dom_dom2_traversal.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs4/patches/patch-khtml_dom_dom2_traversal.h Wed Jan 17 18:53:25 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-khtml_dom_dom2_traversal.h,v 1.1 2018/01/17 18:53:25 markd Exp $
+
+Build with gcc6 - from ArchLinux
+
+--- khtml/dom/dom2_traversal.h.orig 2015-12-08 15:49:30.000000000 +0000
++++ khtml/dom/dom2_traversal.h
+@@ -214,7 +214,7 @@ public:
+ *
+ */
+ enum ShowCode {
+- SHOW_ALL = 0xFFFFFFFF,
++ SHOW_ALL = (int)0xFFFFFFFF,
+ SHOW_ELEMENT = 0x00000001,
+ SHOW_ATTRIBUTE = 0x00000002,
+ SHOW_TEXT = 0x00000004,
diff -r a4d747403716 -r f433361f6318 x11/kdelibs4/patches/patch-kio_CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs4/patches/patch-kio_CMakeLists.txt Wed Jan 17 18:53:25 2018 +0000
@@ -0,0 +1,14 @@
Home |
Main Index |
Thread Index |
Old Index