commit: b22839d3305bc836b4fd2b689af16a7207d3d072 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 10 13:07:26 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Aug 10 13:08:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22839d3
app-editors/ghostwriter: Properly backport upstream's bogus-dep removal Closes: https://bugs.gentoo.org/937708 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/ghostwriter-24.05.2-bogusdep.patch | 50 ++++++++++++++++++++-- app-editors/ghostwriter/ghostwriter-24.05.2.ebuild | 2 +- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch b/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch index 2076ccb24d87..00bda3a8b701 100644 --- a/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch +++ b/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch @@ -1,12 +1,17 @@ -From 6d680805c08d131ea3a98c4d3fe87d51a92f2ffa Mon Sep 17 00:00:00 2001 +From 37381a0a793873b1a9b77f2ddc550f791531e4e9 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sat, 10 Aug 2024 12:41:33 +0200 -Subject: [PATCH] Drop unused Qt5Compat dependency +Subject: [PATCH] Drop unused qt5compat dependency + +(cherry picked from commit 72850a2dcc220be175ecb581fc9d44b781bb4d9a) Signed-off-by: Andreas Sturmlechner <[email protected]> --- - src/CMakeLists.txt | 10 ---------- - 1 file changed, 10 deletions(-) + src/CMakeLists.txt | 10 ---------- + src/editor/markdownhighlighter.cpp | 1 - + src/markdown/memoryarena.cpp | 2 -- + src/spelling/spellcheckdecorator.cpp | 1 - + 4 files changed, 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33ce58f..da55382 100644 @@ -36,6 +41,43 @@ index 33ce58f..da55382 100644 set_target_properties(ghostwriter PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON +diff --git a/src/editor/markdownhighlighter.cpp b/src/editor/markdownhighlighter.cpp +index b463d29..12fae09 100644 +--- a/src/editor/markdownhighlighter.cpp ++++ b/src/editor/markdownhighlighter.cpp +@@ -13,7 +13,6 @@ + #include <QRegularExpression> + #include <QStaticText> + #include <QString> +-#include <QStringRef> + #include <QSyntaxHighlighter> + #include <QTextCharFormat> + #include <QTextDocument> +diff --git a/src/markdown/memoryarena.cpp b/src/markdown/memoryarena.cpp +index 8e1db78..72b09c1 100644 +--- a/src/markdown/memoryarena.cpp ++++ b/src/markdown/memoryarena.cpp +@@ -7,8 +7,6 @@ + #ifndef MEMORY_ARENA_CPP + #define MEMORY_ARENA_CPP + +-#include <QLinkedListIterator> +- + #include "memoryarena.h" + + namespace ghostwriter +diff --git a/src/spelling/spellcheckdecorator.cpp b/src/spelling/spellcheckdecorator.cpp +index efdb688..14792d7 100644 +--- a/src/spelling/spellcheckdecorator.cpp ++++ b/src/spelling/spellcheckdecorator.cpp +@@ -11,7 +11,6 @@ + #include <QList> + #include <QMenu> + #include <QStringList> +-#include <QStringRef> + #include <QTextBlock> + #include <QTextBoundaryFinder> + #include <QTextCharFormat> -- 2.45.2 diff --git a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild index 91ae6c82c01c..d19e37530fd0 100644 --- a/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild +++ b/app-editors/ghostwriter/ghostwriter-24.05.2.ebuild @@ -39,4 +39,4 @@ BDEPEND=" DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${P}-bogusdep.patch" ) # in 24.08, bug 936578 +PATCHES=( "${FILESDIR}/${P}-bogusdep.patch" ) # in 24.08, bugs 936578 and 937708
