From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
Date: Thu, 17 Oct 2024 07:08:06 +0000 (UTC) [thread overview]
Message-ID: <1729148818.0e21aff244a4247a58729df0d641538b1b767296.sam@gentoo> (raw)
commit: 0e21aff244a4247a58729df0d641538b1b767296
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 07:04:54 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 07:06:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e21aff2
media-gfx/inkscape: fix build w/ gcc-15
Closes: https://bugs.gentoo.org/941674
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/inkscape/files/inkscape-1.4-gcc15.patch | 21 +++++++++++++++++++++
media-gfx/inkscape/inkscape-1.4.ebuild | 4 ++++
2 files changed, 25 insertions(+)
diff --git a/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch
new file mode 100644
index 000000000000..e27db0be34ef
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/941674
+https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787
+
+From eb6dadcf1a5c660167ba43f3606c8e7cc6529787 Mon Sep 17 00:00:00 2001
+From: Liam <byteslice@airmail.cc>
+Date: Sat, 12 Oct 2024 05:22:29 -0400
+Subject: [PATCH] gobjectptr: fix member name
+
+--- a/src/util/gobjectptr.h
++++ b/src/util/gobjectptr.h
+@@ -20,7 +20,7 @@ public:
+ GObjectPtr() = default;
+ explicit GObjectPtr(T *p, bool add_ref = false) : _p(p) { if (add_ref) _ref(); }
+ GObjectPtr(GObjectPtr const &other) : _p(other._p) { _ref(); }
+- GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other.p; _ref(); } return *this; }
++ GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other._p; _ref(); } return *this; }
+ GObjectPtr(GObjectPtr &&other) noexcept : _p(other._p) { other._p = nullptr; }
+ GObjectPtr &operator=(GObjectPtr &&other) { if (&other != this) { _unref(); _p = other._p; other._p = nullptr; } return *this; }
+ ~GObjectPtr() { _unref(); }
+--
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.4.ebuild b/media-gfx/inkscape/inkscape-1.4.ebuild
index eab33b71e0fe..ddbdde41002c 100644
--- a/media-gfx/inkscape/inkscape-1.4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4.ebuild
@@ -108,6 +108,10 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4-gcc15.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
next reply other threads:[~2024-10-17 7:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-17 7:08 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-20 15:36 [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/ Andreas Sturmlechner
2025-09-03 16:15 Andreas Sturmlechner
2025-07-08 16:03 Andreas Sturmlechner
2025-02-15 0:12 Andreas K. Hüttel
2024-12-17 21:44 Andreas Sturmlechner
2024-11-14 18:42 Andreas Sturmlechner
2024-04-05 15:02 Andreas Sturmlechner
2024-03-04 22:18 Andreas Sturmlechner
2024-01-29 9:37 Sam James
2022-10-22 14:54 Michał Górny
2022-09-03 4:25 Sam James
2022-09-03 1:43 Sam James
2022-05-26 2:47 Sam James
2022-05-08 17:42 Sam James
2021-12-17 14:55 Andreas Sturmlechner
2021-11-06 21:06 Sam James
2021-04-14 19:28 Mikle Kolyada
2020-04-25 13:24 Andreas K. Hüttel
2020-01-06 10:31 Andreas K. Hüttel
2019-12-11 9:20 Miroslav Šulc
2019-11-07 8:11 Lars Wendler
2019-01-11 0:37 Andreas Sturmlechner
2018-11-07 15:48 Lars Wendler
2018-05-25 9:35 Lars Wendler
2018-03-31 5:12 Tim Harder
2017-05-12 19:41 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1729148818.0e21aff244a4247a58729df0d641538b1b767296.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox