kdelibs4support: update to 5.96.0.

This commit is contained in:
John 2022-06-13 08:56:32 +02:00
parent 7ac05a01d0
commit 58f884e41c
4 changed files with 14 additions and 84 deletions

View File

@ -0,0 +1,12 @@
--- a/autotests/klocaletest.cpp
+++ b/autotests/klocaletest.cpp
@@ -20,6 +20,8 @@
#include "klocaletest.h"
#include <QTest>
+#include <sys/reg.h>
+
#include "klocale.h"
#include "klocale_p.h"
#include "kconfiggroup.h"

View File

@ -1,71 +0,0 @@
--- a/src/kssl/ksslcertificate.cpp 2017-11-05 01:28:12.000000000 -0700
+++ b/src/kssl/ksslcertificate.cpp 2017-11-13 01:45:27.716000000 -0700
@@ -168,7 +168,7 @@
return rc;
}
rc = t;
- d->kossl->OPENSSL_free(t);
+ d->kossl->OPENSSL_sk_free(t);
#endif
return rc;
}
@@ -356,12 +356,12 @@
rc += x[i];
}
rc += '\n';
- d->kossl->OPENSSL_free(x);
+ d->kossl->OPENSSL_sk_free(x);
x = d->kossl->BN_bn2hex(e);
rc += i18n("Exponent: 0x") + QLatin1String(x) +
QLatin1String("\n");
- d->kossl->OPENSSL_free(x);
+ d->kossl->OPENSSL_sk_free(x);
}
#endif
#ifndef NO_DSA
@@ -383,7 +383,7 @@
rc += x[i];
}
rc += '\n';
- d->kossl->OPENSSL_free(x);
+ d->kossl->OPENSSL_sk_free(x);
x = d->kossl->BN_bn2hex(q);
rc += i18n("160 bit prime factor: ");
@@ -396,7 +396,7 @@
rc += x[i];
}
rc += '\n';
- d->kossl->OPENSSL_free(x);
+ d->kossl->OPENSSL_sk_free(x);
x = d->kossl->BN_bn2hex(g);
rc += QString("g: ");
@@ -409,7 +409,7 @@
rc += x[i];
}
rc += '\n';
- d->kossl->OPENSSL_free(x);
+ d->kossl->OPENSSL_sk_free(x);
const BIGNUM *pub_key;
d->kossl->DSA_get0_key(dsa, &pub_key, nullptr);
@@ -424,7 +424,7 @@
rc += x[i];
}
rc += '\n';
- d->kossl->OPENSSL_free(x);
+ d->kossl->OPENSSL_sk_free(x);
}
#endif
d->kossl->EVP_PKEY_free(pkey);
@@ -446,7 +446,7 @@
}
rc = t;
- d->kossl->OPENSSL_free(t);
+ d->kossl->OPENSSL_sk_free(t);
#endif
return rc;

View File

@ -1,11 +0,0 @@
--- a/src/kssl/ksslutils.cpp 2017-11-05 01:28:12.000000000 -0700
+++ b/src/kssl/ksslutils.cpp 2017-11-13 01:35:49.020000000 -0700
@@ -96,7 +96,7 @@
{
char *rep = KOSSL::self()->i2s_ASN1_INTEGER(nullptr, aint);
QString yy = rep;
- KOSSL::self()->OPENSSL_free(rep);
+ KOSSL::self()->OPENSSL_sk_free(rep);
return yy;
}

View File

@ -1,6 +1,6 @@
# Template file for 'kdelibs4support'
pkgname=kdelibs4support
version=5.94.0
version=5.96.0
revision=1
build_style=cmake
configure_args="-DBUILD_DESIGNERPLUGIN=ON
@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/frameworks/kdelibs4support"
distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
checksum=d726ebb00766d3d5ed39603601c4b9541659bebc4bb7b755eec25bffd8a76033
checksum=a7268e00b0691d930d69e86970c5300a98d8657f13d181dfcc35fcf0c24bc9a1
if [ "$CROSS_BUILD" ]; then
# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)