Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 kde-frameworks/kdelibs4support/HISTORY            |    2 
 kde-frameworks/kdelibs4support/PRE_BUILD          |    1 
 kde-frameworks/kdelibs4support/patches/D8672.diff |  181 
----------------------
 kde-frameworks/plasma-framework/DEPENDS           |    1 
 kde-frameworks/plasma-framework/HISTORY           |    1 
 kde-frameworks/qqc2-desktop-style/DEPENDS         |    1 
 kde-frameworks/qqc2-desktop-style/HISTORY         |    1 
 7 files changed, 6 insertions(+), 182 deletions(-)

New commits:
commit 6be8fa55aaf96d6d12b333981026fa700f4f4dad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qqc2-desktop-style - depends kirigami2

commit bb2d0adb059c36ab01ec1ce982f066bc2931094e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    plasma-framework - depends kirigami2

commit 4ac25cc9f880699102586c425bfa607a44a040c7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kdelibs4support - remove obsolete patch

diff --git a/kde-frameworks/kdelibs4support/HISTORY 
b/kde-frameworks/kdelibs4support/HISTORY
index 0cfd1ec..f1263a7 100644
--- a/kde-frameworks/kdelibs4support/HISTORY
+++ b/kde-frameworks/kdelibs4support/HISTORY
@@ -1,5 +1,7 @@
 2018-01-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.42.0
+       * PRE_BUILD: adjust
+       * patches/*: deleted
 
 2017-12-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.41.0
diff --git a/kde-frameworks/kdelibs4support/PRE_BUILD 
b/kde-frameworks/kdelibs4support/PRE_BUILD
index bde036e..0eaa1b1 100755
--- a/kde-frameworks/kdelibs4support/PRE_BUILD
+++ b/kde-frameworks/kdelibs4support/PRE_BUILD
@@ -1,4 +1,3 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches &&
 sed -i '/FindGettext.cmake/D' cmake/modules/CMakeLists.txt
diff --git a/kde-frameworks/kdelibs4support/patches/D8672.diff 
b/kde-frameworks/kdelibs4support/patches/D8672.diff
deleted file mode 100644
index 6775006..0000000
--- a/kde-frameworks/kdelibs4support/patches/D8672.diff
+++ /dev/null
@@ -1,181 +0,0 @@
-diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h
---- a/src/kssl/kopenssl.h
-+++ b/src/kssl/kopenssl.h
-@@ -395,7 +395,7 @@
-     /*
-      *   CRYPTO_free - free up an internally allocated object
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     void CRYPTO_free(void *x);
- #else
-     void CRYPTO_free(void *x, const char *file, int line);
-diff --git a/src/kssl/kopenssl.cpp b/src/kssl/kopenssl.cpp
---- a/src/kssl/kopenssl.cpp
-+++ b/src/kssl/kopenssl.cpp
-@@ -81,7 +81,7 @@
-     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 || 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 @@
-         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 || 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 @@
-         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 || 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_set_verify_cb(X509_STORE *store, int 
(*verify_cb)(int, X509_STORE_CTX *))
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     X509_STORE_set_verify_cb_func(store, verify_cb);
- #else
-     if (K_X509_STORE_set_verify_cb) {
-@@ -1044,7 +1044,7 @@
- 
- 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 || LIBRESSL_VERSION_NUMBER
-     if (psig) {
-         *psig = x->signature;
-     }
-@@ -1096,7 +1096,7 @@
-     }
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
- void KOpenSSLProxy::CRYPTO_free(void *x)
- {
-     if (K_CRYPTO_free) {
-@@ -1122,7 +1122,7 @@
- 
- ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return X509_get_notBefore(x);
- #else
-     if (K_X509_getm_notBefore) {
-@@ -1135,7 +1135,7 @@
- 
- ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return X509_get_notAfter(x);
- #else
-     if (K_X509_getm_notAfter) {
-@@ -1413,7 +1413,7 @@
- 
- X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return v->current_cert;
- #else
-     if (K_X509_STORE_CTX_get_current_cert) {
-@@ -1426,7 +1426,7 @@
- 
- void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     v->error = error;
- #else
-     if (K_X509_STORE_CTX_set_error) {
-@@ -1437,7 +1437,7 @@
- 
- int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return v->error;
- #else
-     if (K_X509_STORE_CTX_get_error) {
-@@ -1894,7 +1894,7 @@
- 
- int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return pkey->type;
- #else
-     if (K_EVP_PKEY_base_id) {
-@@ -1907,7 +1907,7 @@
- 
- RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return pkey->pkey.rsa;
- #else
-     if (K_EVP_PKEY_get0_RSA) {
-@@ -1920,7 +1920,7 @@
- 
- 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 || LIBRESSL_VERSION_NUMBER
-     if (n) {
-         *n = rsa->n;
-     }
-@@ -1939,7 +1939,7 @@
- 
- DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-     return pkey->pkey.dsa;
- #else
-     if (K_EVP_PKEY_get0_DSA) {
-@@ -1952,7 +1952,7 @@
- 
- 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 || LIBRESSL_VERSION_NUMBER
-     if (p) {
-         *p = dsa->p;
-     }
-@@ -1971,7 +1971,7 @@
- 
- 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 || LIBRESSL_VERSION_NUMBER
-     if (pub_key) {
-         *pub_key = dsa->pub_key;
-     }
-diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp
---- a/src/kssl/ksslcertificate.cpp
-+++ b/src/kssl/ksslcertificate.cpp
-@@ -1222,7 +1222,7 @@
- {
-     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 || 
LIBRESSL_VERSION_NUMBER
-     NETSCAPE_X509 nx;
-     ASN1_OCTET_STRING hdr;
-     QTemporaryFile ktf;
-
diff --git a/kde-frameworks/plasma-framework/DEPENDS 
b/kde-frameworks/plasma-framework/DEPENDS
index c2c222b..4ad770e 100755
--- a/kde-frameworks/plasma-framework/DEPENDS
+++ b/kde-frameworks/plasma-framework/DEPENDS
@@ -20,6 +20,7 @@ depends ki18n        &&
 depends kiconthemes  &&
 depends kidletime &&
 depends kio       &&
+depends kirigami2 &&
 depends kitemmodels &&
 depends kpackage  &&
 depends kparts    &&
diff --git a/kde-frameworks/plasma-framework/HISTORY 
b/kde-frameworks/plasma-framework/HISTORY
index 144e324..15d5b3d 100644
--- a/kde-frameworks/plasma-framework/HISTORY
+++ b/kde-frameworks/plasma-framework/HISTORY
@@ -1,5 +1,6 @@
 2018-01-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.42.0
+       * DEPENDS: add  kirigami2
 
 2017-12-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.41.0
diff --git a/kde-frameworks/qqc2-desktop-style/DEPENDS 
b/kde-frameworks/qqc2-desktop-style/DEPENDS
index 07a0b06..b6ce015 100755
--- a/kde-frameworks/qqc2-desktop-style/DEPENDS
+++ b/kde-frameworks/qqc2-desktop-style/DEPENDS
@@ -1,4 +1,5 @@
 source  $GRIMOIRE/KDE5_DEPENDS  &&
 depends qtdeclarative &&
 depends pkgconfig &&
+depends kirigami2 &&
 runtime_depends qtquickcontrols2
diff --git a/kde-frameworks/qqc2-desktop-style/HISTORY 
b/kde-frameworks/qqc2-desktop-style/HISTORY
index 8cafc07..b40772f 100644
--- a/kde-frameworks/qqc2-desktop-style/HISTORY
+++ b/kde-frameworks/qqc2-desktop-style/HISTORY
@@ -1,5 +1,6 @@
 2018-01-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.42.0
+       * DEPENDS: add kirigami2
 
 2017-12-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.41.0