[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/files/, media-sound/clementine/

["Yixun Lan" <dlan@gentoo.org>]

commit:     a19cfd05bb1bc1ed9ed84342a95bca123b347eb9
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Oct  6 17:56:47 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 05:23:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19cfd05

media-sound/clementine: Fix build with new abseil and proto

Bug: https://bugs.gentoo.org/912853
Bug: https://bugs.gentoo.org/913738
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 ...-9999.ebuild => clementine-1.4.0_rc2-r4.ebuild} | 10 ++++
 media-sound/clementine/clementine-9999.ebuild      |  6 ++
 .../files/clementine-1.4.0_rc2-absl.patch          | 15 +++++
 .../files/clementine-1.4.0_rc2-c17.patch           | 67 ++++++++++++++++++++++
 4 files changed, 98 insertions(+)

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
similarity index 94%
copy from media-sound/clementine/clementine-9999.ebuild
copy to media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
index 9922ac005926..0ba33dd8074d 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r4.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
+	dev-cpp/abseil-cpp:=
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/protobuf:=
@@ -91,6 +92,12 @@ 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"
+)
+
 DOCS=( Changelog README.md )
 
 src_prepare() {
@@ -111,12 +118,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# spotify is not in portage
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
 		# avoid automagically enabling of ccache (bug #611010)
 		-DCCACHE_EXECUTABLE=OFF
 		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
 		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY=OFF
+		-DENABLE_SPOTIFY_BLOB=OFF
 		-DUSE_SYSTEM_GMOCK=ON
 		-DUSE_SYSTEM_PROJECTM=ON
 		-DBUNDLE_PROJECTM_PRESETS=OFF

diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 9922ac005926..4e0ac13d9ad3 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
+	dev-cpp/abseil-cpp:=
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/protobuf:=
@@ -91,6 +92,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+)
+
 DOCS=( Changelog README.md )
 
 src_prepare() {

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
new file mode 100644
index 000000000000..48eb9dda4227
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-absl.patch
@@ -0,0 +1,15 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+
+--- a/ext/libclementine-tagreader/CMakeLists.txt
++++ b/ext/libclementine-tagreader/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library(libclementine-tagreader STATIC
+ )
+ 
+ target_link_libraries(libclementine-tagreader
+-  ${PROTOBUF_LIBRARY}
+   libclementine-common
++  ${PROTOBUF_LIBRARY} absl_log_internal_check_op absl_log_internal_message
+ )
+ 

diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
new file mode 100644
index 000000000000..3121b1e15bf0
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-c17.patch
@@ -0,0 +1,67 @@
+Fix build
+
+https://bugs.gentoo.org/912853
+
+--- a/3rdparty/libprojectm/CMakeLists.txt
++++ b/3rdparty/libprojectm/CMakeLists.txt
+@@ -24,7 +24,7 @@ set(BUILD_PROJECTM_STATIC ON)
+ set(DISABLE_NATIVE_PRESETS ON)
+ set(DISABLE_MILKDROP_PRESETS OFF)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ 
+ pkg_check_modules(GLEW glew)
+ 
+--- a/3rdparty/qtsingleapplication/CMakeLists.txt
++++ b/3rdparty/qtsingleapplication/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.0.0)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(SINGLEAPP-SOURCES
+     qtlocalpeer.cpp
+--- a/ext/libclementine-common/CMakeLists.txt
++++ b/ext/libclementine-common/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(SOURCES
+   core/closure.cpp
+--- a/ext/libclementine-remote/CMakeLists.txt
++++ b/ext/libclementine-remote/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories(${PROTOBUF_INCLUDE_DIRS})
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(MESSAGES
+   remotecontrolmessages.proto
+--- a/ext/libclementine-tagreader/CMakeLists.txt
++++ b/ext/libclementine-tagreader/CMakeLists.txt
+@@ -3,7 +3,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
+ 
+ set(MESSAGES
+   tagreadermessages.proto
+--- a/gst/moodbar/CMakeLists.txt
++++ b/gst/moodbar/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.0.0)
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++17")
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+