Hello community,
here is the log from the commit of package libechonest-qt5 for openSUSE:Factory
checked in at 2018-05-29 16:51:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libechonest-qt5 (Old)
and /work/SRC/openSUSE:Factory/.libechonest-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libechonest-qt5"
Tue May 29 16:51:14 2018 rev:3 rq:612197 version:2.3.0+20150206
Changes:
--------
--- /work/SRC/openSUSE:Factory/libechonest-qt5/libechonest-qt5.changes
2015-02-08 11:42:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libechonest-qt5.new/libechonest-qt5.changes
2018-05-29 16:51:29.473548374 +0200
@@ -1,0 +2,5 @@
+Fri May 25 07:39:45 UTC 2018 - christo...@krop.fr
+
+- Add 0001-Fix-build-with-Qt-5.11.patch to fix build with Qt 5.11.
+
+-------------------------------------------------------------------
New:
----
0001-Fix-build-with-Qt-5.11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libechonest-qt5.spec ++++++
--- /var/tmp/diff_new_pack.J2ti0L/_old 2018-05-29 16:51:30.213521148 +0200
+++ /var/tmp/diff_new_pack.J2ti0L/_new 2018-05-29 16:51:30.213521148 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libechonest-qt5
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,31 +19,29 @@
%define _major_version 2
%define _minor_version 3
%define _patch_version 0
-
%define soname %{_major_version}_%{_minor_version}
-
Name: libechonest-qt5
-BuildRequires: cmake
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Xml)
Version: %{_major_version}.%{_minor_version}.%{_patch_version}+20150206
Release: 0
-Source: libechonest-%{version}.tar.bz2
-Source1: baselibs.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url: https://projects.kde.org/libechonest
-
# main package
Summary: Qt library for communicating with The Echo Nest
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/Libraries
+URL: https://projects.kde.org/libechonest
+Source: libechonest-%{version}.tar.bz2
+Source1: baselibs.conf
+# PATCH-FIX-UPSTREAM -- 0001-Fix-build-with-Qt-5.11.patch
+Patch0: 0001-Fix-build-with-Qt-5.11.patch
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Xml)
%description
It currently supports almost all of the features of the Echo Nest API,
including all the API functions.
-
# bin package
%package -n libechonest5-%{soname}
Summary: Qt library for communicating with The Echo Nest
@@ -61,37 +59,27 @@
%description devel
It currently supports almost all of the features of the Echo Nest API,
including all the API functions.
-
%prep
-%setup -q -n libechonest-%{version}
+%autosetup -p1 -n libechonest-%{version}
%build
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DECHONEST_BUILD_TESTS=OFF \
- -DBUILD_WITH_QT4=OFF \
-%if "%{_lib}" == "lib64"
- -DLIB_SUFFIX=64
-%endif
+%cmake -DBUILD_WITH_QT4=OFF \
+ -DECHONEST_BUILD_TESTS=OFF
-make VERBOSE=1 %{?_smp_mflags}
+%make_jobs
%install
-make DESTDIR=%{buildroot} install
+%cmake_install
%post -n libechonest5-%{soname} -p /sbin/ldconfig
-
%postun -n libechonest5-%{soname} -p /sbin/ldconfig
%files -n libechonest5-%{soname}
-%defattr(-,root,root,-)
-%doc COPYING*
+%license COPYING*
%{_libdir}/libechonest*.so.*
%files devel
-%defattr(-,root,root,-)
-%doc COPYING*
+%license COPYING*
%{_libdir}/libechonest*.so
%{_includedir}/echonest5/
%{_libdir}/pkgconfig/libechonest5.pc
++++++ 0001-Fix-build-with-Qt-5.11.patch ++++++
>From 98bcabe35cf8ae4db9c4ae64542f7fa1fe6159a8 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christo...@krop.fr>
Date: Fri, 25 May 2018 09:38:55 +0200
Subject: [PATCH] Fix build with Qt 5.11
---
CMakeLists.txt | 8 +++-----
src/CMakeLists.txt | 8 ++++++--
tests/CMakeLists.txt | 1 -
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7115d3a..8a768e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,13 @@ option(BUILD_WITH_QT4 "Build libechonest with Qt4 no matter
if Qt5 was found" ON
if( NOT BUILD_WITH_QT4 )
find_package(Qt5Core QUIET)
+ if( Qt5Core_DIR )
# CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
find_package(Qt5Xml REQUIRED)
- if( Qt5Core_DIR )
+ find_package(Qt5Network REQUIRED)
message(STATUS "Found Qt5! Be aware that Qt5-support is still
experimental and not officially supported!")
set(ECHONEST_LIB_VERSION_SUFFIX 5)
-
+ include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
macro(qt_wrap_cpp)
qt5_wrap_cpp(${ARGN})
endmacro()
@@ -39,9 +40,6 @@ if( NOT Qt5Core_DIR )
endif()
include( ${QT_USE_FILE} )
- macro(qt5_use_modules)
- endmacro()
-
macro(qt_wrap_cpp)
qt4_wrap_cpp(${ARGN})
endmacro()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4b8835c..1b8f97c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,9 +45,13 @@ set( LIBECHONEST_H
QT_WRAP_CPP( ${LIBECHONEST_H} )
add_library( ${ECHONEST_LIB_TARGET_NAME} SHARED ${LIBECHONEST_SRC} )
-target_link_libraries( ${ECHONEST_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES} )
+if(BUILD_WITH_QT4)
+ target_link_libraries( ${ECHONEST_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES} )
+else()
+ target_link_libraries( ${ECHONEST_LIB_TARGET_NAME} ${Qt5Core_LIBRARIES}
${Qt5Network_LIBRARIES} )
+endif()
+
set_target_properties( ${ECHONEST_LIB_TARGET_NAME} PROPERTIES VERSION
${ECHONEST_LIB_VERSION} SOVERSION ${ECHONEST_LIB_VERSION_SONAME} )
-qt5_use_modules( ${ECHONEST_LIB_TARGET_NAME} Core Network Xml )
install( TARGETS ${ECHONEST_LIB_TARGET_NAME} RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 91d70db..368f3d2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,7 +17,6 @@ macro(add_echonest_test _source)
add_executable(${_name} ${_source})
target_link_libraries(${_name} ${ECHONEST_LIB_TARGET_NAME}
${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QTCORE_QTNETWORK_LIBRARY}
${QT_QTXML_LIBRARY} ${QJSON_LIBRARIES} )
add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name})
- qt5_use_modules(${_name} Network Test)
endmacro(add_echonest_test)
add_echonest_test( ArtistTest.cpp )
--
2.17.0
