Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2019-01-05 14:41:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clementine" Sat Jan 5 14:41:32 2019 rev:45 rq:655302 version:1.3.1+git20181203 Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2018-10-31 13:15:30.819392568 +0100 +++ /work/SRC/openSUSE:Factory/.clementine.new.28833/clementine.changes 2019-01-05 14:41:35.820519014 +0100 @@ -1,0 +2,26 @@ +Wed Dec 5 08:31:01 UTC 2018 - davejpla...@gmail.com + +- Update to git qt5 snapshot version 1.3.1+git20181203, it fixes + build with libcryptopp7. +- Clementine now uses qt5 to run. +- Added clementine-hidden-systray-icon.patch, systray icon is + hidden at start up on some kf5 systems. + +------------------------------------------------------------------- +Sun Dec 2 10:21:45 UTC 2018 - davejpla...@gmail.com + +- Update to git qt5 snapshot version 1.3.1+git20181201 + +------------------------------------------------------------------- +Sat Nov 3 09:49:01 UTC 2018 - davejpla...@gmail.com + +- Update to git qt5 snapshot version 1.3.1+git20181022 +- Removed incorporated patches: clementine-fix-sqlite.patch, + clementine-1.3.1-support-chromaprint-1.4.patch, + clementine-1.3.1-fix-library-clicks.patch, 6103.patch and + udisks2-support-for-devicemanager.patch. +- Added patches from Fedora: clementine-lastscope-size.patch and + clementine-udisks-headers.patch. +- Disable man page build for Leap:15 as it causes build failures. + +------------------------------------------------------------------- Old: ---- 6103.patch clementine-1.3.1-fix-library-clicks.patch clementine-1.3.1-support-chromaprint-1.4.patch clementine-1.3.1.tar.xz clementine-fix-sqlite.patch udisks2-support-for-devicemanager.patch New: ---- clementine-1.3.1+git20181203.tar.gz clementine-hidden-systray-icon.patch clementine-lastscope-size.patch clementine-udisks-headers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.ItFtjw/_old 2019-01-05 14:41:36.604518348 +0100 +++ /var/tmp/diff_new_pack.ItFtjw/_new 2019-01-05 14:41:36.604518348 +0100 @@ -12,32 +12,43 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define rev 1f87535c2fdaf2d70bb92783d3c05449d0f6cd24 + +%bcond_without git + +%if 0%{?suse_version} > 1500 +%bcond_without manpage +%else +%bcond_with manpage +%endif +%bcond_without qt5 + Name: clementine -Version: 1.3.1 +Version: 1.3.1+git20181203 Release: 0 Summary: A music player derived from Amarok 1.4 License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Players Url: https://clementine-player.org/ -Source: https://github.com/clementine-player/Clementine/releases/download/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE clementine-fix-sqlite.patch -- Fix startup with default SQLite 3.12+. -Patch0: clementine-fix-sqlite.patch -# PATCH-FEATURE-UPSTREAM udisks2-support-for-devicemanager.patch -Patch1: udisks2-support-for-devicemanager.patch -# PATCH-FIX-UPSTREAM clementine-1.3.1-fix-library-clicks.patch -- Fix a misbehaviour while clicking on tree items, from commit b85d09c. -Patch2: clementine-1.3.1-fix-library-clicks.patch +%if %{without git} +#Source: https://github.com/clementine-player/Clementine/releases/download/%%{version}/%%{name}-%%{version}.tar.xz +%else +Source0: https://github.com/clementine-player/Clementine/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz +%endif +# PATCH-FEATURE-UPSTREAM uudisks2-support-for-devicemanager.patch +Patch1: clementine-udisks-headers.patch +# PATCH-FIX-FEDORA clementine-lastscope-size.patch +Patch2: clementine-lastscope-size.patch # Patch fix factory build, add -fPIC to moodbar build Patch3: clementine-moodbar-fpic.patch # PATCH-FIX-UPSTREAM clementine-gcc7fix.patch davejpla...@gmail.com -- add <funtional> to includes. Patch4: clementine-gcc7fix.patch -# PATCH-FIX-UPSTREAM clementine-1.3.1-support-chromaprint-1.4.patch -- backported commit #ded3126 -Patch5: clementine-1.3.1-support-chromaprint-1.4.patch -# PATCH-FIX-UPSTREAM 6103.patch -- Fix track change hang gh#clementine-player/Clementine#6103 -Patch6: 6103.patch +# PATCH-FIX-OPENSUSE clementine-hidden-systray-icon.patch davejpla...@gmail.com -- sys tray icon is hidden on some plasma5 systems. +Patch6: clementine-hidden-systray-icon.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -45,19 +56,38 @@ %endif BuildRequires: cmake BuildRequires: fdupes -# pkgconfig(freeglut) isn't available in openSUSE Leap 42.1 and older. BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: gettext-tools BuildRequires: help2man BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files +%if %{with qt5} +#BuildRequires: pkgconfig(qca2-qt5) +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: liblastfm-qt5-devel +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Test) +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(libmygpo-qt5) +#BuildRequires: pkgconfig(QxtCore-qt5) +%else BuildRequires: liblastfm-devel BuildRequires: libqxt-devel -BuildRequires: update-desktop-files BuildRequires: pkgconfig(QJson) BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtSql) +%endif BuildRequires: pkgconfig(cryptopp) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(gio-2.0) @@ -80,9 +110,11 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(taglib) >= 1.8 +BuildRequires: pkgconfig(taglib) > 1.11.1 Requires: libtag1 >= 1.8 +%if %{without qt5} Recommends: sni-qt +%endif # clementine-kde was last used in openSUSE 12.2. # plasma_runner was dropped in Clementine 1.1.0. Provides: %{name}-kde = %{version} @@ -91,9 +123,6 @@ %description Clementine is a music player and library organiser. -Clementine is a fork of Amarok 1.4, with some features rewritten to -take advantage of Qt4. - Features: * Search and play your local music library. * Listen to internet radio from Last.FM and SomaFM. @@ -101,17 +130,20 @@ * Native desktop notifications. %prep +%if %{without git} %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%else +%setup -q -n Clementine-%{rev} +rm -rvf 3rdparty/libmygpo-qt5 +%endif %patch3 %patch4 -%patch5 -p1 -%patch6 -p1 +%patch1 +%patch2 +%patch6 # NOTE: Build using system versions of libraries. -rm -rvf 3rdparty/taglib -#rm -rvf 3rdparty/libmygpo-qt +#rm -rvf 3rdparty/taglib +#rm -rvf 3rdparty/libmygpo-qt5 #rm -rvf 3rdparty/sha2 %build @@ -119,10 +151,12 @@ export CXXFLAGS="$CFLAGS" %cmake \ -DBUILD_WERROR=OFF \ - -DUSE_SYSTEM_QXT=ON \ -DUSE_BUILTIN_TAGLIB=OFF \ -DUSE_SYSTEM_PROJECTM=ON \ -DBUNDLE_PROJECTM_PRESETS=OFF \ +%if %{without qt5} + -DUSE_SYSTEM_QXT=ON \ +%endif -DENABLE_MOODBAR=ON \ -DENABLE_DBUS=ON make %{?_smp_mflags} @@ -130,6 +164,7 @@ %install %cmake_install +%if %{with manpage} # Generate a man page with help2man. mkdir -p %{buildroot}%{_mandir}/man1/ pushd %{buildroot}%{_mandir}/man1/ @@ -137,9 +172,11 @@ help2man --version-string="%{version}" -N -o %{name}.1 ./%{name} rm -f %{name} popd +%endif %suse_update_desktop_file clementine Qt AudioVideo Audio Player +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -147,18 +184,27 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files %defattr(-,root,root) -%doc Changelog COPYING README.md +%doc Changelog README.md +%license COPYING %{_bindir}/clementine* %{_datadir}/applications/clementine.desktop %{_datadir}/icons/hicolor/*/apps/clementine.* +%if %{with manpage} +%{_mandir}/man1/%{name}.1%{?ext_man} +%endif +%if %{with qt5} +%{_datadir}/metainfo/ +%{_datadir}/kservices5/ +%else %dir %{_datadir}/appdata/ %{_datadir}/appdata/clementine.appdata.xml -%{_mandir}/man1/%{name}.1%{?ext_man} %dir %{_datadir}/kde4/ %dir %{_datadir}/kde4/services/ %{_datadir}/kde4/services/clementine-*.protocol +%endif %changelog ++++++ clementine-gcc7fix.patch ++++++ --- /var/tmp/diff_new_pack.ItFtjw/_old 2019-01-05 14:41:36.620518334 +0100 +++ /var/tmp/diff_new_pack.ItFtjw/_new 2019-01-05 14:41:36.620518334 +0100 @@ -1,7 +1,7 @@ Index: src/core/mergedproxymodel.cpp =================================================================== ---- src/core/mergedproxymodel.cpp.orig 2015-12-15 14:13:23.000000000 +0200 -+++ src/core/mergedproxymodel.cpp 2017-04-03 14:32:15.461279963 +0200 +--- src/core/mergedproxymodel.cpp.orig 2018-10-05 11:56:49.000000000 +0200 ++++ src/core/mergedproxymodel.cpp 2018-11-02 13:34:18.926328355 +0200 @@ -20,7 +20,7 @@ #include "mergedproxymodel.h" @@ -10,12 +10,12 @@ +#include <functional> #include <QStringList> - #include <limits> + #include <functional> Index: src/devices/giolister.cpp =================================================================== ---- src/devices/giolister.cpp.orig 2015-12-15 14:13:23.000000000 +0200 -+++ src/devices/giolister.cpp 2017-04-03 15:39:47.004508784 +0200 -@@ -22,6 +22,7 @@ +--- src/devices/giolister.cpp.orig 2018-10-05 11:56:49.000000000 +0200 ++++ src/devices/giolister.cpp 2018-11-02 13:34:18.926328355 +0200 +@@ -23,6 +23,7 @@ #include <QFile> #include <QStringList> #include <QtDebug> ++++++ clementine-hidden-systray-icon.patch ++++++ Index: dist/clementine.desktop =================================================================== --- dist/clementine.desktop.orig 2018-10-22 17:44:59.000000000 +0200 +++ dist/clementine.desktop 2018-11-03 16:55:54.935439281 +0200 @@ -36,7 +36,7 @@ TryExec=clementine Icon=clementine Terminal=false Categories=AudioVideo;Player;Qt;Audio; -StartupNotify=false +StartupNotify=true MimeType=application/ogg;application/x-ogg;application/x-ogm-audio;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;video/x-ms-asf;x-content/audio-player;x-scheme-handler/zune;x-scheme-handler/itpc;x-scheme-handler/itms;x-scheme-handler/feed; Actions=Play;Pause;Stop;StopAfterCurrent;Previous;Next; ++++++ clementine-lastscope-size.patch ++++++ Index: src/analyzers/analyzerbase.cpp =================================================================== --- src/analyzers/analyzerbase.cpp.orig 2018-10-05 11:56:49.000000000 +0200 +++ src/analyzers/analyzerbase.cpp 2018-11-02 14:28:05.237304839 +0200 @@ -107,6 +107,7 @@ void Analyzer::Base::paintEvent(QPaintEv const Engine::Scope& thescope = engine_->scope(timeout_); int i = 0; + lastScope_.resize(fht_->size()); // convert to mono here - our built in analyzers need mono, but the // engines provide interleaved pcm for (uint x = 0; static_cast<int>(x) < fht_->size(); ++x) { @@ -225,7 +226,7 @@ QColor Analyzer::Base::getPsychedelicCol // Calculate total magnitudes for different bark bands. double bands[sBarkBandCount]{}; - for (int i = 0; i < barkband_table_.size(); ++i) { + for (int i = 0; i < std::min(barkband_table_.size(), (int)scope.size()); ++i) { bands[barkband_table_[i]] += scope[i]; } ++++++ clementine-moodbar-fpic.patch ++++++ --- /var/tmp/diff_new_pack.ItFtjw/_old 2019-01-05 14:41:36.644518314 +0100 +++ /var/tmp/diff_new_pack.ItFtjw/_new 2019-01-05 14:41:36.644518314 +0100 @@ -1,9 +1,9 @@ Index: gst/moodbar/CMakeLists.txt =================================================================== ---- gst/moodbar/CMakeLists.txt.orig -+++ gst/moodbar/CMakeLists.txt +--- gst/moodbar/CMakeLists.txt.orig 2018-10-05 11:56:49.000000000 +0200 ++++ gst/moodbar/CMakeLists.txt 2018-11-02 13:33:13.223890411 +0200 @@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 2.6) + cmake_minimum_required(VERSION 2.8.11) -set(CMAKE_C_FLAGS "-Wall") -set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall --std=c++0x") ++++++ clementine-udisks-headers.patch ++++++ Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt.orig 2018-11-02 14:30:43.839117342 +0200 +++ src/CMakeLists.txt 2018-11-02 14:31:29.000773095 +0200 @@ -946,6 +946,8 @@ if(HAVE_DBUS) list(APPEND HEADERS ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.h) list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbus/avahientrygroup.cpp) + set_source_files_properties( dbus/org.freedesktop.UDisks.xml dbus/org.freedesktop.UDisks.Device.xml PROPERTIES NO_NAMESPACE TRUE) + # DeviceKit DBUS interfaces if(HAVE_DEVICEKIT) set_source_files_properties(dbus/org.freedesktop.UDisks.xml
