Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package clementine for openSUSE:Factory
checked in at 2023-07-11 15:56:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clementine (Old)
and /work/SRC/openSUSE:Factory/.clementine.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clementine"
Tue Jul 11 15:56:56 2023 rev:63 rq:1097984 version:1.4.0~rc2
Changes:
--------
--- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2022-08-12
16:07:30.191625084 +0200
+++ /work/SRC/openSUSE:Factory/.clementine.new.8922/clementine.changes
2023-07-11 15:57:12.157136232 +0200
@@ -1,0 +2,8 @@
+Mon Jul 10 12:43:29 UTC 2023 - Dave Plater <davejpla...@gmail.com>
+
+- Fix build on tumbleweed with clementine-cpp17-force.patch by
+ forcing -std=c++17 on protobuf-using subdirectories.
+- Add clementine-ix86-build-fix.patch to fix ix86 build
+ (missing protobuf link libs).
+
+-------------------------------------------------------------------
New:
----
clementine-cpp17-force.patch
clementine-ix86-build-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clementine.spec ++++++
--- /var/tmp/diff_new_pack.g6OLCt/_old 2023-07-11 15:57:13.145141979 +0200
+++ /var/tmp/diff_new_pack.g6OLCt/_new 2023-07-11 15:57:13.149142002 +0200
@@ -1,7 +1,7 @@
#
# spec file for package clementine
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,6 +46,12 @@
Patch2: clementine-moodbar-fpic.patch
# PATCH-FEATURE-OPENSUSE
Patch6: use_system_qxtglobalshortcut.patch
+%if 0%{?suse_version} > 1500
+# Patch fix build with recent protobuf
+Patch3: clementine-cpp17-force.patch
+# Patch fix ix86 build for missing protobuf link libs
+Patch4: clementine-ix86-build-fix.patch
+%endif
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: freeglut-devel
++++++ clementine-cpp17-force.patch ++++++
diff -ruN
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/ext/libclementine-remote/CMakeLists.txt
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.cpp14-fix/ext/libclementine-remote/CMakeLists.txt
---
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/ext/libclementine-remote/CMakeLists.txt
2022-05-18 09:23:11.000000000 -0400
+++
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.cpp14-fix/ext/libclementine-remote/CMakeLists.txt
2023-07-09 21:34:28.025580920 -0400
@@ -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
diff -ruN
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/ext/libclementine-tagreader/CMakeLists.txt
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.cpp14-fix/ext/libclementine-tagreader/CMakeLists.txt
---
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/ext/libclementine-tagreader/CMakeLists.txt
2022-05-18 09:23:11.000000000 -0400
+++
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.cpp14-fix/ext/libclementine-tagreader/CMakeLists.txt
2023-07-09 21:34:39.538010129 -0400
@@ -3,7 +3,7 @@
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
++++++ clementine-ix86-build-fix.patch ++++++
diff -ruN
/root/oscbuild/build-root/home/abuild/rpmbuild/BUILD/Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/CMakeLists.txt
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.ix86.build/CMakeLists.txt
---
/root/oscbuild/build-root/home/abuild/rpmbuild/BUILD/Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/CMakeLists.txt
2023-07-10 02:28:08.454149341 -0400
+++
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.ix86.build/CMakeLists.txt
2023-07-10 02:16:45.660314923 -0400
@@ -77,6 +77,8 @@
pkg_check_modules(LIBXML libxml-2.0)
pkg_check_modules(LIBSPOTIFY libspotify>=12.1.45)
pkg_check_modules(TAGLIB taglib)
+pkg_check_modules(ABSL_LOG_INTERNAL_MESSAGE REQUIRED absl_log_internal_message)
+pkg_check_modules(ABSL_LOG_INTERNAL_CHECK_OP REQUIRED
absl_log_internal_check_op)
if (WIN32)
find_package(ZLIB REQUIRED)
@@ -439,6 +441,11 @@
set(MYGPOQT5_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libmygpo-qt5/src)
endif()
+set(ABSL_LIBS
+ ${ABSL_LOG_INTERNAL_MESSAGE_LIBRARIES}
+ ${ABSL_LOG_INTERNAL_CHECK_OP_LIBRARIES}
+)
+
# Qocoa
add_subdirectory(3rdparty/qocoa)
diff -ruN
/root/oscbuild/build-root/home/abuild/rpmbuild/BUILD/Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/ext/clementine-tagreader/CMakeLists.txt
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.ix86.build/ext/clementine-tagreader/CMakeLists.txt
---
/root/oscbuild/build-root/home/abuild/rpmbuild/BUILD/Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/ext/clementine-tagreader/CMakeLists.txt
2023-07-10 02:28:08.454149341 -0400
+++
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.ix86.build/ext/clementine-tagreader/CMakeLists.txt
2023-07-10 02:17:14.737415093 -0400
@@ -29,6 +29,7 @@
libclementine-tagreader
Qt5::Core
Qt5::Network
+ ${ABSL_LIBS}
z
)
diff -ruN
/root/oscbuild/build-root/home/abuild/rpmbuild/BUILD/Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/src/CMakeLists.txt
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.ix86.build/src/CMakeLists.txt
---
/root/oscbuild/build-root/home/abuild/rpmbuild/BUILD/Clementine-bbda59a5f347a75bbecde0b1928e03942e367850/src/CMakeLists.txt
2023-07-10 02:28:08.458149493 -0400
+++
Clementine-bbda59a5f347a75bbecde0b1928e03942e367850.ix86.build/src/CMakeLists.txt
2023-07-10 02:17:36.770248731 -0400
@@ -1303,6 +1303,7 @@
${QTIOCOMPRESSOR_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${SQLITE_LIBRARIES}
+ ${ABSL_LIBS}
Qocoa
z
