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-06-02 22:10:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-music-player (Old)
and /work/SRC/openSUSE:Factory/.deepin-music-player.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-music-player"
Wed Jun 2 22:10:50 2021 rev:25 rq:891660 version:6.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-player.changes
2021-02-16 22:42:40.638124078 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-music-player.new.1898/deepin-music-player.changes
2021-06-02 22:11:02.236125050 +0200
@@ -1,0 +2,10 @@
+Wed Apr 14 13:29:41 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update version to 6.1.2
+ * Add help documents
+ * Fix bug
+ * Use mpris-qt5
+- Add Patches: fix-return-type.patch and recompile-with-fPIC.patch
+- Drop deepin-music-Qt-5_15.patch, merged by upstream.
+
+-------------------------------------------------------------------
Old:
----
deepin-music-6.0.1.91.tar.gz
deepin-music-Qt-5_15.patch
New:
----
deepin-music-6.1.2.tar.gz
fix-return-type.patch
recompile-with-fPIC.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-music-player.spec ++++++
--- /var/tmp/diff_new_pack.fSoEiI/_old 2021-06-02 22:11:03.132124976 +0200
+++ /var/tmp/diff_new_pack.fSoEiI/_new 2021-06-02 22:11:03.132124976 +0200
@@ -2,7 +2,7 @@
# spec file for package deepin-music-player
#
# Copyright (c) 2021 SUSE LLC
-# Copyright (c) 2013-2020 Hillwood Yang <[email protected]>
+# Copyright (c) 2013-2021 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,14 @@
#
+%if 0%{?is_opensuse}
+ %define distribution openSUSE-Edition
+%else
+ %define distribution SUSE-Edition
+%endif
+
Name: deepin-music-player
-Version: 6.0.1.91
+Version: 6.1.2
Release: 0
Summary: Deepin Music Player
License: GPL-3.0-or-later
@@ -27,8 +33,10 @@
Source0:
https://github.com/linuxdeepin/deepin-music/archive/%{version}/deepin-music-%{version}.tar.gz
# 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
+# PATCH-FIX-UPSTREAM deepin-music-Qt-5_15.patch [email protected] - Fix
return type error
+Patch1: fix-return-type.patch
+# PATCH-FIX-UPSTREAM recompile-with-fPIC.patch [email protected] - Fix
link failed on 64bit
+Patch2: recompile-with-fPIC.patch
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: libQt5Network-devel
@@ -41,6 +49,8 @@
BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Codecs)
BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: pkgconfig(dbusextended-qt5)
+BuildRequires: pkgconfig(dframeworkdbus)
BuildRequires: pkgconfig(dtkcore)
BuildRequires: pkgconfig(dtkgui)
BuildRequires: pkgconfig(dtkwidget)
@@ -52,10 +62,14 @@
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libcue)
BuildRequires: pkgconfig(libvlc)
+BuildRequires: pkgconfig(mpris-qt5)
BuildRequires: pkgconfig(taglib)
+BuildRequires: pkgconfig(udisks2-qt5)
BuildRequires: pkgconfig(xext)
Requires: qt5integration
Provides: deepin-music
+Requires: vlc
+Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -68,10 +82,13 @@
%prep
%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
+src/music-player/data/deepin-music.desktop
+sed -i '/CMAKE_INSTALL_VOICE_LIBDIR/s|/usr/lib|${CMAKE_INSTALL_LIBDIR}|' \
+src/libmusic-plugin/CMakeLists.txt
%build
-%cmake
+%cmake -DVERSION=%{version}-%{distribution} \
+ -DAPP_VERSION=%{version}-%{distribution}
%make_build
%install
@@ -79,7 +96,7 @@
find %{buildroot} -type f -name "*.a" -delete -print
-%suse_update_desktop_file -r deepin-music Player AudioVideo
+%suse_update_desktop_file -r deepin-music Audio Player
%fdupes %{buildroot}%{_datadir}
%files
@@ -89,6 +106,10 @@
%{_bindir}/deepin-music
%{_datadir}/applications/deepin-music.desktop
%{_datadir}/icons/hicolor/scalable/apps/deepin-music.svg
+%{_datadir}/deepin-manual
+%dir %{_libdir}/deepin-aiassistant
+%dir %{_libdir}/deepin-aiassistant/serivce-plugins
+%{_libdir}/deepin-aiassistant/serivce-plugins/libmusic-plugin.so
%files lang
%defattr(-,root,root,-)
++++++ Fix-library-link.patch ++++++
--- /var/tmp/diff_new_pack.fSoEiI/_old 2021-06-02 22:11:03.148124975 +0200
+++ /var/tmp/diff_new_pack.fSoEiI/_new 2021-06-02 22:11:03.148124975 +0200
@@ -1,6 +1,6 @@
-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
+diff -Nur deepin-music-6.1.2/src/libdmusic/CMakeLists.txt
deepin-music-6.1.2-new/src/libdmusic/CMakeLists.txt
+--- deepin-music-6.1.2/src/libdmusic/CMakeLists.txt 2021-03-18
19:27:28.000000000 +0800
++++ deepin-music-6.1.2-new/src/libdmusic/CMakeLists.txt 2021-04-14
16:55:51.923159586 +0800
@@ -19,11 +19,11 @@
set_target_properties(dmusic PROPERTIES VERSION 1.0.0 SOVERSION 1.0)
@@ -10,9 +10,8 @@
#??????????????????(????????????????????????dtkwidget??????????????????dtkgui??????)???????????????3rd_lib
pkg_check_modules(3rd_lib REQUIRED
-- dtkwidget dtkgui
-+ dtkwidget dtkgui libavcodec
+- dtkwidget dtkgui dtkcore
++ dtkwidget dtkgui dtkcore libavcodec
)
#?????????????????????????????????????????????????????????(??????
*_INCLUDE_DIRS)
target_include_directories(${CMD_NAME} PUBLIC ${3rd_lib_INCLUDE_DIRS})
-
++++++ deepin-music-6.0.1.91.tar.gz -> deepin-music-6.1.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-6.0.1.91.tar.gz
/work/SRC/openSUSE:Factory/.deepin-music-player.new.1898/deepin-music-6.1.2.tar.gz
differ: char 15, line 1
++++++ fix-return-type.patch ++++++
diff -Nur deepin-music-6.1.2/src/music-player/widget/searchresulttabwidget.cpp
deepin-music-6.1.2-new/src/music-player/widget/searchresulttabwidget.cpp
--- deepin-music-6.1.2/src/music-player/widget/searchresulttabwidget.cpp
2021-03-18 19:27:28.000000000 +0800
+++ deepin-music-6.1.2-new/src/music-player/widget/searchresulttabwidget.cpp
2021-04-14 20:19:50.671019283 +0800
@@ -189,6 +189,7 @@
} else if (m_StackedWidget->currentWidget() == m_singerListView) {
return m_singerListView->getSortType();
}
+ return DataBaseService::SortByNull;
}
QListView::ViewMode SearchResultTabWidget::getViewMode()
++++++ recompile-with-fPIC.patch ++++++
diff -Nur deepin-music-6.1.2/CMakeLists.txt
deepin-music-6.1.2-new/CMakeLists.txt
--- deepin-music-6.1.2/CMakeLists.txt 2021-03-18 19:27:28.000000000 +0800
+++ deepin-music-6.1.2-new/CMakeLists.txt 2021-04-14 20:45:54.390757392
+0800
@@ -9,6 +9,8 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
+set(CMAKE_C_FLAGS "-fPIC")
+set(CMAKE_CXX_FLAGS "-fPIC")
option(USE_DXCB "integration with dxcb platform plugin" OFF)
option(DMR_DEBUG "turn on debug output" off)
