[gentoo-commits] repo/gentoo:master commit in: app-editors/ghostwriter/files/, app-editors/ghostwriter/

[gentoo-commits] repo/gentoo:master commit in: app-editors/ghostwriter/files/, app-editors/ghostwriter/

[Andreas Sturmlechner]

commit:     cdae0ef9e87e7f7b6aa87482a427c4c393f4b76a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 17:20:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 17:20:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdae0ef9

app-editors/ghostwriter: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/728408
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/ghostwriter-1.8.1-qt-5.15.patch           | 21 +++++++++++++++++++++
 app-editors/ghostwriter/ghostwriter-1.8.1.ebuild    |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
new file mode 100644
index 00000000000..0f7425ff35e
--- /dev/null
+++ b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
@@ -0,0 +1,21 @@
+From f8f4ec0a1b53d1f3e670817f051c59444851cf7f Mon Sep 17 00:00:00 2001
+From: Jakob Gahde <j5lx@fmail.co.uk>
+Date: Tue, 9 Jun 2020 10:30:44 +0200
+Subject: [PATCH] Fix build error with Qt 5.15
+
+---
+ src/MarkdownEditor.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp
+index c5e46d5..c103173 100644
+--- a/src/MarkdownEditor.cpp
++++ b/src/MarkdownEditor.cpp
+@@ -30,6 +30,7 @@
+ #include <QUrl>
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFileInfo>
+ #include <QDir>
+ 

diff --git a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
index 0943a04747d..eb51f8371cc 100644
--- a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CREDITS.md README.md )
 
-PATCHES=( "${FILESDIR}/${P}-appdata-path.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-appdata-path.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # git master
+)
 
 src_prepare() {
 	default

[gentoo-commits] repo/gentoo:master commit in: app-editors/ghostwriter/files/, app-editors/ghostwriter/

[Sam James]

commit:     8b1ed04d8d5ddae19d74457f693f05ea5b4dc8c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 02:44:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 02:44:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1ed04d

app-editors/ghostwriter: backport gcc-13 fix to 23.04.3

23.08.3 already has the fix in a release.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/ghostwriter-23.0.4-stdint.patch          | 27 ++++++++++++++++++++++
 app-editors/ghostwriter/ghostwriter-23.04.3.ebuild |  4 ++++
 2 files changed, 31 insertions(+)

diff --git a/app-editors/ghostwriter/files/ghostwriter-23.0.4-stdint.patch b/app-editors/ghostwriter/files/ghostwriter-23.0.4-stdint.patch
new file mode 100644
index 000000000000..5fa58933843c
--- /dev/null
+++ b/app-editors/ghostwriter/files/ghostwriter-23.0.4-stdint.patch
@@ -0,0 +1,27 @@
+https://github.com/KDE/ghostwriter/commit/b76b14a00069a2d544b615ad6dc8f9cbdc678982
+
+From b76b14a00069a2d544b615ad6dc8f9cbdc678982 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 26 Jul 2023 04:19:19 +0200
+Subject: [PATCH] Include <cstdint> where needed
+
+Include it where std::uint32_t is explicitly used.
+
+(cherry picked from commit 9e1a2ba2e01c7172a04e41b5d487461aa73c87d6)
+---
+ src/markdownnode.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/markdownnode.cpp b/src/markdownnode.cpp
+index dce179d4a..f7a4eab49 100644
+--- a/src/markdownnode.cpp
++++ b/src/markdownnode.cpp
+@@ -4,6 +4,8 @@
+  * SPDX-License-Identifier: GPL-3.0-or-later
+  */
+ 
++#include <cstdint>
++
+ #include "../3rdparty/cmark-gfm/src/cmark-gfm.h"
+ #include "../3rdparty/cmark-gfm/extensions/cmark-gfm-core-extensions.h"
+ 

diff --git a/app-editors/ghostwriter/ghostwriter-23.04.3.ebuild b/app-editors/ghostwriter/ghostwriter-23.04.3.ebuild
index 28ce693be6e0..1df0d10ec5eb 100644
--- a/app-editors/ghostwriter/ghostwriter-23.04.3.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-23.04.3.ebuild
@@ -39,3 +39,7 @@ BDEPEND="
 "
 
 DOCS=( CHANGELOG.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.4-stdint.patch
+)

[gentoo-commits] repo/gentoo:master commit in: app-editors/ghostwriter/files/, app-editors/ghostwriter/

[Andreas Sturmlechner]

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 <asturm@gentoo.org>
 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 <asturm@gentoo.org>
 ---
- 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