summaryrefslogtreecommitdiff
path: root/kde-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-01-12 19:10:40 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-01-12 19:10:40 +0000
commit4fc30e4e13ecfbe29fbef3b5caf96218eab30b68 (patch)
tree76daccda237a1d7020464e1de2c699391c86cf92 /kde-apps
parent4c4e8e9bf6d1ef49be600d77fcbbd7be716aece7 (diff)
gentoo auto-resync : 12:01:2024 - 19:10:40
Diffstat (limited to 'kde-apps')
-rw-r--r--kde-apps/Manifest.gzbin37052 -> 37059 bytes
-rw-r--r--kde-apps/kate-addons/Manifest2
-rw-r--r--kde-apps/kate-addons/files/kate-23.08.4-no-pch.patch56
-rw-r--r--kde-apps/kate-lib/Manifest2
-rw-r--r--kde-apps/kate-lib/files/kate-23.08.4-no-pch.patch56
-rw-r--r--kde-apps/kate/Manifest2
-rw-r--r--kde-apps/kate/files/kate-23.08.4-no-pch.patch56
-rw-r--r--kde-apps/kwrite/Manifest2
-rw-r--r--kde-apps/kwrite/files/kate-23.08.4-no-pch.patch56
9 files changed, 180 insertions, 52 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index ae6f97636b33..fafdeade6ecb 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
Binary files differ
diff --git a/kde-apps/kate-addons/Manifest b/kde-apps/kate-addons/Manifest
index 69dba6660220..a187e147e944 100644
--- a/kde-apps/kate-addons/Manifest
+++ b/kde-apps/kate-addons/Manifest
@@ -1,4 +1,4 @@
-AUX kate-23.08.4-no-pch.patch 1636 BLAKE2B 81e0b092582f4638a639a66be778c8dd75704ee3b840404e7a97ac6aaf8959abfeb150a27ca44d053982f7ae4c31cba11a3570ebb1fc5b036be689d79858a393 SHA512 37eb091d815a9b744a5335ab23b863a03d4d777ddabf10d1ebac62d1e1a2356b47bc8f8592bcfb7711540084780a0cd51c9733ae02036d20b8757a7874b29f9c
+AUX kate-23.08.4-no-pch.patch 2142 BLAKE2B 6a9047e1b858a7673ba16ef4bda0553e982c737d1cfd3c14c055772dfda321f943254ba54a83cdad4acc567bd3087097e2e3ce35e11456226c1f34e9762e40a1 SHA512 457bb8bb5c57c3602648ff672344948685ce53c098fe0ceef26a3b3fe819d457065b30668ae87516f8b1505266aaf4ebebcec3783ff1c73aec00bd9b70c4210d
DIST kate-23.08.4.tar.xz 8043840 BLAKE2B 0aa8f983612b5873489aa23da3024c793d57b7d7c1f5b6fa35a45c34c53584e06490db4ba5bff77a8917476d72e78bb081af42205a51e58329a12790eb96e872 SHA512 99b147940809149c93a9a79bcf5263db650f3afa1fbef5158d20ed88608e3794dc8d1357d7c0119369b690dbfcd63e369a009171c3b4a99559246f876bafe28a
EBUILD kate-addons-23.08.4.ebuild 3028 BLAKE2B 9463610c3a4ea6fb979072a74073c86e4386867a6b3bdfb91c6b9d3027599728e831a1b0213113984d348651a528ff9182085a141548fd8a2a50f2f871b3d3b0 SHA512 69a32484046f7b5b033a4865e0da1c7b11bc8b0b32b9b1e15a048ebf8911b870e436d0957773851ffe77c896acc74560048c59662a60ade4d47b5a7728f38397
MISC metadata.xml 751 BLAKE2B 01d2cfdb4e2849372da5d8f1a02d54b875741cc2674d293cd376396ca83ddcf426acb04ae61749bb2a969f4d95fb969d8149bda79de24a773f98473e7b728d2c SHA512 d84414311962de3f2eb9082c2b54d074cfaee3bce5b9ce572f593b373762f913ca60d8bd180e06627ef62f8194e8a394bcfc12f077f6598d95736723d9482af4
diff --git a/kde-apps/kate-addons/files/kate-23.08.4-no-pch.patch b/kde-apps/kate-addons/files/kate-23.08.4-no-pch.patch
index 89ef142fbd2c..7a9591c06c5b 100644
--- a/kde-apps/kate-addons/files/kate-23.08.4-no-pch.patch
+++ b/kde-apps/kate-addons/files/kate-23.08.4-no-pch.patch
@@ -1,6 +1,7 @@
https://bugs.gentoo.org/921720
https://invent.kde.org/utilities/kate/-/issues/116
https://invent.kde.org/utilities/kate/-/merge_requests/1387
+https://invent.kde.org/utilities/kate/-/merge_requests/1388
From 83fcf7b4e7cc7bc54828192e9b89cfb286d864fd Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
@@ -11,14 +12,6 @@ Ever since I last updated, I've started to get errors about includes
missing, so I've added them.
(cherry picked from commit 73d090f7f7cb7cc013f31c7b572ca78a7fbeb5b8)
----
- addons/git-blame/kategitblameplugin.h | 1 +
- addons/project/git/gitstatus.h | 1 +
- apps/lib/ktexteditor_utils.h | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/addons/git-blame/kategitblameplugin.h b/addons/git-blame/kategitblameplugin.h
-index 0a87f700e8..4c3d4a977f 100644
--- a/addons/git-blame/kategitblameplugin.h
+++ b/addons/git-blame/kategitblameplugin.h
@@ -20,6 +20,7 @@
@@ -29,8 +22,6 @@ index 0a87f700e8..4c3d4a977f 100644
#include <QVariant>
#include <QVector>
-diff --git a/addons/project/git/gitstatus.h b/addons/project/git/gitstatus.h
-index 7caad963eb..dcf01b66c9 100644
--- a/addons/project/git/gitstatus.h
+++ b/addons/project/git/gitstatus.h
@@ -5,6 +5,7 @@
@@ -41,8 +32,6 @@ index 7caad963eb..dcf01b66c9 100644
#include <QString>
#include <QVector>
-diff --git a/apps/lib/ktexteditor_utils.h b/apps/lib/ktexteditor_utils.h
-index ac3f218870..d9d4e6fdaa 100644
--- a/apps/lib/ktexteditor_utils.h
+++ b/apps/lib/ktexteditor_utils.h
@@ -7,6 +7,8 @@
@@ -56,3 +45,46 @@ index ac3f218870..d9d4e6fdaa 100644
class QScrollBar;
--
GitLab
+
+From bd8403ba1771d92586518868d0bfd42087b0db4d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 12 Jan 2024 16:53:56 +0000
+Subject: [PATCH] Add further missing includes
+
+Bug: https://bugs.gentoo.org/921935
+Bug: https://invent.kde.org/utilities/kate/-/issues/116
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/addons/project/gitstatusmodel.h
++++ b/addons/project/gitstatusmodel.h
+@@ -5,6 +5,7 @@
+ */
+ #pragma once
+
++#include <QSet>
+ #include <QAbstractItemModel>
+
+ #include "git/gitstatus.h"
+--- a/addons/project/kateproject.h
++++ b/addons/project/kateproject.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/ModificationInterface>
+ #endif
+--- a/addons/project/kateprojectitem.h
++++ b/addons/project/kateprojectitem.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/Document>
+ #else
+--
+GitLab
diff --git a/kde-apps/kate-lib/Manifest b/kde-apps/kate-lib/Manifest
index 83695760a3d7..4f1284bc61e7 100644
--- a/kde-apps/kate-lib/Manifest
+++ b/kde-apps/kate-lib/Manifest
@@ -1,4 +1,4 @@
-AUX kate-23.08.4-no-pch.patch 1636 BLAKE2B 81e0b092582f4638a639a66be778c8dd75704ee3b840404e7a97ac6aaf8959abfeb150a27ca44d053982f7ae4c31cba11a3570ebb1fc5b036be689d79858a393 SHA512 37eb091d815a9b744a5335ab23b863a03d4d777ddabf10d1ebac62d1e1a2356b47bc8f8592bcfb7711540084780a0cd51c9733ae02036d20b8757a7874b29f9c
+AUX kate-23.08.4-no-pch.patch 2142 BLAKE2B 6a9047e1b858a7673ba16ef4bda0553e982c737d1cfd3c14c055772dfda321f943254ba54a83cdad4acc567bd3087097e2e3ce35e11456226c1f34e9762e40a1 SHA512 457bb8bb5c57c3602648ff672344948685ce53c098fe0ceef26a3b3fe819d457065b30668ae87516f8b1505266aaf4ebebcec3783ff1c73aec00bd9b70c4210d
DIST kate-23.08.4.tar.xz 8043840 BLAKE2B 0aa8f983612b5873489aa23da3024c793d57b7d7c1f5b6fa35a45c34c53584e06490db4ba5bff77a8917476d72e78bb081af42205a51e58329a12790eb96e872 SHA512 99b147940809149c93a9a79bcf5263db650f3afa1fbef5158d20ed88608e3794dc8d1357d7c0119369b690dbfcd63e369a009171c3b4a99559246f876bafe28a
EBUILD kate-lib-23.08.4.ebuild 2022 BLAKE2B 9db6e4e7191b175d43deea9782b17e86e4425274fbec2715038663c73e42f0c37ecbcc247a199b012f4b2783dabd7fea7e24548e936272fd6a98b842ea769790 SHA512 1cc732f962f460c9d8f0330feab402343bbf068c134913b533548c370a27b0a0e35f4bc5ce4afa8750f040d4fd8d472e40539ce01a02ea54f124743e2e652b7d
MISC metadata.xml 443 BLAKE2B 89f901dde356a64629568d269755d7aebed4a7185232af0b4b18934e1efb2c2e675d9be1a85422bac073803e09fd701513c5be473b0a87300cbf25e92726caab SHA512 8298a2989e10740e8f59c07c454048b254e9a20aab01e1de4910aba908b06dd3a1f511958ec838b9547f0d5504a30c079f0fec1f5af88474b7060f3b18ec4804
diff --git a/kde-apps/kate-lib/files/kate-23.08.4-no-pch.patch b/kde-apps/kate-lib/files/kate-23.08.4-no-pch.patch
index 89ef142fbd2c..7a9591c06c5b 100644
--- a/kde-apps/kate-lib/files/kate-23.08.4-no-pch.patch
+++ b/kde-apps/kate-lib/files/kate-23.08.4-no-pch.patch
@@ -1,6 +1,7 @@
https://bugs.gentoo.org/921720
https://invent.kde.org/utilities/kate/-/issues/116
https://invent.kde.org/utilities/kate/-/merge_requests/1387
+https://invent.kde.org/utilities/kate/-/merge_requests/1388
From 83fcf7b4e7cc7bc54828192e9b89cfb286d864fd Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
@@ -11,14 +12,6 @@ Ever since I last updated, I've started to get errors about includes
missing, so I've added them.
(cherry picked from commit 73d090f7f7cb7cc013f31c7b572ca78a7fbeb5b8)
----
- addons/git-blame/kategitblameplugin.h | 1 +
- addons/project/git/gitstatus.h | 1 +
- apps/lib/ktexteditor_utils.h | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/addons/git-blame/kategitblameplugin.h b/addons/git-blame/kategitblameplugin.h
-index 0a87f700e8..4c3d4a977f 100644
--- a/addons/git-blame/kategitblameplugin.h
+++ b/addons/git-blame/kategitblameplugin.h
@@ -20,6 +20,7 @@
@@ -29,8 +22,6 @@ index 0a87f700e8..4c3d4a977f 100644
#include <QVariant>
#include <QVector>
-diff --git a/addons/project/git/gitstatus.h b/addons/project/git/gitstatus.h
-index 7caad963eb..dcf01b66c9 100644
--- a/addons/project/git/gitstatus.h
+++ b/addons/project/git/gitstatus.h
@@ -5,6 +5,7 @@
@@ -41,8 +32,6 @@ index 7caad963eb..dcf01b66c9 100644
#include <QString>
#include <QVector>
-diff --git a/apps/lib/ktexteditor_utils.h b/apps/lib/ktexteditor_utils.h
-index ac3f218870..d9d4e6fdaa 100644
--- a/apps/lib/ktexteditor_utils.h
+++ b/apps/lib/ktexteditor_utils.h
@@ -7,6 +7,8 @@
@@ -56,3 +45,46 @@ index ac3f218870..d9d4e6fdaa 100644
class QScrollBar;
--
GitLab
+
+From bd8403ba1771d92586518868d0bfd42087b0db4d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 12 Jan 2024 16:53:56 +0000
+Subject: [PATCH] Add further missing includes
+
+Bug: https://bugs.gentoo.org/921935
+Bug: https://invent.kde.org/utilities/kate/-/issues/116
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/addons/project/gitstatusmodel.h
++++ b/addons/project/gitstatusmodel.h
+@@ -5,6 +5,7 @@
+ */
+ #pragma once
+
++#include <QSet>
+ #include <QAbstractItemModel>
+
+ #include "git/gitstatus.h"
+--- a/addons/project/kateproject.h
++++ b/addons/project/kateproject.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/ModificationInterface>
+ #endif
+--- a/addons/project/kateprojectitem.h
++++ b/addons/project/kateprojectitem.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/Document>
+ #else
+--
+GitLab
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 5fbf335937a9..0caa1f851d23 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,4 +1,4 @@
-AUX kate-23.08.4-no-pch.patch 1636 BLAKE2B 81e0b092582f4638a639a66be778c8dd75704ee3b840404e7a97ac6aaf8959abfeb150a27ca44d053982f7ae4c31cba11a3570ebb1fc5b036be689d79858a393 SHA512 37eb091d815a9b744a5335ab23b863a03d4d777ddabf10d1ebac62d1e1a2356b47bc8f8592bcfb7711540084780a0cd51c9733ae02036d20b8757a7874b29f9c
+AUX kate-23.08.4-no-pch.patch 2142 BLAKE2B 6a9047e1b858a7673ba16ef4bda0553e982c737d1cfd3c14c055772dfda321f943254ba54a83cdad4acc567bd3087097e2e3ce35e11456226c1f34e9762e40a1 SHA512 457bb8bb5c57c3602648ff672344948685ce53c098fe0ceef26a3b3fe819d457065b30668ae87516f8b1505266aaf4ebebcec3783ff1c73aec00bd9b70c4210d
DIST kate-23.08.4.tar.xz 8043840 BLAKE2B 0aa8f983612b5873489aa23da3024c793d57b7d7c1f5b6fa35a45c34c53584e06490db4ba5bff77a8917476d72e78bb081af42205a51e58329a12790eb96e872 SHA512 99b147940809149c93a9a79bcf5263db650f3afa1fbef5158d20ed88608e3794dc8d1357d7c0119369b690dbfcd63e369a009171c3b4a99559246f876bafe28a
EBUILD kate-23.08.4.ebuild 1573 BLAKE2B 215f67c2246c7362f0895b3963e3107dee2a0453b7a2b304ddefec99a312968d668a7c55a44d4116ebe6c524ef74c4343d334b051c333237fd647ce4436e67cc SHA512 e6362860c46f46b8356ac2976e46cc2492f19e9d3c49969361f2ddfe4563928a91bb4f1ceceedf8ccb921560f232a59f6dece9696ed2074e5b9f731b012204da
MISC metadata.xml 370 BLAKE2B 4a882073a69500715bae3af90f51bf9becd25174d09a163fc3a475da35b334b9a914a7d7e058298482005742ef80cce7e496c0b6d3ed0ce9a33eca25ffdd217c SHA512 117402c52064333309ca0aa7e4c38e04bc8c9b225f5e214244facd9e6a9e0f7b66b8a1bf9cef4655e1423d567128d4f7061a21a23673fc8475c5f47941e23f3a
diff --git a/kde-apps/kate/files/kate-23.08.4-no-pch.patch b/kde-apps/kate/files/kate-23.08.4-no-pch.patch
index 89ef142fbd2c..7a9591c06c5b 100644
--- a/kde-apps/kate/files/kate-23.08.4-no-pch.patch
+++ b/kde-apps/kate/files/kate-23.08.4-no-pch.patch
@@ -1,6 +1,7 @@
https://bugs.gentoo.org/921720
https://invent.kde.org/utilities/kate/-/issues/116
https://invent.kde.org/utilities/kate/-/merge_requests/1387
+https://invent.kde.org/utilities/kate/-/merge_requests/1388
From 83fcf7b4e7cc7bc54828192e9b89cfb286d864fd Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
@@ -11,14 +12,6 @@ Ever since I last updated, I've started to get errors about includes
missing, so I've added them.
(cherry picked from commit 73d090f7f7cb7cc013f31c7b572ca78a7fbeb5b8)
----
- addons/git-blame/kategitblameplugin.h | 1 +
- addons/project/git/gitstatus.h | 1 +
- apps/lib/ktexteditor_utils.h | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/addons/git-blame/kategitblameplugin.h b/addons/git-blame/kategitblameplugin.h
-index 0a87f700e8..4c3d4a977f 100644
--- a/addons/git-blame/kategitblameplugin.h
+++ b/addons/git-blame/kategitblameplugin.h
@@ -20,6 +20,7 @@
@@ -29,8 +22,6 @@ index 0a87f700e8..4c3d4a977f 100644
#include <QVariant>
#include <QVector>
-diff --git a/addons/project/git/gitstatus.h b/addons/project/git/gitstatus.h
-index 7caad963eb..dcf01b66c9 100644
--- a/addons/project/git/gitstatus.h
+++ b/addons/project/git/gitstatus.h
@@ -5,6 +5,7 @@
@@ -41,8 +32,6 @@ index 7caad963eb..dcf01b66c9 100644
#include <QString>
#include <QVector>
-diff --git a/apps/lib/ktexteditor_utils.h b/apps/lib/ktexteditor_utils.h
-index ac3f218870..d9d4e6fdaa 100644
--- a/apps/lib/ktexteditor_utils.h
+++ b/apps/lib/ktexteditor_utils.h
@@ -7,6 +7,8 @@
@@ -56,3 +45,46 @@ index ac3f218870..d9d4e6fdaa 100644
class QScrollBar;
--
GitLab
+
+From bd8403ba1771d92586518868d0bfd42087b0db4d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 12 Jan 2024 16:53:56 +0000
+Subject: [PATCH] Add further missing includes
+
+Bug: https://bugs.gentoo.org/921935
+Bug: https://invent.kde.org/utilities/kate/-/issues/116
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/addons/project/gitstatusmodel.h
++++ b/addons/project/gitstatusmodel.h
+@@ -5,6 +5,7 @@
+ */
+ #pragma once
+
++#include <QSet>
+ #include <QAbstractItemModel>
+
+ #include "git/gitstatus.h"
+--- a/addons/project/kateproject.h
++++ b/addons/project/kateproject.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/ModificationInterface>
+ #endif
+--- a/addons/project/kateprojectitem.h
++++ b/addons/project/kateprojectitem.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/Document>
+ #else
+--
+GitLab
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index aa46419d06e3..13f0645c2611 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,4 +1,4 @@
-AUX kate-23.08.4-no-pch.patch 1636 BLAKE2B 81e0b092582f4638a639a66be778c8dd75704ee3b840404e7a97ac6aaf8959abfeb150a27ca44d053982f7ae4c31cba11a3570ebb1fc5b036be689d79858a393 SHA512 37eb091d815a9b744a5335ab23b863a03d4d777ddabf10d1ebac62d1e1a2356b47bc8f8592bcfb7711540084780a0cd51c9733ae02036d20b8757a7874b29f9c
+AUX kate-23.08.4-no-pch.patch 2142 BLAKE2B 6a9047e1b858a7673ba16ef4bda0553e982c737d1cfd3c14c055772dfda321f943254ba54a83cdad4acc567bd3087097e2e3ce35e11456226c1f34e9762e40a1 SHA512 457bb8bb5c57c3602648ff672344948685ce53c098fe0ceef26a3b3fe819d457065b30668ae87516f8b1505266aaf4ebebcec3783ff1c73aec00bd9b70c4210d
DIST kate-23.08.4.tar.xz 8043840 BLAKE2B 0aa8f983612b5873489aa23da3024c793d57b7d7c1f5b6fa35a45c34c53584e06490db4ba5bff77a8917476d72e78bb081af42205a51e58329a12790eb96e872 SHA512 99b147940809149c93a9a79bcf5263db650f3afa1fbef5158d20ed88608e3794dc8d1357d7c0119369b690dbfcd63e369a009171c3b4a99559246f876bafe28a
EBUILD kwrite-23.08.4.ebuild 1365 BLAKE2B 7e7f19372646252e59943829f26813bdf0954418b59e3d19eeb30122296ea6f65cf97c1ce8375829cfe231af48f53b5b2cd468a5c4151a03da777e6f3a562e1b SHA512 4f2e23c040ce90479d73b082b6fdf920d8119e0cc5d48e1bbbc41cb163f6f212e645e26eff49c43d227f3bbbb05a302b00581ce6604a8427078c3a115bd48bc6
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch b/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch
index 89ef142fbd2c..7a9591c06c5b 100644
--- a/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch
+++ b/kde-apps/kwrite/files/kate-23.08.4-no-pch.patch
@@ -1,6 +1,7 @@
https://bugs.gentoo.org/921720
https://invent.kde.org/utilities/kate/-/issues/116
https://invent.kde.org/utilities/kate/-/merge_requests/1387
+https://invent.kde.org/utilities/kate/-/merge_requests/1388
From 83fcf7b4e7cc7bc54828192e9b89cfb286d864fd Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
@@ -11,14 +12,6 @@ Ever since I last updated, I've started to get errors about includes
missing, so I've added them.
(cherry picked from commit 73d090f7f7cb7cc013f31c7b572ca78a7fbeb5b8)
----
- addons/git-blame/kategitblameplugin.h | 1 +
- addons/project/git/gitstatus.h | 1 +
- apps/lib/ktexteditor_utils.h | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/addons/git-blame/kategitblameplugin.h b/addons/git-blame/kategitblameplugin.h
-index 0a87f700e8..4c3d4a977f 100644
--- a/addons/git-blame/kategitblameplugin.h
+++ b/addons/git-blame/kategitblameplugin.h
@@ -20,6 +20,7 @@
@@ -29,8 +22,6 @@ index 0a87f700e8..4c3d4a977f 100644
#include <QVariant>
#include <QVector>
-diff --git a/addons/project/git/gitstatus.h b/addons/project/git/gitstatus.h
-index 7caad963eb..dcf01b66c9 100644
--- a/addons/project/git/gitstatus.h
+++ b/addons/project/git/gitstatus.h
@@ -5,6 +5,7 @@
@@ -41,8 +32,6 @@ index 7caad963eb..dcf01b66c9 100644
#include <QString>
#include <QVector>
-diff --git a/apps/lib/ktexteditor_utils.h b/apps/lib/ktexteditor_utils.h
-index ac3f218870..d9d4e6fdaa 100644
--- a/apps/lib/ktexteditor_utils.h
+++ b/apps/lib/ktexteditor_utils.h
@@ -7,6 +7,8 @@
@@ -56,3 +45,46 @@ index ac3f218870..d9d4e6fdaa 100644
class QScrollBar;
--
GitLab
+
+From bd8403ba1771d92586518868d0bfd42087b0db4d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 12 Jan 2024 16:53:56 +0000
+Subject: [PATCH] Add further missing includes
+
+Bug: https://bugs.gentoo.org/921935
+Bug: https://invent.kde.org/utilities/kate/-/issues/116
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/addons/project/gitstatusmodel.h
++++ b/addons/project/gitstatusmodel.h
+@@ -5,6 +5,7 @@
+ */
+ #pragma once
+
++#include <QSet>
+ #include <QAbstractItemModel>
+
+ #include "git/gitstatus.h"
+--- a/addons/project/kateproject.h
++++ b/addons/project/kateproject.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/ModificationInterface>
+ #endif
+--- a/addons/project/kateprojectitem.h
++++ b/addons/project/kateprojectitem.h
+@@ -7,6 +7,8 @@
+
+ #pragma once
+
++#include <QtGlobal>
++
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/Document>
+ #else
+--
+GitLab
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 11:55:19 +0000