Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-movie for openSUSE:Factory checked in at 2021-06-02 22:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-movie" Wed Jun 2 22:10:37 2021 rev:7 rq:891506 version:5.7.11 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2021-04-22 18:06:14.210721768 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.1898/deepin-movie.changes 2021-06-02 22:10:50.416126014 +0200 @@ -1,0 +2,10 @@ +Wed Apr 28 13:12:37 UTC 2021 - Hillwood Yang <[email protected]> + +- Update version to 5.7.11 + * Fix bugs + * Add help documents + * Use mpris-qt5 and dbusextended-qt5 +- Drop deepin-movie-add-qthelper.patch and libavformat-version-check.patch + merged by upstream. + +------------------------------------------------------------------- Old: ---- deepin-movie-add-qthelper.patch deepin-movie-reborn-5.7.6.165.tar.gz libavformat-version-check.patch New: ---- deepin-movie-reborn-5.7.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.EkEsaX/_old 2021-06-02 22:10:51.224125949 +0200 +++ /var/tmp/diff_new_pack.EkEsaX/_new 2021-06-02 22:10:51.224125949 +0200 @@ -15,11 +15,16 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%if 0%{?is_opensuse} + %define distribution openSUSE-Edition +%else + %define distribution SUSE-Edition +%endif %define sover 0_1 Name: deepin-movie -Version: 5.7.6.165 +Version: 5.7.11 Release: 0 Summary: Deepin Video Players License: GPL-3.0-or-later AND OpenSSL @@ -29,14 +34,9 @@ # PATCH-FIX-UPSTEAM Fix-library-link.patch [email protected] # fix library link error and add this includedir for ffmpeg Patch0: Fix-library-link.patch -# PATCH-FIX-UPSTEAM deepin-movie-add-qthelper.patch [email protected] -# qthelper.hpp was removed from mpv project, move this api in this project. -Patch1: deepin-movie-add-qthelper.patch -# PATCH-FIX-UPSTEAM libavformat-version-check.patch [email protected] - fix build on new ffmpeg -Patch2: libavformat-version-check.patch %ifarch aarch64 # PATCH-FIX-UPSTEAM fix-build-on-ARM.patch [email protected] -Patch3: fix-build-on-ARM.patch +Patch1: fix-build-on-ARM.patch %endif BuildRequires: dtkcore >= 5.0.0 BuildRequires: fdupes @@ -46,6 +46,7 @@ BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(dtkcore) >= 5.0.0 @@ -69,6 +70,8 @@ BuildRequires: pkgconfig(xcb-shape) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(mpris-qt5) +BuildRequires: pkgconfig(dbusextended-qt5) Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -100,11 +103,11 @@ %prep %autosetup -p1 -n %{name}-reborn-%{version} -sed -i '/#include <DPalette>/a #include <QPainterPath>' src/widgets/{tip,toolbutton}.h -sed -i 's/Exec=deepin-movie/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-movie/g' src/%{name}.desktop +sed -i 's/Exec=deepin-movie/Exec=env QT_QPA_PLATFORMTHEME=deepin deepin-movie/g' %{name}.desktop %build -%cmake -DCMAKE_BUILD_TYPE=Release +%cmake -DCMAKE_BUILD_TYPE=Release \ + -DVERSION=%{version}-%{distribution} %make_build %install @@ -122,6 +125,7 @@ %license LICENSE LICENSE.OpenSSL %{_bindir}/%{name} %{_datadir}/%{name} +%{_datadir}/deepin-manual %exclude %{_datadir}/%{name}/translations %{_datadir}/applications/%{name}.desktop %dir %{_datadir}/icons/hicolor/scalable ++++++ Fix-library-link.patch ++++++ --- /var/tmp/diff_new_pack.EkEsaX/_old 2021-06-02 22:10:51.248125947 +0200 +++ /var/tmp/diff_new_pack.EkEsaX/_new 2021-06-02 22:10:51.252125946 +0200 @@ -1,6 +1,6 @@ -diff -Nur deepin-movie-reborn-5.7.6.165/src/CMakeLists.txt deepin-movie-reborn-5.7.6.165-new/src/CMakeLists.txt ---- deepin-movie-reborn-5.7.6.165/src/CMakeLists.txt 2020-11-17 13:48:27.000000000 +0800 -+++ deepin-movie-reborn-5.7.6.165-new/src/CMakeLists.txt 2021-02-02 20:59:40.266718557 +0800 +diff -Nur deepin-movie-reborn-5.7.11/src/CMakeLists.txt deepin-movie-reborn-5.7.11-new/src/CMakeLists.txt +--- deepin-movie-reborn-5.7.11/src/CMakeLists.txt 2021-03-22 12:01:47.000000000 +0800 ++++ deepin-movie-reborn-5.7.11-new/src/CMakeLists.txt 2021-04-28 20:36:58.860380331 +0800 @@ -7,6 +7,7 @@ include_directories(${CMAKE_INCLUDE_CURRENT_DIR}) @@ -9,15 +9,15 @@ find_package(Qt5Widgets) find_package(Qt5DBus) -diff -Nur deepin-movie-reborn-5.7.6.165/src/libdmr/CMakeLists.txt deepin-movie-reborn-5.7.6.165-new/src/libdmr/CMakeLists.txt ---- deepin-movie-reborn-5.7.6.165/src/libdmr/CMakeLists.txt 2020-11-17 13:48:27.000000000 +0800 -+++ deepin-movie-reborn-5.7.6.165-new/src/libdmr/CMakeLists.txt 2021-02-02 20:57:55.399161779 +0800 -@@ -21,7 +21,7 @@ - ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/../backends/mpv) +diff -Nur deepin-movie-reborn-5.7.11/src/libdmr/CMakeLists.txt deepin-movie-reborn-5.7.11-new/src/libdmr/CMakeLists.txt +--- deepin-movie-reborn-5.7.11/src/libdmr/CMakeLists.txt 2021-03-22 12:01:47.000000000 +0800 ++++ deepin-movie-reborn-5.7.11-new/src/libdmr/CMakeLists.txt 2021-04-28 20:38:43.480136035 +0800 +@@ -22,7 +22,7 @@ target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent -- Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV -+ Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV gsettings-qt - ${FFTHUMB_LIBRARIES} GL) + Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::DBus PkgConfig::AV +- ${FFTHUMB_LIBRARIES} GL) ++ gsettings-qt ${FFTHUMB_LIBRARIES} GL) #target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent # Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV GL png jpeg) + ++++++ deepin-movie-reborn-5.7.6.165.tar.gz -> deepin-movie-reborn-5.7.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie-reborn-5.7.6.165.tar.gz /work/SRC/openSUSE:Factory/.deepin-movie.new.1898/deepin-movie-reborn-5.7.11.tar.gz differ: char 13, line 1 ++++++ fix-build-on-ARM.patch ++++++ --- /var/tmp/diff_new_pack.EkEsaX/_old 2021-06-02 22:10:51.292125943 +0200 +++ /var/tmp/diff_new_pack.EkEsaX/_new 2021-06-02 22:10:51.292125943 +0200 @@ -1,13 +1,13 @@ -diff -Nur deepin-movie-reborn-5.7.6.165/src/backends/mpv/mpv_glwidget.cpp deepin-movie-reborn-5.7.6.165-new/src/backends/mpv/mpv_glwidget.cpp ---- deepin-movie-reborn-5.7.6.165/src/backends/mpv/mpv_glwidget.cpp 2020-11-17 13:48:27.000000000 +0800 -+++ deepin-movie-reborn-5.7.6.165-new/src/backends/mpv/mpv_glwidget.cpp 2021-04-21 22:09:20.171936528 +0800 -@@ -37,6 +37,9 @@ +diff -Nur deepin-movie-reborn-5.7.11/src/backends/mpv/mpv_glwidget.cpp deepin-movie-reborn-5.7.11-new/src/backends/mpv/mpv_glwidget.cpp +--- deepin-movie-reborn-5.7.11/src/backends/mpv/mpv_glwidget.cpp 2021-03-22 12:01:47.000000000 +0800 ++++ deepin-movie-reborn-5.7.11-new/src/backends/mpv/mpv_glwidget.cpp 2021-04-28 20:47:48.535650905 +0800 +@@ -42,6 +42,9 @@ #include <dthememanager.h> #include <DApplication> + +#define GLAPIENTRY + - DWIDGET_USE_NAMESPACE - - + //#include <wayland-client.h> + //#include "../../window/qplatformnativeinterface.h" + //qpa/qplatformnativeinterface.h
