summaryrefslogtreecommitdiff
path: root/kde-apps/kwrite
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/kwrite')
-rw-r--r--kde-apps/kwrite/Manifest2
-rw-r--r--kde-apps/kwrite/files/kate-23.08.4-no-pch.patch56
2 files changed, 45 insertions, 13 deletions
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