From ea5fb5efe198a2a447750205e8054de21de3431c Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Fri, 17 Nov 2023 18:52:16 +0300
Subject: [PATCH] qt6-6.0.0

---
 .../toolkit/qt6/qt6-imageformats/pspec.xml    | 17 ++++++++++-----
 .../toolkit/qt6/qt6-languageserver/pspec.xml  | 13 +++++++++---
 desktop/toolkit/qt6/qt6-networkauth/pspec.xml | 15 +++++++++----
 desktop/toolkit/qt6/qt6-shadertools/pspec.xml | 13 +++++++++---
 .../files/CVE-2023-45872-qtsvg-6.6.0.diff     | 15 +++++++++++++
 desktop/toolkit/qt6/qt6-svg/pspec.xml         | 21 ++++++++++++++-----
 6 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 desktop/toolkit/qt6/qt6-svg/files/CVE-2023-45872-qtsvg-6.6.0.diff

diff --git a/desktop/toolkit/qt6/qt6-imageformats/pspec.xml b/desktop/toolkit/qt6/qt6-imageformats/pspec.xml
index 914d0ff629..76b66644ef 100755
--- a/desktop/toolkit/qt6/qt6-imageformats/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-imageformats/pspec.xml
@@ -11,7 +11,7 @@
         <Summary>Plugins for additional image formats: TIFF, MNG, TGA, WBMP</Summary>
         <Description>Plugins for additional image formats: TIFF, MNG, TGA, WBMP</Description>
         <License>LGPLv2.1-linking-exception</License>
-        <Archive sha1sum="c862791790460a092869e646742bababd12e5df4" type="tarxz">https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz</Archive>
+        <Archive sha1sum="8408e616abf43ae34b39ad91ea94fe37fe80f2d2" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtimageformats-everywhere-src-6.6.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>ninja</Dependency>
             <Dependency>cmake</Dependency>
@@ -23,15 +23,15 @@
             <Dependency>tiff-devel</Dependency>
             <Dependency>webp-devel</Dependency>
             <Dependency>libjpeg-turbo-devel</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-sql-sqlite</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-sql-sqlite</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>qt6-imageformats</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.5.3">qt6-base</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base</Dependency>
             <Dependency>libgcc</Dependency>
 <!--             <Dependency>libmng</Dependency> -->
             <Dependency>tiff</Dependency>
@@ -49,7 +49,7 @@
     <!--Package>
         <Name>qt6-imageformats-docs</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.5.3">qt6-base</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base</Dependency>
         </RuntimeDependencies>
        <Files>
             <Path fileType="doc">/usr/share/doc</Path>
@@ -57,6 +57,13 @@
     </Package-->
 
     <History>
+        <Update release="6">
+            <Date>2023-11-17</Date>
+            <Version>6.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2023-10-09</Date>
             <Version>6.5.3</Version>
diff --git a/desktop/toolkit/qt6/qt6-languageserver/pspec.xml b/desktop/toolkit/qt6/qt6-languageserver/pspec.xml
index f31b75a849..64572d49f6 100644
--- a/desktop/toolkit/qt6/qt6-languageserver/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-languageserver/pspec.xml
@@ -13,11 +13,11 @@
         <Summary>An implementation of the Language Server Protocol</Summary>
         <Icon>qt6-languageserver</Icon>
         <Description>An implementation of the Language Server Protocol</Description>
-        <Archive sha1sum="77f7f42610ab308e4346a18b4b4f1ef66dbbd0d1" type="tarxz">https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtlanguageserver-everywhere-src-6.5.3.tar.xz</Archive>
+        <Archive sha1sum="954926c950f229bece915c3ac21bf9fbb01b77e2" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtlanguageserver-everywhere-src-6.6.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>ninja</Dependency>
             <Dependency>cmake</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
         </BuildDependencies>
         -->
         <!--
@@ -31,7 +31,7 @@
     <Package>
         <Name>qt6-languageserver</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.5.3">qt6-base</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -54,6 +54,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2023-11-17</Date>
+            <Version>6.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2023-10-09</Date>
             <Version>6.5.3</Version>
diff --git a/desktop/toolkit/qt6/qt6-networkauth/pspec.xml b/desktop/toolkit/qt6/qt6-networkauth/pspec.xml
index 2685afc221..ed0d83d60e 100644
--- a/desktop/toolkit/qt6/qt6-networkauth/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-networkauth/pspec.xml
@@ -12,18 +12,18 @@
         <IsA>app:gui</IsA>
         <Summary>Network authentication module</Summary>
         <Description>Ağ kimlik doğrulama modülü</Description>
-        <Archive sha1sum="0efcabfea0bc3c0c774e95bc37ad0943b3ce5bef" type="tarxz">https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtnetworkauth-everywhere-src-6.5.3.tar.xz</Archive>
+        <Archive sha1sum="dd6798c1fd4021435e336c7daed9052f88a057d2" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtnetworkauth-everywhere-src-6.6.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>ninja</Dependency>
             <Dependency>cmake</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>qt6-networkauth</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.5.3">qt6-base</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -36,7 +36,7 @@
         <Summary>Development files for qt6-networkauth</Summary>
         <RuntimeDependencies>
             <Dependency release="current">qt6-networkauth</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -46,6 +46,13 @@
     </Package>
     
     <History>
+        <Update release="6">
+            <Date>2023-11-17</Date>
+            <Version>6.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2023-10-09</Date>
             <Version>6.5.3</Version>
diff --git a/desktop/toolkit/qt6/qt6-shadertools/pspec.xml b/desktop/toolkit/qt6/qt6-shadertools/pspec.xml
index eed595a6d8..957e8d2191 100644
--- a/desktop/toolkit/qt6/qt6-shadertools/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-shadertools/pspec.xml
@@ -13,12 +13,12 @@
         <Summary>Provides functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL</Summary>
         <Icon>qt6-shadertools</Icon>
         <Description>OpenGL'ye ek olarak Qt Quick'in Vulkan, Metal ve Direct3D üzerinde çalışmasına izin veren gölgelendirici ardışık düzeni için işlevsellik sağlar</Description>
-        <Archive sha1sum="c7e8cfb2ab5d979161755bc9ce8537e2588c1480" type="tarxz">https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz</Archive>
+        <Archive sha1sum="c952614652a5d6df1b31acd9f01edb1f450ebd6e" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtshadertools-everywhere-src-6.6.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>ninja</Dependency>
             <Dependency>cmake</Dependency>
             <Dependency>vulkan-headers</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
         </BuildDependencies>
         <!--
         <Patches>
@@ -50,7 +50,7 @@
         <Summary>Development files for qt6-shadertools</Summary>
         <RuntimeDependencies>
             <Dependency release="current">qt6-shadertools</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -60,6 +60,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2023-11-17</Date>
+            <Version>6.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2023-10-09</Date>
             <Version>6.5.3</Version>
diff --git a/desktop/toolkit/qt6/qt6-svg/files/CVE-2023-45872-qtsvg-6.6.0.diff b/desktop/toolkit/qt6/qt6-svg/files/CVE-2023-45872-qtsvg-6.6.0.diff
new file mode 100644
index 0000000000..a60618d186
--- /dev/null
+++ b/desktop/toolkit/qt6/qt6-svg/files/CVE-2023-45872-qtsvg-6.6.0.diff
@@ -0,0 +1,15 @@
+diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
+index 2649422..335500a 100644
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -3606,6 +3606,8 @@ void QSvgHandler::init()
+ 
+ static bool detectCycles(const QSvgNode *node, QList<const QSvgUse *> active = {})
+ {
++    if (Q_UNLIKELY(!node))
++        return false;
+     switch (node->type()) {
+     case QSvgNode::DOC:
+     case QSvgNode::G:
+
+
diff --git a/desktop/toolkit/qt6/qt6-svg/pspec.xml b/desktop/toolkit/qt6/qt6-svg/pspec.xml
index 251235e80f..bd7f4c4573 100755
--- a/desktop/toolkit/qt6/qt6-svg/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-svg/pspec.xml
@@ -9,21 +9,25 @@
         <License>LGPLv2.1-linking-exception</License>
         <Summary>Classes for displaying the contents of SVG files</Summary>
         <Description>Classes for displaying the contents of SVG files</Description>
-        <Archive sha1sum="ff6e2e33add6c3254322b581a7141591a9b6941d" type="tarxz">https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz</Archive>
+        <Archive sha1sum="6241d1d27dba327c79ce70144d38b4856c2aef2d" type="tarxz">https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/qtsvg-everywhere-src-6.6.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>ninja</Dependency>
             <Dependency>cmake</Dependency>
             <Dependency>libxkbcommon-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>vulkan-headers</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">CVE-2023-45872-qtsvg-6.6.0.diff</Patch>
+        </Patches>
     </Source>
+
     <Package>
         <Name>qt6-svg</Name>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
-            <Dependency versionFrom="6.5.3">qt6-base</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base</Dependency>
             <Dependency>zlib</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -39,7 +43,7 @@
         <Name>qt6-svg-devel</Name>
         <Summary>Development files for qt6-svg</Summary>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base-devel</Dependency>
             <Dependency release="current">qt6-svg</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -51,7 +55,7 @@
     <!--Package>
         <Name>qt6-svg-docs</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.5.3">qt6-base</Dependency>
+            <Dependency versionFrom="6.6.0">qt6-base</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="doc">/usr/share/doc</Path>
@@ -60,6 +64,13 @@
     </Package-->
 
     <History>
+        <Update release="6">
+            <Date>2023-11-17</Date>
+            <Version>6.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2023-10-09</Date>
             <Version>6.5.3</Version>