commit deepin-music-player for openSUSE:Factory
Hello community, here is the log from the commit of package deepin-music-player for openSUSE:Factory checked in at 2018-01-01 22:17:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-music-player (Old) and /work/SRC/openSUSE:Factory/.deepin-music-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-music-player" Mon Jan 1 22:17:19 2018 rev:14 rq:545677 version:3.1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-player.changes 2017-03-17 15:06:52.399079701 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-music-player.new/deepin-music-player.changes 2018-01-01 22:17:28.203774815 +0100 @@ -1,0 +2,43 @@ +Fri Nov 24 08:41:32 UTC 2017 - hillwood@opensuse.org + +- Update 3.1.7.2 + * Fix showNormal not work (bb22dc99) + * Fix crash when selectNext on qt 5.9 (bed9d856) + * Fix hidpi playing state (84783418) + * Fix lyric text cut (1dbf4dc2) + * Fix move qmediaplayer to main thread (3ce0ca3c) + * Fix dialog style (cfc0db93) + * Use deviceRatio in musicitemdelegate (f3a65085) + * Enable drag progress bar (22f8916e) + * Fix border pos (6fa9cc9e) + * Set dialog flag error (ef200472) + * Change footer bar cover mouse cursor (a4837dce) + * Fix libdmusic install path (2d86199a) + * Make dropdown show full text on ru locale (fcc58c97) + * Stop next after continue error count >= 5 (e6127596) + * Call dbus trash (b5d6fcb4) + * Extern footer progress (3459625e) + * All use svg (a942c308) + * Use dbus call filemanager (e276e636) + * Remove dtk2 workaround (0eb1ee32) + * Use dtk DWaterProgress (6109ffee) + * Add hidpi support (107e5987) +- Drop deepin-tool-kit +- Drop libdui + +------------------------------------------------------------------- +Thu Sep 28 03:35:49 UTC 2017 - hillwood@opensuse.org + +- Fix build in armv7l. + +------------------------------------------------------------------- +Wed Sep 27 09:00:49 UTC 2017 - hillwood@opensuse.org + +- Update to 3.1.6 + * Update deepin-tool-kit + * Use QtAV + * Use dtkwidget + * Use libcue +- Drop deepin-music-dui.patch, merged by upstream. + +------------------------------------------------------------------- Old: ---- deepin-music-3.0.1.tar.gz deepin-music-dui.patch New: ---- deepin-music-3.1.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-music-player.spec ++++++ --- /var/tmp/diff_new_pack.wbJYuG/_old 2018-01-01 22:17:29.911204767 +0100 +++ /var/tmp/diff_new_pack.wbJYuG/_new 2018-01-01 22:17:29.915203432 +0100 @@ -18,14 +18,14 @@ Name: deepin-music-player -Version: 3.0.1 +Version: 3.1.7.2 Release: 0 Summary: Deepin Music Player License: GPL-3.0+ Group: Productivity/Multimedia/Sound/Players Url: https://github.com/linuxdeepin/deepin-music -Source0: deepin-music-%{version}.tar.gz -Patch0: deepin-music-dui.patch +Source0: https://github.com/linuxdeepin/deepin-music/archive/%{version}/deepin-music-%{version}.tar.gz +BuildRequires: QtAV-devel BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: libQt5Network-devel @@ -36,15 +36,16 @@ BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-qtx11extras-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(dtkbase-0-2) -BuildRequires: pkgconfig(dtkutil-0-2) -BuildRequires: pkgconfig(dtkwidget-0-2) -BuildRequires: pkgconfig(dui) +BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(dtksettings) +BuildRequires: pkgconfig(dtksettingsview) +BuildRequires: pkgconfig(dtkwidget) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libcue) BuildRequires: pkgconfig(taglib) # produce png icons from svg BuildRequires: rsvg-view @@ -94,7 +95,6 @@ %package -n libdbusextended-qt5-devel Summary: Development files for the Deepin Music Player D-Bus system Group: Development/Libraries/C and C++ -Requires: libdbusextended-qt5-devel = %{version} %description -n libdbusextended-qt5-devel The libdbusextended-devel package contains the header files and developer @@ -103,7 +103,6 @@ %package -n libmpris-qt5-devel Summary: Development files for the Deepin Music Player MPRI library Group: Development/Libraries/C and C++ -Requires: libmpris-qt5-1 = %{version} %description -n libmpris-qt5-devel The libmpris-devel package contains the header files and developer @@ -111,8 +110,7 @@ %prep %setup -q -n deepin-music-%{version} -%patch0 -p1 -sed -i 's|lrelease|lrelease-qt5|g' tool/translate_generation.sh +sed -i 's|lrelease|lrelease-qt5|g' tool/translate_generation.* sed -i '/%1/s|lib|%{_lib}|' music-player/core/pluginmanager.cpp sed -i '/target.path/s|lib|%{_lib}|' libdmusic/libdmusic.pro \ plugin/netease-meta-search/netease-meta-search.pro @@ -125,24 +123,24 @@ %build %qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \ PREFIX=%{_prefix} \ - LIB_INSTALL_DIR=%{_libdir} + LIB_INSTALL_DIR=%{_libdir} \ + LIBSUFFIX=%{lib} make %{?_smp_mflags} %install %qmake5_install +%ifarch i386 i486 i586 i686 athlon armv7hl +%else + mv %{buildroot}%{_libexecdir}/*.so* %{buildroot}%{_libdir} + mv %{buildroot}%{_libexecdir}/pkgconfig %{buildroot}%{_libdir}/pkgconfig + rm -rf %{buildroot}%{_libexecdir} +%endif + +# Remove invalid developement files. rm -rf %{buildroot}%{_libdir}/libdmusic.so rm -rf %{buildroot}%{_libdir}/deepin-music/plugins/libnetease-meta-search.so -# Fix paths in pkgconfig files -sed -i 's|${prefix}|/usr|g' %{buildroot}%{_libdir}/pkgconfig/*.pc -sed -i 's|${includedir}|/usr/include|g' %{buildroot}%{_libdir}/pkgconfig/*.pc -sed -i 's|-I/usr/include|-I/usr/include/qt5/MprisQt|g' \ -%{buildroot}%{_libdir}/pkgconfig/mpris-qt5.pc -sed -i 's|-I/usr/include|-I/usr/include/qt5/DBusExtended|g' \ -%{buildroot}%{_libdir}/pkgconfig/dbusextended-qt5.pc -sed -i 's|-L/home/abuild/rpmbuild/BUILD/deepin-music-3.0.1/dist/lib ||g' %{buildroot}%{_libdir}/pkgconfig/mpris-qt5.pc - # produce png icons from svg for i in 16 24 32 48 64 96 128 256; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps @@ -152,7 +150,7 @@ done %suse_update_desktop_file -r deepin-music Player AudioVideo -%fdupes %{buildroot}/%{_prefix} +%fdupes %{buildroot}%{_prefix} %post %icon_theme_cache_postun @@ -183,6 +181,7 @@ %{_datadir}/deepin-music %{_datadir}/dman %{_datadir}/icons/hicolor/*/apps/deepin-music.png +%{_datadir}/icons/hicolor/scalable/apps/deepin-music.svg %files -n libdmusic1 %defattr(-,root,root,-) @@ -206,12 +205,7 @@ %defattr(-,root,root,-) %{_libdir}/pkgconfig/dbusextended-qt5.pc %{_libdir}/libdbusextended-qt5.so -%dir %{_libdir}/qt5/ -%dir %{_libdir}/qt5/mkspecs/ -%dir %{_libdir}/qt5/mkspecs/features/ -%{_libdir}/qt5/mkspecs/features/dbusextended-qt5.prf -%dir %{_includedir}/qt5/ -%{_includedir}/qt5/DBusExtended +%{_includedir}/DBusExtended %files -n libmpris-qt5-devel %defattr(-,root,root,-) @@ -221,7 +215,6 @@ %dir %{_libdir}/qt5/mkspecs/ %dir %{_libdir}/qt5/mkspecs/features/ %{_libdir}/qt5/mkspecs/features/mpris-qt5.prf -%dir %{_includedir}/qt5/ -%{_includedir}/qt5/MprisQt/ +%{_includedir}/MprisQt/ %changelog ++++++ deepin-music-3.0.1.tar.gz -> deepin-music-3.1.7.2.tar.gz ++++++ ++++ 75709 lines of diff (skipped)
participants (1)
-
root@hilbert.suse.de