public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/
Date: Mon, 27 Jan 2025 09:57:21 +0000 (UTC)	[thread overview]
Message-ID: <1737730392.c5efe716a7f47cc30c8d8e03e197811c2c49f6be.davidroman@gentoo> (raw)

commit:     c5efe716a7f47cc30c8d8e03e197811c2c49f6be
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 24 14:53:12 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Jan 24 14:53:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5efe716

media-gfx/swayimg: fix build wihout USE=png

Closes: https://bugs.gentoo.org/948480
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 .../swayimg-3.7-fix-build-without-libpng.patch     | 25 ++++++++++++++++++++++
 media-gfx/swayimg/swayimg-3.7.ebuild               |  7 +++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch b/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch
new file mode 100644
index 000000000..af3de1be5
--- /dev/null
+++ b/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/948480
+https://github.com/artemsen/swayimg/pull/243
+Fix build without libpng.
+--- a/src/thumbnail.c
++++ b/src/thumbnail.c
+@@ -378,7 +378,9 @@ const struct thumbnail* thumbnail_get(size_t index)
+ 
+ void thumbnail_remove(size_t index)
+ {
++#ifdef THUMBNAIL_PSTORE
+     pstore_reset(false);
++#endif // THUMBNAIL_PSTORE
+ 
+     list_for_each(ctx.thumbs, struct thumbnail, it) {
+         if (it->image->index == index) {
+@@ -392,7 +394,9 @@ void thumbnail_remove(size_t index)
+ 
+ void thumbnail_clear(size_t min_id, size_t max_id)
+ {
++#ifdef THUMBNAIL_PSTORE
+     pstore_reset(false);
++#endif // THUMBNAIL_PSTORE
+ 
+     if (min_id == IMGLIST_INVALID && max_id == IMGLIST_INVALID) {
+         list_for_each(ctx.thumbs, struct thumbnail, it) {

diff --git a/media-gfx/swayimg/swayimg-3.7.ebuild b/media-gfx/swayimg/swayimg-3.7.ebuild
index a6dd8892e..7514f4372 100644
--- a/media-gfx/swayimg/swayimg-3.7.ebuild
+++ b/media-gfx/swayimg/swayimg-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,6 +47,11 @@ BDEPEND="
 	test? ( dev-cpp/gtest )
 "
 
+PATCHES=(
+	# bug #948480
+	"${FILESDIR}/${P}-fix-build-without-libpng.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature avif)


             reply	other threads:[~2025-01-27  9:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-27  9:57 David Roman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-10  9:09 [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/ David Roman
2025-06-11 10:54 David Roman
2025-05-20 13:45 Julien Roy
2024-07-08 16:47 David Roman

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=1737730392.c5efe716a7f47cc30c8d8e03e197811c2c49f6be.davidroman@gentoo \
    --to=davidroman96@gmail.com \
    --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