From 4fc30e4e13ecfbe29fbef3b5caf96218eab30b68 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Jan 2024 19:10:40 +0000 Subject: gentoo auto-resync : 12:01:2024 - 19:10:40 --- kde-apps/kate-lib/Manifest | 2 +- kde-apps/kate-lib/files/kate-23.08.4-no-pch.patch | 56 ++++++++++++++++++----- 2 files changed, 45 insertions(+), 13 deletions(-) (limited to 'kde-apps/kate-lib') 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 @@ -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 #include -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 #include -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 +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 +--- a/addons/project/gitstatusmodel.h ++++ b/addons/project/gitstatusmodel.h +@@ -5,6 +5,7 @@ + */ + #pragma once + ++#include + #include + + #include "git/gitstatus.h" +--- a/addons/project/kateproject.h ++++ b/addons/project/kateproject.h +@@ -7,6 +7,8 @@ + + #pragma once + ++#include ++ + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #endif +--- a/addons/project/kateprojectitem.h ++++ b/addons/project/kateprojectitem.h +@@ -7,6 +7,8 @@ + + #pragma once + ++#include ++ + #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + #include + #else +-- +GitLab -- cgit v1.2.3