public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-im/tokodon/files/
@ 2024-11-18 22:17 Andreas Sturmlechner
  0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2024-11-18 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     96bce61bdb6499feebda583db152bfbfe40af8a5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Nov 17 16:35:47 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 22:17:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96bce61b

net-im/tokodon: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/39348
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/tokodon-24.05.2-enable-exceptions.patch  | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/net-im/tokodon/files/tokodon-24.05.2-enable-exceptions.patch b/net-im/tokodon/files/tokodon-24.05.2-enable-exceptions.patch
deleted file mode 100644
index bc48595b2838..000000000000
--- a/net-im/tokodon/files/tokodon-24.05.2-enable-exceptions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e55359ddc139c2a6296b67990dee47478a4fadc8 Mon Sep 17 00:00:00 2001
-From: Joshua Goins <josh@redstrate.com>
-Date: Fri, 12 Jul 2024 12:00:43 -0400
-Subject: [PATCH] Enable C++ exceptions even when building with QtMultimedia
-
-This is also needed in blurhash.cpp, which breaks in certain system
-configurations that don't enable exceptions by default. Now it's turned
-on regardless of the USE_QTMULTIMEDIA CMake option.
-
-I also added a note for future people to discover why this is turned on.
----
- src/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bca2cc094..73a8345ed 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -361,9 +361,11 @@ else()
-             utils/mpvplayer.h
-     )
-     target_link_libraries(tokodon_static PUBLIC MpvQt::MpvQt)
--    target_compile_options(tokodon_static PRIVATE -fexceptions)
- endif()
- 
-+# NOTE: Needed for MPV, but also for blurhash.cpp. We can look into making this more selective lter.
-+target_compile_options(tokodon_static PRIVATE -fexceptions)
-+
- if (USE_QTWEBVIEW)
-     qt_target_qml_sources(tokodon_static
-             QML_FILES
--- 
-GitLab
-


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2024-11-18 22:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-18 22:17 [gentoo-commits] repo/gentoo:master commit in: net-im/tokodon/files/ Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox