New Upstream Snapshot - liblastfm
Ready changes
Summary
Merged new upstream version: 1.1.0+git20190823.1.2ce2bfe (was: 1.1.0).
Resulting package
Built on 2022-12-16T15:37 (took 6m17s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots liblastfm-fingerprint5-1-dbgsymapt install -t fresh-snapshots liblastfm-fingerprint5-1apt install -t fresh-snapshots liblastfm5-1-dbgsymapt install -t fresh-snapshots liblastfm5-1apt install -t fresh-snapshots liblastfm5-dev
Lintian Result
- liblastfm-fingerprint5-1-dbgsym_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.deb
- liblastfm-fingerprint5-1_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.deb
- liblastfm5-1-dbgsym_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.deb
- liblastfm5-1_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.deb
- liblastfm5-dev_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.deb
- liblastfm_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3.dsc
- liblastfm_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.buildinfo
- liblastfm_1.1.0+git20190823.2.2ce2bfe-1~jan+nus3_amd64.changes
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be88967..d4fd670 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON)
# installation dirs
include(GNUInstallDirs)
+include(FeatureSummary)
#cmake module path
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
@@ -27,19 +28,18 @@ 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)
@@ -56,9 +56,6 @@ if(Qt5Core_DIR)
# endmacro()
else()
find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED)
-
- macro(qt5_use_modules)
- endmacro()
endif()
@@ -97,3 +94,5 @@ if(BUILD_TESTS)
enable_testing()
add_subdirectory(tests)
endif()
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/README.md b/README.md
index acf41e1..62a1ee9 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,26 @@ Additionally, to build it you will need:
We recommend that you use Homebrew to install dependancies http://mxcl.github.com/homebrew/
- brew install qt
+In order to install QT 5 run:
+```
+brew install qt
+```
+
+In order to install QT 4.8 run:
+
+```
+brew install cartr/qt4/qt@4
+brew install cartr/qt4/qt-webkit@2.3
+```
+Don't forget to turn on the BUILD_WITH_QT4 option in CMakeLists.txt
+
+
+And for other dependencies:
+```
+brew install cmake
+brew install fftw
+brew install libsamplerate
+```
## Linux/*NIX
@@ -93,6 +112,6 @@ though, auto-determining proxy settings on Windows and OS X for instance.
## Public Headers
1. Header guards should be prefixed with LASTFM, eg. LASTFM_WS_REPLY_H
-2. #includes should be to the system path eg. #include <lastfm/Scrobbler.h>
+2. #includes should be to the system path eg. `#include <lastfm/Scrobbler.h>`
3. Don't make a header public unless it is absolutely required!
4. All headers under src/ (not subfolders) are public by default
diff --git a/debian/changelog b/debian/changelog
index 5a0dbb5..869c840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+liblastfm (1.1.0+git20190823.1.2ce2bfe-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 16 Dec 2022 15:32:57 -0000
+
liblastfm (1.1.0-5) unstable; urgency=medium
* QA upload.
diff --git a/debian/patches/fix_gcc11_ftbfs.patch b/debian/patches/fix_gcc11_ftbfs.patch
index 7147d1e..d02faf5 100644
--- a/debian/patches/fix_gcc11_ftbfs.patch
+++ b/debian/patches/fix_gcc11_ftbfs.patch
@@ -3,10 +3,10 @@ Author: Xeonacid
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984114
Bug-Upstream: https://github.com/lastfm/liblastfm/issues/39
Origin: upstream, https://github.com/lastfm/liblastfm/pull/41/commits/d51ad3e759331d7d79c6675c5d22541280bf9a70
-Index: liblastfm-1.0.9/src/fingerprint/Fingerprint.cpp
+Index: liblastfm.git/src/fingerprint/Fingerprint.cpp
===================================================================
---- liblastfm-1.0.9.orig/src/fingerprint/Fingerprint.cpp
-+++ liblastfm-1.0.9/src/fingerprint/Fingerprint.cpp
+--- liblastfm.git.orig/src/fingerprint/Fingerprint.cpp
++++ liblastfm.git/src/fingerprint/Fingerprint.cpp
@@ -94,7 +94,7 @@ lastfm::Fingerprint::data() const
@@ -25,10 +25,10 @@ Index: liblastfm-1.0.9/src/fingerprint/Fingerprint.cpp
{
// The response data will consist of a number and a string.
// The number is the fpid and the string is either FOUND or NEW
-Index: liblastfm-1.0.9/src/fingerprint/Fingerprint.h
+Index: liblastfm.git/src/fingerprint/Fingerprint.h
===================================================================
---- liblastfm-1.0.9.orig/src/fingerprint/Fingerprint.h
-+++ liblastfm-1.0.9/src/fingerprint/Fingerprint.h
+--- liblastfm.git.orig/src/fingerprint/Fingerprint.h
++++ liblastfm.git/src/fingerprint/Fingerprint.h
@@ -71,7 +71,7 @@ namespace lastfm
};
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()
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/17/d24d70992f67911d7bd1540c4c20c2939971ae.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/5e/6c915e2ea67c7615d97f710168c61cf0f7fd59.debug
No differences were encountered between the control files of package liblastfm-fingerprint5-1
No differences were encountered between the control files of package liblastfm-fingerprint5-1-dbgsym
No differences were encountered between the control files of package liblastfm5-1
Control files of package liblastfm5-1-dbgsym: lines which differ (wdiff format)
Build-Ids: 5e6c915e2ea67c7615d97f710168c61cf0f7fd59 17d24d70992f67911d7bd1540c4c20c2939971ae
No differences were encountered between the control files of package liblastfm5-dev