public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/
Date: Fri,  5 Jan 2024 10:36:33 +0000 (UTC)	[thread overview]
Message-ID: <1704450980.940208ab8e575fbde5337f019fd45d69e337eaba.sam@gentoo> (raw)

commit:     940208ab8e575fbde5337f019fd45d69e337eaba
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Thu Jan  4 01:16:52 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 10:36:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940208ab

media-sound/clementine: Fix build with older abseil

Bug: https://bugs.gentoo.org/919422
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/34631
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild        | 3 ++-
 media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
index 6e37ca03e086..c6a6697e2ccc 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,6 +148,7 @@ src_configure() {
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
 		"$(cmake_use_find_package alsa ALSA)"
+		-DGENTOO_FIX_ABSL_LIBS="$(test-flags-CCLD -labsl_log_internal_check_op -labsl_log_internal_message)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT

diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
index 48eb9dda4227..60c2adff3689 100644
--- a/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
@@ -10,6 +10,6 @@ https://bugs.gentoo.org/912853
  target_link_libraries(libclementine-tagreader
 -  ${PROTOBUF_LIBRARY}
    libclementine-common
-+  ${PROTOBUF_LIBRARY} absl_log_internal_check_op absl_log_internal_message
++  ${PROTOBUF_LIBRARY} ${GENTOO_FIX_ABSL_LIBS}
  )
  


             reply	other threads:[~2024-01-05 10:36 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-05 10:36 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-11 20:54 [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/ Andreas Sturmlechner
2025-01-07 23:42 Sam James
2023-12-23 20:05 Joonas Niilola
2023-10-17  5:24 Yixun Lan
2022-10-16  4:53 Miroslav Šulc
2021-07-02 10:42 Lars Wendler
2019-07-13  8:51 Andreas Sturmlechner
2019-02-17 16:05 Lars Wendler
2018-11-17 23:10 Andreas Sturmlechner
2018-03-17  0:27 Andreas Sturmlechner
2017-12-19  9:32 Andreas Sturmlechner
2017-11-19 15:09 Andreas Sturmlechner
2016-12-26 23:39 Lars Wendler
2016-04-17 17:52 Lars Wendler
2016-04-17  4:41 Jason Donenfeld
2016-01-13 17:21 Lars Wendler
2015-08-25  8:13 Lars Wendler

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=1704450980.940208ab8e575fbde5337f019fd45d69e337eaba.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