* [gentoo-commits] repo/proj/guru:master commit in: net-im/chatterino/, net-im/chatterino/files/
@ 2024-08-24 20:56 David Roman
0 siblings, 0 replies; 2+ messages in thread
From: David Roman @ 2024-08-24 20:56 UTC (permalink / raw
To: gentoo-commits
commit: dae6db6057c10405f7dce816fdfa8f6babcecbda
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Aug 24 08:25:11 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Aug 24 10:55:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dae6db60
net-im/chatterino: fix gcc15 build
Closes: https://bugs.gentoo.org/937497
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
net-im/chatterino/chatterino-2.5.1.ebuild | 5 +++++
net-im/chatterino/files/chatterino-2.5.1-gcc15.patch | 13 +++++++++++++
2 files changed, 18 insertions(+)
diff --git a/net-im/chatterino/chatterino-2.5.1.ebuild b/net-im/chatterino/chatterino-2.5.1.ebuild
index 93bf2b917..98b53de7f 100644
--- a/net-im/chatterino/chatterino-2.5.1.ebuild
+++ b/net-im/chatterino/chatterino-2.5.1.ebuild
@@ -44,6 +44,11 @@ DEPEND="
"
BDEPEND="dev-qt/linguist-tools:5"
+PATCHES=(
+ # bug #937497
+ "${FILESDIR}/${P}-gcc15.patch"
+)
+
src_prepare() {
rmdir --ignore-fail-on-non-empty ./lib/*/ ./cmake/*/ || die "can't remove stubbed libdirs"
diff --git a/net-im/chatterino/files/chatterino-2.5.1-gcc15.patch b/net-im/chatterino/files/chatterino-2.5.1-gcc15.patch
new file mode 100644
index 000000000..f2aef7705
--- /dev/null
+++ b/net-im/chatterino/files/chatterino-2.5.1-gcc15.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/937497
+https://github.com/Chatterino/chatterino2/commit/f36c73019db582fd3fec32099b75060f27cfd98f
+--- a/src/common/SignalVector.hpp
++++ b/src/common/SignalVector.hpp
+@@ -155,7 +155,7 @@ class SignalVector
+ decltype(auto) operator[](size_t index)
+ {
+ assertInGuiThread();
+- return this->items[index];
++ return this->items_[index];
+ }
+
+ auto empty()
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-im/chatterino/, net-im/chatterino/files/
@ 2025-03-20 9:22 David Roman
0 siblings, 0 replies; 2+ messages in thread
From: David Roman @ 2025-03-20 9:22 UTC (permalink / raw
To: gentoo-commits
commit: d02551ce514be2041d24bbe0750743f13f935148
Author: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com>
AuthorDate: Wed Mar 19 15:55:59 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Mar 19 15:55:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d02551ce
net-im/chatterino: disable autofinding of ccache
Users in Gentoo enable ccache with FEATURES="ccache" if required, it
shouldn't be enabled automagically by a project.
Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com>
net-im/chatterino/chatterino-2.5.2-r1.ebuild | 4 ++++
.../files/chatterino-2.5.2-disable-ccache.patch | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/net-im/chatterino/chatterino-2.5.2-r1.ebuild b/net-im/chatterino/chatterino-2.5.2-r1.ebuild
index 4cb662b0b..51de609f9 100644
--- a/net-im/chatterino/chatterino-2.5.2-r1.ebuild
+++ b/net-im/chatterino/chatterino-2.5.2-r1.ebuild
@@ -59,6 +59,10 @@ DEPEND="
"
BDEPEND="dev-qt/qttools:6[linguist]"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.2-disable-ccache.patch
+)
+
src_prepare() {
rmdir --ignore-fail-on-non-empty ./lib/*/ || die "can't remove stubbed libdirs"
diff --git a/net-im/chatterino/files/chatterino-2.5.2-disable-ccache.patch b/net-im/chatterino/files/chatterino-2.5.2-disable-ccache.patch
new file mode 100644
index 000000000..6d27d38b5
--- /dev/null
+++ b/net-im/chatterino/files/chatterino-2.5.2-disable-ccache.patch
@@ -0,0 +1,20 @@
+diff --git ./CMakeLists.txt ./CMakeLists.txt
+index ad9bdef..4feb6e1 100644
+--- ./CMakeLists.txt
++++ ./CMakeLists.txt
+@@ -60,15 +60,6 @@ else()
+ set(MAJOR_QT_VERSION "5")
+ endif()
+
+-find_program(CCACHE_PROGRAM ccache)
+-find_program(SCCACHE_PROGRAM sccache)
+-if (SCCACHE_PROGRAM)
+- set(_compiler_launcher ${SCCACHE_PROGRAM})
+-elseif (CCACHE_PROGRAM)
+- set(_compiler_launcher ${CCACHE_PROGRAM})
+-endif ()
+-
+-
+ # Alternate linker code taken from heavyai/heavydb
+ # https://github.com/heavyai/heavydb/blob/0517d99b467806f6af7b4c969e351368a667497d/CMakeLists.txt#L87-L103
+ macro(set_alternate_linker linker)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-20 9:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-20 9:22 [gentoo-commits] repo/proj/guru:master commit in: net-im/chatterino/, net-im/chatterino/files/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-08-24 20:56 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox