gentoo auto-resync : 08:01:2025 - 06:41:21

4 files changed, 93 insertions, 8 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index fafc27cd6d85..b3c7c4d4941c 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,10 +1,11 @@
 AUX clementine-1.4.0_rc2-absl.patch 353 BLAKE2B 8e33c6d539a60294186a674dade27f8220c197e85302ae026ecf54392a4a0ad4ff17f84ba2ef5e5e715bc12913f5dccc2e7b97d911865896c818c9b7bcf69d6f SHA512 b60721a347cd9fd703e1550e39552f0f0d9927130f4abe13122ca760aef78a9b0fcf242178e91f2fca809e98b95f0584095b010283d9e28d4a3b8b6c87cac6dc
+AUX clementine-1.4.0_rc2-absl2.patch 2356 BLAKE2B d6b06c70abf5e236f341c7d8ef93923b41de650efd61d1e475960d79577ab51ff98aafc812b9f159a70eae27ceb02603b51f6f941e4db97c301368ea1a7916f8 SHA512 928c041bc7e67861402bbb8d1e3ebfb9009b5d1a0abb3fe6d49e32b602ab87b25990524505d58a5b99cd4ac0ed536538e227f814f29b34778f3e04da23fb8027
 AUX clementine-1.4.0_rc2-c17.patch 2261 BLAKE2B e66117f376b440d359eb40c3247c28ed662b4924e066385792cc3638ae2d0296b52b3c4dc5185507f21c51baac78e063ab79d72bbb7ce2df76e82f5ebffe10c0 SHA512 8a68a23956a08c08a4d7ee030606512f375c2039314268f6f615c424a1b3ab46b643af3afdf221a2d827f03962a1644bd5b1de5d4d70c53b1fd02625fc1026ea
 AUX clementine-1.4.0_rc2-fix-build-taglib2.patch 6949 BLAKE2B 748bae24f6cb7912cdab00766ab57b31a430401cd97d81f53aaeffe85ce060f1482604fa8b4bb36c915ef68c18b7acdde734fc490f7279bf7e5e5c92f81bc5d1 SHA512 7e6a62f10c5342bd0b7623ed4d464198ee14cf43241dd4598e4b5b0373d8fe4b7f9a0c1fb67fddb00d93ec0fce63da87208bf4a154cc3a1eb68d9453f5781663
 AUX clementine-1.4.0_rc2-lz.patch 889 BLAKE2B ce04feb2b14c4b1e2e994672c0196100b35672da8b830c3ad1b8103f11327aefbccce97c5ad4253227b88939e16d6a6a88c8b3e3530e8589b1b9e28eb524361c SHA512 4bd24c05dd3d748d6b5f66070900fcef841144baaa8557bdc05a6128ee7b64f7b222344447944ef41d83694ec3f7618fd744d8e6053ec34f35b923b0a3db02a7
 AUX clementine-1.4.0_rc2-projectm-dir.patch 1879 BLAKE2B dc2d19a17b6c255360ae961ff55c6598eae51f0b5b1f4147c8b13541121f8c6dd03d864ba04dbc594ec670c5872e356e3522aaef4f67804b6e7aeb438ec0bb9c SHA512 7d891b9c26dd62b1fdad5548de0976192934aa1a28d25501fb5ba896a81d663243196e076054de6678b69cae3b05df16209c0cfd9ee3b652fe051c7ad4f17a2e
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
 EBUILD clementine-1.4.0_rc2-r5.ebuild 4780 BLAKE2B 0adc837a75b8244f34ea2574b232f892832958e0f66428fd19a08ab0adc3a534a2d96fff6e80e25d7a0ae3c7e8813d75de6dd19830e2df511e4219c4a6d744f0 SHA512 b9f41774dc627b9f7bd57b66bcc1655c8b538da13bc1d9c69a56e423d2335d835de019d19efaab92e94d9df296e9f994eedf09bf644abe68b3cc29034aacf109
-EBUILD clementine-1.4.0_rc2-r6.ebuild 4825 BLAKE2B ab5b7a6a837dcd9970ca5f1e8d93c1be16affb42c51b8a1483745118be17a654b3048ec61c8e8a95b69fc8406e5ff960e50c4553f185e454d4a943c0d6ff4d58 SHA512 776d0e42549041f2b74b4155143b49ca2950075370add7f60438cc2d8efa5da2c2ccf6c0729ac37deffaff15f855b9e8a15bed1f04829b929bbda2ececdb0f02
-EBUILD clementine-9999.ebuild 4688 BLAKE2B 07e07c6db5c58a3c2a5019b0057943b6c1bd5c6db297f38d6142b1f8988c474bfd0e74af0f5b822f4831a36bdaf486d097001b5b93814e2c309342e0fe2e8bba SHA512 8778e2362bf0e9f7b86353c7ba8ad24190fac131df43e215f9688c7e04ac1a634d005137335bedef91527b90ba84ede920988cff5e931190565be49c154d76bc
+EBUILD clementine-1.4.0_rc2-r6.ebuild 4723 BLAKE2B 3ac050ba2a4027123feff5f4ed8afad86b69bca503e330772263b3d67c4ae3f7ba138ca2c77ee39d43555a26e28079d57ef59773c9f78e4422d91e2b312a1dd4 SHA512 f5d697ab9682376bc2c14e236ab03a244682b6626417a5a0d3ed4115afc35dd4e971821199f7a4f69b892f3eb2fedcae1759c7d9da76bcf69a787e2ea6b1576b
+EBUILD clementine-9999.ebuild 4586 BLAKE2B 11f9a16c04d6e588bb4518446a19f07999ba9c4aa2c701b16210be81229f52c5d5ead5ffbddcb99896d54b9737522e08aeeee3d2da173fb5cf8ca7b0a68e64be SHA512 9bd9ced94180e05a0ad95ba5553722d7a6017609c8688e5cb7ac0e685570eb308b247656073dedf6ec0d1211f23ec07ba70df0dc45aa45fc66eb4e8e08c794c4
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild
index cdaced76e890..914852a6f203 100644
--- a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -95,7 +95,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
 	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-absl2.patch"
 	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
 	"${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch"
 )
@@ -149,7 +149,6 @@ 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/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index a09833cc5cc0..f3083d6651fb 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,7 +94,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
-	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-absl2.patch"
 	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
 	"${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.patch"
 )
@@ -145,7 +145,6 @@ 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-absl2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch
new file mode 100644
index 000000000000..f6f9b4532b2b
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch
@@ -0,0 +1,86 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+https://bugs.gentoo.org/947632
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 010191b..57163b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,7 @@ endif(OPENGL_FOUND)
+ find_package(Boost REQUIRED)
+ find_package(Gettext REQUIRED)
+ find_package(PkgConfig REQUIRED)
+-find_package(Protobuf REQUIRED)
++find_package(protobuf REQUIRED)
+ find_package(FFTW3)
+ find_package(ALSA)
+ if (NOT APPLE)
+diff --git a/ext/libclementine-remote/CMakeLists.txt b/ext/libclementine-remote/CMakeLists.txt
+index 115d1f4..717d76c 100644
+--- a/ext/libclementine-remote/CMakeLists.txt
++++ b/ext/libclementine-remote/CMakeLists.txt
+@@ -6,14 +6,14 @@ set(MESSAGES
+   remotecontrolmessages.proto
+ )
+ 
+-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
+-
+ add_library(libclementine-remote STATIC
+-  ${PROTO_SOURCES}
++  ${MESSAGES}
+ )
+ 
++protobuf_generate(TARGET libclementine-remote LANGUAGE cpp)
++
+ target_link_libraries(libclementine-remote
+-  ${PROTOBUF_LIBRARY}
+   libclementine-common
++  protobuf::libprotobuf
+ )
+ 
+diff --git a/ext/libclementine-spotifyblob/CMakeLists.txt b/ext/libclementine-spotifyblob/CMakeLists.txt
+index 7a73b14..072fe60 100644
+--- a/ext/libclementine-spotifyblob/CMakeLists.txt
++++ b/ext/libclementine-spotifyblob/CMakeLists.txt
+@@ -7,12 +7,12 @@ set(MESSAGES
+   spotifymessages.proto
+ )
+ 
+-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
+-
+ add_library(clementine-spotifyblob-messages STATIC
+-  ${PROTO_SOURCES}
++  ${MESSAGES}
+ )
+ 
++protobuf_generate(TARGET clementine-spotifyblob-messages LANGUAGE cpp)
++
+ target_link_libraries(clementine-spotifyblob-messages
+   libclementine-common
+ )
+diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt
+index 8a0a944..fc2d6e6 100644
+--- a/ext/libclementine-tagreader/CMakeLists.txt
++++ b/ext/libclementine-tagreader/CMakeLists.txt
+@@ -28,16 +28,16 @@ optional_source(HAVE_GOOGLE_DRIVE
+ 
+ qt5_wrap_cpp(MOC ${HEADERS})
+ 
+-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
+-
+ add_library(libclementine-tagreader STATIC
+-  ${PROTO_SOURCES}
++  ${MESSAGES}
+   ${SOURCES}
+   ${MOC}
+ )
+ 
++protobuf_generate(TARGET libclementine-tagreader LANGUAGE cpp)
++
+ target_link_libraries(libclementine-tagreader
+-  ${PROTOBUF_LIBRARY}
+   libclementine-common
++  protobuf::libprotobuf
+ )
+