From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1660624-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BAAAE159C9C
for <garchives@archives.gentoo.org>; Sat, 10 Aug 2024 13:14:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 11CC22BC08A;
Sat, 10 Aug 2024 13:14:34 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EF4972BC08A
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2024 13:14:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 330F6343113
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2024 13:14:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C1D361ECF
for <gentoo-commits@lists.gentoo.org>; Sat, 10 Aug 2024 13:14:31 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1723295286.b22839d3305bc836b4fd2b689af16a7207d3d072.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/ghostwriter/files/, app-editors/ghostwriter/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/ghostwriter/files/ghostwriter-24.05.2-bogusdep.patch app-editors/ghostwriter/ghostwriter-24.05.2.ebuild
X-VCS-Directories: app-editors/ghostwriter/files/ app-editors/ghostwriter/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: b22839d3305bc836b4fd2b689af16a7207d3d072
X-VCS-Branch: master
Date: Sat, 10 Aug 2024 13:14:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e7e112ea-7ce3-4c48-b986-ce8e02f7410f
X-Archives-Hash: 62f6be534bf68003eed8a3bd6a4b865d
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