From 201dd64bcbdb275789f7ee8db4c9fecc4dc984a5 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sun, 15 Aug 2021 00:08:26 +0300
Subject: [PATCH] qt5-base rebuild kde-patch

---
 .../toolkit/qt5/qt5-base/files/qt_kde.patch   | 68 +++++++++++++++++++
 desktop/toolkit/qt5/qt5-base/pspec.xml        |  2 +-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/desktop/toolkit/qt5/qt5-base/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-base/files/qt_kde.patch
index d5aefdb52a..f0beb57172 100644
--- a/desktop/toolkit/qt5/qt5-base/files/qt_kde.patch
+++ b/desktop/toolkit/qt5/qt5-base/files/qt_kde.patch
@@ -20438,6 +20438,22 @@ index 501c542157..12ac48f3cb 100644
  
  #ifdef Q_QDOC
  
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 8ceb763491..a1558a6abe 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -333,8 +333,10 @@ QLibraryInfo::buildDate()
+ #    define COMPILER_STRING "MSVC 2015"
+ #  elif _MSC_VER < 1917
+ #    define COMPILER_STRING "MSVC 2017"
+-#  elif _MSC_VER < 2000
++#  elif _MSC_VER < 1930
+ #    define COMPILER_STRING "MSVC 2019"
++#  elif _MSC_VER < 2000
++#    define COMPILER_STRING "MSVC 2022"
+ #  else
+ #    define COMPILER_STRING "MSVC _MSC_VER " QT_STRINGIFY(_MSC_VER)
+ #  endif
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
 index 10672c1f92..25f87c7e6a 100644
 --- a/src/corelib/global/qrandom.cpp
@@ -75125,6 +75141,27 @@ index 4dd9e9603b..e26a57ff43 100644
  
  QT_BEGIN_NAMESPACE
  
+diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..8abb57586b 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -1012,15 +1012,11 @@ std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src)
+     using element_type = typename std::shared_ptr<X>::element_type;
+     auto castResult = qobject_cast<element_type *>(src.get());
+     if (castResult) {
+-        auto result = std::shared_ptr<X>(std::move(src), castResult);
+-#if __cplusplus <= 201703L
+         // C++2a's move aliasing constructor will leave src empty.
+         // Before C++2a we don't really know if the compiler has support for it.
+         // The move aliasing constructor is the resolution for LWG2996,
+         // which does not impose a feature-testing macro. So: clear src.
+-        src.reset();
+-#endif
+-        return result;
++        return std::shared_ptr<X>(qExchange(src, nullptr), castResult);
+     }
+     return std::shared_ptr<X>();
+ }
 diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
 index 6be695e317..0110956b77 100644
 --- a/src/corelib/tools/qvarlengtharray.h
@@ -75357,6 +75394,19 @@ index 8acc80776c..16fd78f25f 100644
              if (((buf.length()-1) % 3) && (buf[0] == '#')) {
                  buf.truncate(((buf.length()-1) / 4 * 3) + 1); // remove alpha channel left by imagemagick
              }
+diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
+index 3920a10467..9e7d2861fd 100644
+--- a/src/gui/opengl/qopenglpaintdevice.cpp
++++ b/src/gui/opengl/qopenglpaintdevice.cpp
+@@ -331,7 +331,7 @@ void QOpenGLPaintDevice::setDotsPerMeterX(qreal dpmx)
+ 
+ void QOpenGLPaintDevice::setDotsPerMeterY(qreal dpmy)
+ {
+-    d_ptr->dpmx = dpmy;
++    d_ptr->dpmy = dpmy;
+ }
+ 
+ /*!
 diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
 index 89f3374ea1..9e5605dd48 100644
 --- a/src/gui/painting/qbrush.cpp
@@ -76350,6 +76400,24 @@ index f11a59395d..11d2c8717d 100644
  
      \since 5.0
   */
+diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..10f6c6c26e 100644
+--- a/src/network/ssl/qsslkey_openssl.cpp
++++ b/src/network/ssl/qsslkey_openssl.cpp
+@@ -348,7 +348,12 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+ 
+     EVP_CIPHER_CTX *ctx = q_EVP_CIPHER_CTX_new();
+     q_EVP_CIPHER_CTX_reset(ctx);
+-    q_EVP_CipherInit(ctx, type, nullptr, nullptr, enc);
++    if (q_EVP_CipherInit(ctx, type, nullptr, nullptr, enc) != 1) {
++        q_EVP_CIPHER_CTX_free(ctx);
++        QSslSocketBackendPrivate::logAndClearErrorQueue();
++        return {};
++    }
++
+     q_EVP_CIPHER_CTX_set_key_length(ctx, key.size());
+     if (cipher == QSslKeyPrivate::Rc2Cbc)
+         q_EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), nullptr);
 diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
 index fbeb9de18b..27ce8e08d5 100644
 --- a/src/network/ssl/qsslsocket.cpp
diff --git a/desktop/toolkit/qt5/qt5-base/pspec.xml b/desktop/toolkit/qt5/qt5-base/pspec.xml
index ce902e738a..6665fcec42 100755
--- a/desktop/toolkit/qt5/qt5-base/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-base/pspec.xml
@@ -280,7 +280,7 @@
 
     <History>
         <Update release="32">
-            <Date>2021-07-30</Date>
+            <Date>2021-08-14</Date>
             <Version>5.15.2</Version>
             <Comment>Rebuild.</Comment>
             <Name>Mustafa Cinasal</Name>