From 58f884e41c1d1ddbd2ef0ad179769dc14eb6ca41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 13 Jun 2022 08:56:32 +0200
Subject: [PATCH] kdelibs4support: update to 5.96.0.

---
 .../patches/0001-fix-test-build.patch         | 12 ++++
 .../patches/ksslcertificate.patch             | 71 -------------------
 .../kdelibs4support/patches/ksslutils.patch   | 11 ---
 srcpkgs/kdelibs4support/template              |  4 +-
 4 files changed, 14 insertions(+), 84 deletions(-)
 create mode 100644 srcpkgs/kdelibs4support/patches/0001-fix-test-build.patch
 delete mode 100644 srcpkgs/kdelibs4support/patches/ksslcertificate.patch
 delete mode 100644 srcpkgs/kdelibs4support/patches/ksslutils.patch

diff --git a/srcpkgs/kdelibs4support/patches/0001-fix-test-build.patch b/srcpkgs/kdelibs4support/patches/0001-fix-test-build.patch
new file mode 100644
index 00000000000..a6df4865297
--- /dev/null
+++ b/srcpkgs/kdelibs4support/patches/0001-fix-test-build.patch
@@ -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"
+
diff --git a/srcpkgs/kdelibs4support/patches/ksslcertificate.patch b/srcpkgs/kdelibs4support/patches/ksslcertificate.patch
deleted file mode 100644
index 1d955460dee..00000000000
--- a/srcpkgs/kdelibs4support/patches/ksslcertificate.patch
+++ /dev/null
@@ -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;
diff --git a/srcpkgs/kdelibs4support/patches/ksslutils.patch b/srcpkgs/kdelibs4support/patches/ksslutils.patch
deleted file mode 100644
index e8cd324c508..00000000000
--- a/srcpkgs/kdelibs4support/patches/ksslutils.patch
+++ /dev/null
@@ -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;
- }
- 
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index e3ec30c70a3..0e3cc4fdcbb 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -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)