Hello community, here is the log from the commit of package liblastfm-qt5 for openSUSE:Factory checked in at 2018-05-29 10:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblastfm-qt5 (Old) and /work/SRC/openSUSE:Factory/.liblastfm-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liblastfm-qt5" Tue May 29 10:43:48 2018 rev:4 rq:612182 version:1.0.9+20150206 Changes: -------- --- /work/SRC/openSUSE:Factory/liblastfm-qt5/liblastfm-qt5.changes 2016-05-23 16:38:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liblastfm-qt5.new/liblastfm-qt5.changes 2018-05-29 10:43:50.854866925 +0200 @@ -1,0 +2,7 @@ +Thu May 24 21:24:47 UTC 2018 - [email protected] + +- Add patches to fix build with Qt 5.11: + * 0001-Make-Qt5-build-default-and-simplify-logic-add-missin.patch + * 0004-Fix-build-with-Qt-5.11_beta3-drop-qt5_use_modules.patch + +------------------------------------------------------------------- New: ---- 0001-Make-Qt5-build-default-and-simplify-logic-add-missin.patch 0004-Fix-build-with-Qt-5.11_beta3-drop-qt5_use_modules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblastfm-qt5.spec ++++++ --- /var/tmp/diff_new_pack.r6HCmD/_old 2018-05-29 10:43:51.378847587 +0200 +++ /var/tmp/diff_new_pack.r6HCmD/_new 2018-05-29 10:43:51.378847587 +0200 @@ -1,7 +1,7 @@ # # spec file for package liblastfm-qt5 # -# Copyright (c) 2016 SUSE LINUX 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 @@ -20,11 +20,15 @@ Version: 1.0.9+20150206 Release: 0 Summary: A Qt C++ Library for the Last.fm Webservices -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/Libraries -Url: https://github.com/lastfm/liblastfm/ +URL: https://github.com/lastfm/liblastfm/ Source: liblastfm-%{version}.tar.gz Source1: baselibs.conf +#PATCH-FIX-UPSTREAM +Patch0: 0001-Make-Qt5-build-default-and-simplify-logic-add-missin.patch +#PATCH-FIX-UPSTREAM +Patch1: 0004-Fix-build-with-Qt-5.11_beta3-drop-qt5_use_modules.patch BuildRequires: cmake BuildRequires: fftw3-devel BuildRequires: libsamplerate-devel @@ -35,7 +39,6 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Xml) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description liblastfm is a collection of libraries to help you integrate Last.fm services @@ -79,11 +82,12 @@ This package contains development files for liblastfm. %prep -%setup -q -n liblastfm-%{version} +%autosetup -p1 -n liblastfm-%{version} %build %cmake \ -DBUILD_WITH_QT4=OFF \ + -DBUILD_TESTS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo make %{?_smp_mflags} @@ -96,17 +100,16 @@ %postun -n liblastfm_fingerprint5-1 -p /sbin/ldconfig %files -n liblastfm5-1 -%defattr(-,root,root,-) -%doc COPYING +%license COPYING +%doc README.md %{_libdir}/liblastfm5.so.* %files -n liblastfm_fingerprint5-1 -%defattr(-,root,root,-) +%license COPYING %{_libdir}/liblastfm_fingerprint5.so.* %files devel -%defattr(-,root,root,-) -%doc COPYING +%license COPYING %{_libdir}/liblastfm5.so %{_libdir}/liblastfm_fingerprint5.so %{_includedir}/lastfm5/ ++++++ 0001-Make-Qt5-build-default-and-simplify-logic-add-missin.patch ++++++ >From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 1 Apr 2018 11:51:42 +0200 Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing deps --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be88967..e628611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module # setup qt stuff set(CMAKE_AUTOMOC ON) -option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF) +option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF) -if( NOT BUILD_WITH_QT4 ) - # try Qt5 first, and prefer that if found - find_package(Qt5Core QUIET) -endif() +if(NOT BUILD_WITH_QT4) + find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG) + + if(BUILD_FINGERPRINT) + find_package(Qt5Sql REQUIRED CONFIG) + endif() -if(Qt5Core_DIR) set(LASTFM_LIB_VERSION_SUFFIX 5) - message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") include_directories(${Qt5Core_INCLUDE_DIRS}) if(UNIX AND NOT APPLE) - find_package(Qt5DBus REQUIRED) + find_package(Qt5DBus REQUIRED CONFIG) endif() # macro(qt_wrap_ui) -- 2.17.0 ++++++ 0004-Fix-build-with-Qt-5.11_beta3-drop-qt5_use_modules.patch ++++++ >From aeb0cbc56376021444a56a984613faacefedfea9 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 15 Apr 2018 21:31:14 +0200 Subject: [PATCH 4/4] Fix build with Qt 5.11_beta3 (drop qt5_use_modules) --- CMakeLists.txt | 3 -- src/CMakeLists.txt | 63 +++++++++++++++++++--------------- src/fingerprint/CMakeLists.txt | 20 ++++++----- tests/lastfm_add_test.cmake | 16 +++++---- 4 files changed, 55 insertions(+), 47 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52589b5..c8bc89d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,9 +57,6 @@ if(NOT BUILD_WITH_QT4) # endmacro() else() find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED) - - macro(qt5_use_modules) - endmacro() endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0f872fb..22ce506 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,16 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/global.h.in ${CMAKE_CURRENT_BINARY_DI add_definitions(${QT_DEFINITIONS}) include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) -set(liblastfm_LIBRARIES - ${QT_QTCORE_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${QT_QTXML_LIBRARY} -) - -list(APPEND liblastfm_QT5_MODULES - Xml - Network -) set(liblastfm_SOURCES ws.cpp @@ -49,15 +39,11 @@ if(WIN32) if(NOT MINGW) add_definitions("-D_ATL_DLL -D_CRT_SECURE_NO_WARNINGS") - list(APPEND liblastfm_SOURCES + set(liblastfm_SOURCES ${liblastfm_SOURCES} win/WNetworkConnectionMonitor_win.cpp win/WmiSink.cpp win/NdisEvents.cpp ) - list(APPEND liblastfm_LIBRARIES - winhttp - wbemuuid - ) endif() endif() @@ -67,30 +53,51 @@ if(APPLE) #set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) #set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk") - list(APPEND liblastfm_SOURCES + set(liblastfm_SOURCES ${liblastfm_SOURCES} mac/MNetworkConnectionMonitor_mac.cpp ) - - find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - list(APPEND liblastfm_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${SYSTEMCONFIGURATION_LIBRARY} - ) endif() if(UNIX AND NOT APPLE) - list(APPEND liblastfm_SOURCES + set(liblastfm_SOURCES ${liblastfm_SOURCES} linux/LNetworkConnectionMonitor_linux.cpp ) - list(APPEND liblastfm_LIBRARIES ${QT_QTDBUS_LIBRARY}) - list(APPEND liblastfm_QT5_MODULES DBus) endif() add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES}) -qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES}) -target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES}) +if(Qt5Core_DIR) + target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::Network Qt5::Xml) + if(UNIX AND NOT APPLE) + target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::DBus) + endif() +else() + target_link_libraries(${LASTFM_LIB_TARGET_NAME} + ${QT_QTCORE_LIBRARY} + ${QT_QTNETWORK_LIBRARY} + ${QT_QTXML_LIBRARY} + ) + if(UNIX AND NOT APPLE) + target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${QT_QTDBUS_LIBRARY}) + endif() +endif() + +if(WIN32 AND NOT MINGW) + target_link_libraries(${LASTFM_LIB_TARGET_NAME} + winhttp + wbemuuid + ) +endif() + +if(APPLE) + find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + target_link_libraries(${LASTFM_LIB_TARGET_NAME} + ${COREFOUNDATION_LIBRARY} + ${SYSTEMCONFIGURATION_LIBRARY} + ) +endif() + set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES VERSION ${LASTFM_VERSION_STRING} SOVERSION ${LASTFM_SOVERSION} diff --git a/src/fingerprint/CMakeLists.txt b/src/fingerprint/CMakeLists.txt index 126f8d9..4a74e0d 100644 --- a/src/fingerprint/CMakeLists.txt +++ b/src/fingerprint/CMakeLists.txt @@ -26,21 +26,23 @@ set(lastfm_fingerprint_HEADERS add_library(${FINGERPRINT_LIB_TARGET_NAME} SHARED ${lastfm_fingerprint_SOURCES}) -target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} - ${LASTFM_LIB_TARGET_NAME} - ${QT_QTSQL_LIBRARY} - ${QT_QTCORE_LIBRARY} - ${LIBSAMPLERATE_LIBRARY} - ${LIBFFTW3_LIBRARY} -) - set_target_properties(${FINGERPRINT_LIB_TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS LASTFM_FINGERPRINT_LIB VERSION ${LASTFM_VERSION_STRING} SOVERSION ${LASTFM_SOVERSION} ) -qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml) +target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} + ${LASTFM_LIB_TARGET_NAME} + ${LIBSAMPLERATE_LIBRARY} + ${LIBFFTW3_LIBRARY} +) + +if(Qt5Core_DIR) + target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} Qt5::Network Qt5::Sql Qt5::Xml) +else() + target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY}) +endif() install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/tests/lastfm_add_test.cmake b/tests/lastfm_add_test.cmake index a4a1686..2f0664d 100644 --- a/tests/lastfm_add_test.cmake +++ b/tests/lastfm_add_test.cmake @@ -6,13 +6,15 @@ macro(lastfm_add_test test_class) configure_file(Test${LASTFM_TEST_CLASS}.h Test${LASTFM_TEST_CLASS}.h) add_executable(${LASTFM_TEST_CLASS}Test Test${LASTFM_TEST_CLASS}.cpp) - qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network) - - target_link_libraries(${LASTFM_TEST_CLASS}Test - ${LASTFM_LIB_TARGET_NAME} - ${QT_QTTEST_LIBRARY} - ${QT_QTCORE_LIBRARY} - ) + if(Qt5Core_DIR) + target_link_libraries(${LASTFM_TEST_CLASS}Test Qt5::Core Qt5::Test Qt5::Xml Qt5::Network + ${LASTFM_LIB_TARGET_NAME} + ) + else() + target_link_libraries(${LASTFM_TEST_CLASS}Test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} + ${LASTFM_LIB_TARGET_NAME} + ) + endif() add_test(NAME ${LASTFM_TEST_CLASS}Test COMMAND ${LASTFM_TEST_CLASS}Test) endmacro() -- 2.17.0
