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

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

[Joonas Niilola]

commit:     19c9ce6250dbe8d4cd6f2cc3c17d4b38cf9149cd
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 13 18:45:14 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:19:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c9ce62

app-editors/ghostwriter: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25879
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/ghostwriter-1.8.1-appdata-path.patch     | 27 ----------------------
 .../files/ghostwriter-1.8.1-qt-5.15.patch          | 21 -----------------
 2 files changed, 48 deletions(-)

diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
deleted file mode 100644
index 514ab6262e5a..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5e63fa9cb6d4020413db071ed68aa85f3e79fd9e Mon Sep 17 00:00:00 2001
-From: David Roman <davidroman96@gmail.com>
-Date: Mon, 9 Mar 2020 21:42:58 +0100
-Subject: [PATCH] update appdata path
-
-The previous location is deprecated
-see https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
----
- ghostwriter.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ghostwriter.pro b/ghostwriter.pro
-index d399fb5..7f5f22c 100644
---- a/ghostwriter.pro
-+++ b/ghostwriter.pro
-@@ -264,7 +264,7 @@ macx {
-     desktop.path = $$DATADIR/applications/
- 
-     appdata.files = resources/linux/ghostwriter.appdata.xml
--    appdata.path = $$DATADIR/appdata/
-+    appdata.path = $$DATADIR/metainfo/
- 
-     man.files = resources/linux/ghostwriter.1
-     man.path = $$PREFIX/share/man/man1
--- 
-2.25.1
-

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
deleted file mode 100644
index 0f7425ff35e7..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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>
- 

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

[Andreas Sturmlechner]

commit:     072300a373b4a7fc7a84079a0e810f6d3f3a5141
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 19:51:20 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 19:51:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072300a3

app-editors/ghostwriter: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/ghostwriter-24.05.2-bogusdep.patch       | 83 ----------------------
 1 file changed, 83 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
deleted file mode 100644
index 00bda3a8b701..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
-
-(cherry picked from commit 72850a2dcc220be175ecb581fc9d44b781bb4d9a)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- 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
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -90,10 +90,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS
-     WebEngineWidgets
- )
- 
--if (QT_MAJOR_VERSION STREQUAL "6")
--    find_package(Qt6 REQUIRED COMPONENTS Core5Compat)
--endif()
--
- find_package(
-     KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION}
-     REQUIRED
-@@ -135,12 +131,6 @@ target_link_libraries(ghostwriter PRIVATE
-     ${CMARK_LIBS}
- )
- 
--if (QT_MAJOR_VERSION STREQUAL "6")
--    target_link_libraries(ghostwriter PRIVATE
--        Qt::Core5Compat
--    )
--endif()
--
- 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
-

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

[Maciej Barć]

commit:     f20fa15ad2c3dbea2819aa5dea89945543bfcbb1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Mar 11 07:01:55 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 18:55:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20fa15a

app-editors/ghostwriter: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../files/ghostwriter-24.08.2-fix-segfault.patch   | 175 ---------------------
 1 file changed, 175 deletions(-)

diff --git a/app-editors/ghostwriter/files/ghostwriter-24.08.2-fix-segfault.patch b/app-editors/ghostwriter/files/ghostwriter-24.08.2-fix-segfault.patch
deleted file mode 100644
index 5466e47a319e..000000000000
--- a/app-editors/ghostwriter/files/ghostwriter-24.08.2-fix-segfault.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From bfca43e551729b9518772fed6fba19bb5dbe6646 Mon Sep 17 00:00:00 2001
-From: Megan Conkle <megan.conkle@kdemail.net>
-Date: Sat, 12 Oct 2024 23:34:27 -0700
-Subject: [PATCH] Fix segmentation fault when .conf file is missing
-
-Whenever ghostwriter.conf is missing (or the last used exporter within
-is empty), the app will crash with a segmentation fault due to accessing
-an uninitialed pointer to the current HTML exporter in appsettings.cpp.
-This commit ensures that the pointer is initialized to null before being
-checked for whether obtaining an exporter was successful.
-BUG: 465799
-
-(cherry picked from commit f82070ac7916b36bb0bfd84a5c0e96cb084a6e28)
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CHANGELOG.md                 |  8 ++++++++
- src/preview/htmlpreview.cpp  | 24 ++++++++++++------------
- src/settings/appsettings.cpp | 18 ++++++++++++------
- 3 files changed, 32 insertions(+), 18 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 6f34002f..89017211 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 
- ## [Unreleased]
- 
-+## [24.08.3]
-+
-+### Fixed
-+
-+* Issue #465799: Segmentation fault no longer occurs when .conf file is missing on first launch.
-+
-+## [24.08.0]
-+
- ### Added
- 
- * Added more icons to menu actions.
-diff --git a/src/preview/htmlpreview.cpp b/src/preview/htmlpreview.cpp
-index db89dd29..5a600769 100644
---- a/src/preview/htmlpreview.cpp
-+++ b/src/preview/htmlpreview.cpp
-@@ -1,5 +1,5 @@
--/*
-- * SPDX-FileCopyrightText: 2014-2023 Megan Conkle <megan.conkle@kdemail.net>
-+/*
-+ * SPDX-FileCopyrightText: 2014-2024 Megan Conkle <megan.conkle@kdemail.net>
-  *
-  * SPDX-License-Identifier: GPL-3.0-or-later
-  */
-@@ -38,7 +38,7 @@ public:
-     HtmlPreviewPrivate(HtmlPreview *q_ptr)
-         : q_ptr(q_ptr)
-     {
--        ;
-+        proxy = new PreviewProxy(q_ptr);
-     }
- 
-     ~HtmlPreviewPrivate()
-@@ -51,7 +51,7 @@ public:
-     MarkdownDocument *document;
-     bool updateInProgress;
-     bool updateAgain;
--    PreviewProxy proxy;
-+    PreviewProxy *proxy;
-     QString baseUrl;
-     QRegularExpression headingTagExp;
-     Exporter *exporter;
-@@ -91,7 +91,7 @@ HtmlPreview::HtmlPreview
-     d->updateInProgress = false;
-     d->updateAgain = false;
-     d->exporter = exporter;
--    d->proxy.setMathEnabled(d->exporter->supportsMath());
-+    d->proxy->setMathEnabled(d->exporter->supportsMath());
- 
-     d->baseUrl = "";
- 
-@@ -153,7 +153,7 @@ HtmlPreview::HtmlPreview
-     this->setZoomFactor((horizontalDpi / 96.0));
- 
-     QWebChannel *channel = new QWebChannel(this);
--    channel->registerObject(QStringLiteral("previewProxy"), &d->proxy);
-+    channel->registerObject(QStringLiteral("previewProxy"), d->proxy);
-     this->page()->setWebChannel(channel);
- 
-     QFile wrapperHtmlFile(":/resources/preview.html");
-@@ -240,22 +240,22 @@ void HtmlPreview::setHtmlExporter(Exporter *exporter)
-     
-     d->exporter = exporter;
-     d->setHtmlContent("");
--    d->proxy.setMathEnabled(d->exporter->supportsMath());
-+    d->proxy->setMathEnabled(d->exporter->supportsMath());
-     updatePreview();
- }
- 
- void HtmlPreview::setStyleSheet(const QString &css)
- {
-     Q_D(HtmlPreview);
--    
--    d->proxy.setStyleSheet(css);
-+
-+    d->proxy->setStyleSheet(css);
- }
- 
- void HtmlPreview::setMathEnabled(bool enabled)
- {
-     Q_D(HtmlPreview);
--    
--    d->proxy.setMathEnabled(enabled);
-+
-+    d->proxy->setMathEnabled(enabled);
- }
- 
- void HtmlPreviewPrivate::onHtmlReady()
-@@ -312,7 +312,7 @@ void HtmlPreview::closeEvent(QCloseEvent *event)
- 
- void HtmlPreviewPrivate::setHtmlContent(const QString &html)
- {
--    this->proxy.setHtmlContent(html);
-+    this->proxy->setHtmlContent(html);
- }
- 
- QString HtmlPreviewPrivate::exportToHtml
-diff --git a/src/settings/appsettings.cpp b/src/settings/appsettings.cpp
-index a76c25a5..7d51ac5d 100644
---- a/src/settings/appsettings.cpp
-+++ b/src/settings/appsettings.cpp
-@@ -65,6 +65,7 @@ public:
-     static AppSettings *instance;
- 
-     AppSettingsPrivate()
-+        : currentHtmlExporter(nullptr)
-     {
-         ;
-     }
-@@ -677,6 +678,7 @@ void AppSettings::setShowUnbreakableSpaceEnabled(bool enabled)
-     d->showUnbreakableSpaceEnabled = enabled;
-     emit showUnbreakableSpaceEnabledChanged(d->showUnbreakableSpaceEnabled);
- }
-+
- AppSettings::AppSettings()
-     : d_ptr(new AppSettingsPrivate())
- {
-@@ -843,17 +845,21 @@ AppSettings::AppSettings()
- 
-     QString exporterName = appSettings.value(constants::GW_LAST_USED_EXPORTER_KEY).toString();
- 
-+    d->currentHtmlExporter = nullptr;
-+
-     if (!exporterName.isEmpty()) {
-         d->currentHtmlExporter = ExporterFactory::instance()->exporterByName(exporterName);
--    }
- 
--    if (d->currentHtmlExporter) {
--        auto lastExportOptions = appSettings.value(constants::GW_LAST_USED_EXPORTER_PARAMS_KEY).toString();
-+        if (d->currentHtmlExporter) {
-+            auto lastExportOptions = appSettings.value(constants::GW_LAST_USED_EXPORTER_PARAMS_KEY).toString();
- 
--        if (!lastExportOptions.isEmpty()) {
--            d->currentHtmlExporter->setOptions(lastExportOptions);
-+            if (!lastExportOptions.isEmpty()) {
-+                d->currentHtmlExporter->setOptions(lastExportOptions);
-+            }
-         }
--    } else {
-+    }
-+
-+    if (!d->currentHtmlExporter) {
-         d->currentHtmlExporter = ExporterFactory::instance()->htmlExporters().first();
-     }
- }
--- 
-GitLab
-