Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-music-player for
openSUSE:Factory checked in at 2021-02-16 22:36:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-music-player (Old)
and /work/SRC/openSUSE:Factory/.deepin-music-player.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-music-player"
Tue Feb 16 22:36:46 2021 rev:24 rq:872538 version:6.0.1.91
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-player.changes
2020-08-20 22:29:47.768008467 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-music-player.new.28504/deepin-music-player.changes
2021-02-16 22:42:40.638124078 +0100
@@ -1,0 +2,11 @@
+Fri Jan 29 14:48:24 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 6.0.1.91
+ * no longer output libraries
+ * feature update
+ * Switch backend to VLC
+ * Use new dtk apis
+ * Fix many bugs
+- Fix library link, add Fix-library-link.patch
+
+-------------------------------------------------------------------
Old:
----
deepin-music-5.0.1.tar.gz
deepin-music-player-rpmlintrc
New:
----
Fix-library-link.patch
deepin-music-6.0.1.91.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-music-player.spec ++++++
--- /var/tmp/diff_new_pack.AJQz8u/_old 2021-02-16 22:42:41.254124816 +0100
+++ /var/tmp/diff_new_pack.AJQz8u/_new 2021-02-16 22:42:41.254124816 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deepin-music-player
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2013-2020 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
@@ -18,17 +18,17 @@
Name: deepin-music-player
-Version: 5.0.1
+Version: 6.0.1.91
Release: 0
Summary: Deepin Music Player
License: GPL-3.0-or-later
Group: Productivity/Multimedia/Sound/Players
URL: https://github.com/linuxdeepin/deepin-music
Source0:
https://github.com/linuxdeepin/deepin-music/archive/%{version}/deepin-music-%{version}.tar.gz
-Patch0: deepin-music-Qt-5_15.patch
-# Fix boo#1131464
-Source1: %{name}-rpmlintrc
-BuildRequires: QtAV-devel
+# PATCH-FIX-UPSTREAM Fix-library-link.patch [email protected] - Fix
library link
+Patch0: Fix-library-link.patch
+# PATCH-FIX-UPSTREAM deepin-music-Qt-5_15.patch [email protected] -
Support Qt 5.15+
+Patch1: deepin-music-Qt-5_15.patch
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: libQt5Network-devel
@@ -39,19 +39,23 @@
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libqt5-qtx11extras-devel
BuildRequires: update-desktop-files
+BuildRequires: cmake(KF5Codecs)
+BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(dtkcore)
+BuildRequires: pkgconfig(dtkgui)
BuildRequires: pkgconfig(dtkwidget)
+BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libcue)
+BuildRequires: pkgconfig(libvlc)
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(xext)
-Provides: deepin-music = %{version}-%{release}
-Obsoletes: deepin-music < %{version}-%{release}
-Recommends: deepin-music-libnetease-meta-search = %{version}-%{release}
+Requires: qt5integration
+Provides: deepin-music
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -59,114 +63,24 @@
customizable UI, and featuring music search by Pinyin and Quanpin. It
supports colorful lyrics, online audio support and a "mini mode".
-%package -n libdmusic1
-Summary: Libraries for Deepin Music Player
-Group: System/Libraries
-
-%description -n libdmusic1
-This package contains the main implementation of the Deepin Music
-Player.
-
-%package -n deepin-music-libnetease-meta-search
-Summary: Libnetease integration for the Deepin Music Player
-Group: Productivity/Multimedia/Sound/Players
-
-%description -n deepin-music-libnetease-meta-search
-This package contains the libnetease plugin for searches with the
-Deepin Music Player searches.
-
-%package -n libdbusextended-qt5-1
-Summary: D-Bus system for the Deepin Music Player
-Group: System/Libraries
-
-%description -n libdbusextended-qt5-1
-Deepin Music Player with brilliant and tweakful UI Deepin-UI based,
-gstreamer front-end, with features likes search music by pinyin,
-quanpin, colorful lyrics supports, and more powerful functions
-you will found.
-
-The libdbusextended-qt5 is the Dbus system libraries for
-Deepin Music Player.
-
-%package -n libmpris-qt5-1
-Summary: MPRI system for the Deepin Music Player
-Group: System/Libraries
-
-%description -n libmpris-qt5-1
-The MPRI system library for Deepin Music Player.
-
-%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-1 = %{version}-%{release}
-
-%description -n libdbusextended-qt5-devel
-The libdbusextended-devel package contains the header files and developer
-docs for libdbusextended.
-
-%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}-%{release}
-
-%description -n libmpris-qt5-devel
-The libmpris-devel package contains the header files and developer
-docs for libmpris.
-
%lang_package
%prep
-%setup -q -n deepin-music-%{version}
-%if 0%{?suse_version} > 1500
-%patch0 -p1
-%endif
-
-sed -i '/%1/s|lib|%{_lib}|' src/music-player/core/pluginmanager.cpp
-sed -i '/target.path/s|lib|%{_lib}|' src/libdmusic/libdmusic.pro \
-src/plugin/netease-meta-search/netease-meta-search.pro
-# fix the non-standard unity stuff, anyway we will not use it.
-# appending -x
-sed -i 's/^\[\([^D].*$\)/\[X-\1/' src/music-player/data/deepin-music.desktop
-# replace [[:space:]] with '-'
-sed -i 's/ Shortcut /-Shortcut-/' src/music-player/data/deepin-music.desktop
-# Enable netease plugin
-sed -i 's/#SUBDIRS/SUBDIRS/' src/plugin/plugin.pro
-sed -i 's|share/$${TARGET}|share/deepin-music|' src/music-player/install.pri
+%autosetup -p1 -n deepin-music-%{version}
+sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-music/g' \
+music/music-player/data/deepin-music.desktop
%build
-%qmake5 DEFINES+=QT_NO_DEBUG_OUTPUT \
- PREFIX=%{_prefix} \
- LIB_INSTALL_DIR=%{_libdir} \
- LIBSUFFIX=%{lib}
-make %{?_smp_mflags}
+%cmake
+%make_build
%install
-%qmake5_install
+%cmake_install
-%ifnarch i386 i486 i586 i686 athlon %{arm}
- mv %{buildroot}%{_prefix}/lib/*.so* %{buildroot}%{_libdir}
- mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_libdir}/pkgconfig
- rm -rf %{buildroot}%{_prefix}/lib
-%endif
-
-# Remove invalid developement files.
-rm -rf %{buildroot}%{_libdir}/libdmusic.so
-rm -rf %{buildroot}%{_datadir}/translations
+find %{buildroot} -type f -name "*.a" -delete -print
%suse_update_desktop_file -r deepin-music Player AudioVideo
-%fdupes %{buildroot}%{_prefix}
-
-%post -n libdmusic1 -p /sbin/ldconfig
-
-%postun -n libdmusic1 -p /sbin/ldconfig
-
-%post -n libdbusextended-qt5-1 -p /sbin/ldconfig
-
-%postun -n libdbusextended-qt5-1 -p /sbin/ldconfig
-
-%post -n libmpris-qt5-1 -p /sbin/ldconfig
-
-%postun -n libmpris-qt5-1 -p /sbin/ldconfig
+%fdupes %{buildroot}%{_datadir}
%files
%defattr(-,root,root,-)
@@ -174,44 +88,8 @@
%license LICENSE COPYING
%{_bindir}/deepin-music
%{_datadir}/applications/deepin-music.desktop
-%{_datadir}/dman
%{_datadir}/icons/hicolor/scalable/apps/deepin-music.svg
-%files -n libdmusic1
-%defattr(-,root,root,-)
-%{_libdir}/libdmusic.so.*
-
-%files -n deepin-music-libnetease-meta-search
-%defattr(-,root,root,-)
-%dir %{_libdir}/deepin-music
-%dir %{_libdir}/deepin-music/plugins
-%{_libdir}/deepin-music/plugins/libnetease-meta-search.so.*
-%{_libdir}/deepin-music/plugins/libnetease-meta-search.so
-
-%files -n libdbusextended-qt5-1
-%defattr(-,root,root,-)
-%{_libdir}/libdbusextended-qt5.so.*
-
-%files -n libmpris-qt5-1
-%defattr(-,root,root,-)
-%{_libdir}/libmpris-qt5.so.*
-
-%files -n libdbusextended-qt5-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/dbusextended-qt5.pc
-%{_libdir}/libdbusextended-qt5.so
-%{_includedir}/DBusExtended
-
-%files -n libmpris-qt5-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/mpris-qt5.pc
-%{_libdir}/libmpris-qt5.so
-%dir %{_libdir}/qt5/
-%dir %{_libdir}/qt5/mkspecs/
-%dir %{_libdir}/qt5/mkspecs/features/
-%{_libdir}/qt5/mkspecs/features/mpris-qt5.prf
-%{_includedir}/MprisQt/
-
%files lang
%defattr(-,root,root,-)
%{_datadir}/deepin-music
++++++ Fix-library-link.patch ++++++
diff -Nur deepin-music-6.0.1.91/music/libdmusic/CMakeLists.txt
deepin-music-6.0.1.91-new/music/libdmusic/CMakeLists.txt
--- deepin-music-6.0.1.91/music/libdmusic/CMakeLists.txt 2020-11-12
20:55:12.000000000 +0800
+++ deepin-music-6.0.1.91-new/music/libdmusic/CMakeLists.txt 2021-01-29
21:05:56.047335260 +0800
@@ -19,11 +19,11 @@
set_target_properties(dmusic PROPERTIES VERSION 1.0.0 SOVERSION 1.0)
#??????????????????????????????????????????
-find_package(PkgConfig REQUIRED)
+find_package(PkgConfig REQUIRED libavcodec)
#??????????????????(????????????????????????dtkwidget??????????????????dtkgui??????)???????????????3rd_lib
pkg_check_modules(3rd_lib REQUIRED
- dtkwidget dtkgui
+ dtkwidget dtkgui libavcodec
)
#?????????????????????????????????????????????????????????(??????
*_INCLUDE_DIRS)
target_include_directories(${CMD_NAME} PUBLIC ${3rd_lib_INCLUDE_DIRS})
++++++ deepin-music-5.0.1.tar.gz -> deepin-music-6.0.1.91.tar.gz ++++++
++++ 336875 lines of diff (skipped)
++++++ deepin-music-Qt-5_15.patch ++++++
--- /var/tmp/diff_new_pack.AJQz8u/_old 2021-02-16 22:42:41.798125468 +0100
+++ /var/tmp/diff_new_pack.AJQz8u/_new 2021-02-16 22:42:41.798125468 +0100
@@ -1,17 +1,17 @@
-diff -Nur deepin-music-5.0.1/src/music-player/view/lyricwidget.cpp
deepin-music-5.0.1-new/src/music-player/view/lyricwidget.cpp
---- deepin-music-5.0.1/src/music-player/view/lyricwidget.cpp 2019-06-01
14:20:13.000000000 +0800
-+++ deepin-music-5.0.1-new/src/music-player/view/lyricwidget.cpp
2020-06-17 20:34:12.950660815 +0800
-@@ -29,6 +29,7 @@
- #include <QHBoxLayout>
- #include <QListView>
+diff -Nur deepin-music-6.0.1.91/music/music-player/view/lyricwidget.cpp
deepin-music-6.0.1.91-new/music/music-player/view/lyricwidget.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/lyricwidget.cpp
2020-11-12 20:55:12.000000000 +0800
++++ deepin-music-6.0.1.91-new/music/music-player/view/lyricwidget.cpp
2021-01-29 21:10:10.514333644 +0800
+@@ -28,6 +28,7 @@
#include <QPainter>
-+#include <QPainterPath>
#include <QResizeEvent>
#include <QPaintEvent>
++#include <QPainterPath>
#include <QStringListModel>
-diff -Nur deepin-music-5.0.1/src/music-player/view/widget/cover.cpp
deepin-music-5.0.1-new/src/music-player/view/widget/cover.cpp
---- deepin-music-5.0.1/src/music-player/view/widget/cover.cpp 2019-06-01
14:20:13.000000000 +0800
-+++ deepin-music-5.0.1-new/src/music-player/view/widget/cover.cpp
2020-06-17 20:34:40.078624269 +0800
+ #include <QAbstractItemDelegate>
+
+diff -Nur deepin-music-6.0.1.91/music/music-player/view/widget/cover.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/cover.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/cover.cpp
2020-11-12 20:55:12.000000000 +0800
++++ deepin-music-6.0.1.91-new/music/music-player/view/widget/cover.cpp
2021-01-29 22:14:47.222688022 +0800
@@ -23,6 +23,7 @@
#include <QDebug>
@@ -20,9 +20,75 @@
#include <QGraphicsDropShadowEffect>
static auto borderPenWidth = 1.0;
-diff -Nur deepin-music-5.0.1/src/music-player/view/widget/soundvolume.cpp
deepin-music-5.0.1-new/src/music-player/view/widget/soundvolume.cpp
---- deepin-music-5.0.1/src/music-player/view/widget/soundvolume.cpp
2019-06-01 14:20:13.000000000 +0800
-+++ deepin-music-5.0.1-new/src/music-player/view/widget/soundvolume.cpp
2020-06-17 20:35:00.610598544 +0800
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/delegate/musiclistdatadelegate.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/delegate/musiclistdatadelegate.cpp
+---
deepin-music-6.0.1.91/music/music-player/view/widget/delegate/musiclistdatadelegate.cpp
2020-11-12 20:55:12.000000000 +0800
++++
deepin-music-6.0.1.91-new/music/music-player/view/widget/delegate/musiclistdatadelegate.cpp
2021-01-29 22:16:58.338306819 +0800
+@@ -22,6 +22,7 @@
+ #include "musiclistdatadelegate.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QDebug>
+ #include <QDate>
+ #include <QEvent>
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
+---
deepin-music-6.0.1.91/music/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
2020-11-12 20:55:12.000000000 +0800
++++
deepin-music-6.0.1.91-new/music/music-player/view/widget/delegate/musicsearchlistdelegate.cpp
2021-01-29 22:17:25.110228989 +0800
+@@ -25,6 +25,7 @@
+ #include <DHiDPIHelper>
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTextDocument>
+ #include <QStyleOptionViewItem>
+ #include <QTextCursor>
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/delegate/playitemdelegate.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/delegate/playitemdelegate.cpp
+---
deepin-music-6.0.1.91/music/music-player/view/widget/delegate/playitemdelegate.cpp
2020-11-12 20:55:12.000000000 +0800
++++
deepin-music-6.0.1.91-new/music/music-player/view/widget/delegate/playitemdelegate.cpp
2021-01-29 22:17:57.626106765 +0800
+@@ -26,6 +26,7 @@
+ #include <QFont>
+ #include <DGuiApplicationHelper>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStandardItemModel>
+
+ #include <musicmeta.h>
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/musicpixmapbutton.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/musicpixmapbutton.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/musicpixmapbutton.cpp
2020-11-12 20:55:12.000000000 +0800
++++
deepin-music-6.0.1.91-new/music/music-player/view/widget/musicpixmapbutton.cpp
2021-01-29 22:21:32.385261987 +0800
+@@ -23,6 +23,7 @@
+
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+
+ MusicPixmapButton::MusicPixmapButton(QWidget *parent)
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/musictitleimage.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/musictitleimage.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/musictitleimage.cpp
2020-11-12 20:55:12.000000000 +0800
++++
deepin-music-6.0.1.91-new/music/music-player/view/widget/musictitleimage.cpp
2021-01-29 22:22:04.981133779 +0800
+@@ -22,6 +22,7 @@
+ #include "musictitleimage.h"
+
+ #include <QPainter>
++#include <QPainterPath>
+
+ MusicTitleImageWidget::MusicTitleImageWidget(QWidget *parent)
+ : DWidget( parent)
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/soundpixmapbutton.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/soundpixmapbutton.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/soundpixmapbutton.cpp
2020-11-12 20:55:12.000000000 +0800
++++
deepin-music-6.0.1.91-new/music/music-player/view/widget/soundpixmapbutton.cpp
2021-01-29 22:25:51.928241116 +0800
+@@ -19,6 +19,7 @@
+
+ #include <QDebug>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRect>
+
+ SoundPixmapButton::SoundPixmapButton(QWidget *parent)
+diff -Nur deepin-music-6.0.1.91/music/music-player/view/widget/soundvolume.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/soundvolume.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/soundvolume.cpp
2020-11-12 20:55:12.000000000 +0800
++++ deepin-music-6.0.1.91-new/music/music-player/view/widget/soundvolume.cpp
2021-01-29 22:22:25.209054216 +0800
@@ -23,6 +23,7 @@
#include <QDebug>
@@ -31,3 +97,36 @@
#include <QWheelEvent>
#include <QGraphicsDropShadowEffect>
#include <QVBoxLayout>
+diff -Nur deepin-music-6.0.1.91/music/music-player/view/widget/tooltips.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/tooltips.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/tooltips.cpp
2020-11-12 20:55:12.000000000 +0800
++++ deepin-music-6.0.1.91-new/music/music-player/view/widget/tooltips.cpp
2021-01-29 22:22:50.108956273 +0800
+@@ -33,6 +33,7 @@
+ #include <QHBoxLayout>
+ #include <QLabel>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGraphicsDropShadowEffect>
+ #include <QPropertyAnimation>
+ #include <QGraphicsOpacityEffect>
+diff -Nur deepin-music-6.0.1.91/music/music-player/view/widget/waveform.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/waveform.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/waveform.cpp
2020-11-12 20:55:12.000000000 +0800
++++ deepin-music-6.0.1.91-new/music/music-player/view/widget/waveform.cpp
2021-01-29 22:23:16.244853467 +0800
+@@ -26,6 +26,7 @@
+ #include <QPaintEvent>
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QAudioBuffer>
+ #include <QAudioFormat>
+ #include <QWidget>
+diff -Nur
deepin-music-6.0.1.91/music/music-player/view/widget/waveformscale.cpp
deepin-music-6.0.1.91-new/music/music-player/view/widget/waveformscale.cpp
+--- deepin-music-6.0.1.91/music/music-player/view/widget/waveformscale.cpp
2020-11-12 20:55:12.000000000 +0800
++++ deepin-music-6.0.1.91-new/music/music-player/view/widget/waveformscale.cpp
2021-01-29 22:23:42.904748611 +0800
+@@ -27,6 +27,7 @@
+ #include <QEvent>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+
+ #include <mediameta.h>
+
