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 via email to