diff options
author | 2018-03-11 17:50:58 +0100 | |
---|---|---|
committer | 2018-03-11 23:21:16 +0100 | |
commit | 44fe498c423b888cbe2c88f3776a9144e241c8c9 (patch) | |
tree | 261b870b84ede031cca2a8629deb55ce434920fa /kde-frameworks/kdelibs4support | |
parent | dev-games/openscenegraph: Drop 3.5.1 (diff) | |
download | gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.gz gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.bz2 gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.zip |
kde-frameworks: Drop KDE Frameworks 5.40.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'kde-frameworks/kdelibs4support')
3 files changed, 0 insertions, 296 deletions
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index 408f4493a632..972e72d5594d 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,3 +1,2 @@ -DIST kdelibs4support-5.40.0.tar.xz 3341884 BLAKE2B 693816728db15b9e8d28fa2c01634083d11d4b3da942fd06606eaf7715e75ac14978bb9020df37ae154e4dddf740e0672fc90f561f2d467307a24f0362bb282a SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1 DIST kdelibs4support-5.43.0.tar.xz 3343312 BLAKE2B 96a73c18df4110c4a51d78114ef8e10311429c280582bdd9e95a73c4c809157706e565ea33e14cb8f3ce595b1d13d7c8348e3212e1293896ae556bf829f2a641 SHA512 bd73459e5334a1158f68d2af2032fa9236bae303c2c45ac9c3b46ffcf46654f9175fae68222a7cfb3398642634aa21fd023f19f0318af633574f448bfab8e467 DIST kdelibs4support-5.44.0.tar.xz 3345800 BLAKE2B 29b90436748cfa290b9a341412f53f1b7c8d3f036c55e2f207f9f8a92e7f65d62e854ea136236b153ba04ff06e1c17c4971a0361ab9ff971d4b64331836d57b6 SHA512 57f48f9221f3cef5b6346a223086ce528117f00bd042c3c207c4bea8f5ce7ebf10ea6f11da88bab25539e84b778a37c35d053a867b8f973e68adbe951bb73337 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch deleted file mode 100644 index ad7cd7999672..000000000000 --- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 00cae452ac619810f311cf63d4dfd268887d30e5 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -Date: Sun, 5 Nov 2017 22:52:54 +0100 -Subject: Fix build with LibreSSL - -Summary: -Unfortunately LibreSSL sets OPENSSL_VERSION_NUMBER to -0x20000000L and doesn't support the OpenSSL 1.1 API. - -Test Plan: Builds with LibreSSL - -Reviewers: #frameworks - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D8672 ---- - src/kssl/kopenssl.cpp | 34 +++++++++++++++++----------------- - src/kssl/kopenssl.h | 2 +- - src/kssl/ksslcertificate.cpp | 2 +- - 3 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/src/kssl/kopenssl.cpp b/src/kssl/kopenssl.cpp -index c68a134..ce5f137 100644 ---- a/src/kssl/kopenssl.cpp -+++ b/src/kssl/kopenssl.cpp -@@ -81,7 +81,7 @@ extern "C" { - static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr; - static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr; - static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - static void (*K_CRYPTO_free)(void *) = nullptr; - #else - static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr; -@@ -430,7 +430,7 @@ KOpenSSLProxy::KOpenSSLProxy() - K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file"); - K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name"); - K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file"); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free"); - #else - K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free"); -@@ -485,7 +485,7 @@ KOpenSSLProxy::KOpenSSLProxy() - K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert"); - K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error"); - K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error"); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free"); - K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num"); - K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop"); -@@ -979,7 +979,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v) - - void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *)) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - X509_STORE_set_verify_cb_func(store, verify_cb); - #else - if (K_X509_STORE_set_verify_cb) { -@@ -1044,7 +1044,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a) - - void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (psig) { - *psig = x->signature; - } -@@ -1096,7 +1096,7 @@ void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, - } - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - void KOpenSSLProxy::CRYPTO_free(void *x) - { - if (K_CRYPTO_free) { -@@ -1122,7 +1122,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509) - - ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return X509_get_notBefore(x); - #else - if (K_X509_getm_notBefore) { -@@ -1135,7 +1135,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) - - ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return X509_get_notAfter(x); - #else - if (K_X509_getm_notAfter) { -@@ -1413,7 +1413,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) - - X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return v->current_cert; - #else - if (K_X509_STORE_CTX_get_current_cert) { -@@ -1426,7 +1426,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) - - void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - v->error = error; - #else - if (K_X509_STORE_CTX_set_error) { -@@ -1437,7 +1437,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) - - int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return v->error; - #else - if (K_X509_STORE_CTX_get_error) { -@@ -1894,7 +1894,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key) - - int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return pkey->type; - #else - if (K_EVP_PKEY_base_id) { -@@ -1907,7 +1907,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) - - RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return pkey->pkey.rsa; - #else - if (K_EVP_PKEY_get0_RSA) { -@@ -1920,7 +1920,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) - - void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (n) { - *n = rsa->n; - } -@@ -1939,7 +1939,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, c - - DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - return pkey->pkey.dsa; - #else - if (K_EVP_PKEY_get0_DSA) { -@@ -1952,7 +1952,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) - - void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (p) { - *p = dsa->p; - } -@@ -1971,7 +1971,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, c - - void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - if (pub_key) { - *pub_key = dsa->pub_key; - } -diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h -index 518cd5b..fa23efe 100644 ---- a/src/kssl/kopenssl.h -+++ b/src/kssl/kopenssl.h -@@ -395,7 +395,7 @@ public: - /* - * CRYPTO_free - free up an internally allocated object - */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - void CRYPTO_free(void *x); - #else - void CRYPTO_free(void *x, const char *file, int line); -diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp -index 4c96e4b..e9631fb 100644 ---- a/src/kssl/ksslcertificate.cpp -+++ b/src/kssl/ksslcertificate.cpp -@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape() - { - QByteArray qba; - // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all --#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - NETSCAPE_X509 nx; - ASN1_OCTET_STRING hdr; - QTemporaryFile ktf; --- -cgit v0.11.2 - diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild deleted file mode 100644 index 1c7a2e9cbce4..000000000000 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_QTHELP="false" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="libressl X" - -COMMON_DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdesignerplugin) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kunitconversion) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork 'ssl') - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qttest) - $(add_qt_dep qtwidgets) - app-text/docbook-xml-dtd:4.2 - virtual/libintl - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kdoctools) - $(add_qt_dep designer) - dev-lang/perl - dev-perl/URI - test? ( $(add_qt_dep qtconcurrent) ) - X? ( x11-proto/xproto ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kdoctools) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kitemmodels) - $(add_qt_dep qtxml) - !<kde-apps/kde4-l10n-16.04.3 -" - -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} |