Hello community, here is the log from the commit of package deepin-movie for openSUSE:Factory checked in at 2020-06-25 15:07:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-movie" Thu Jun 25 15:07:21 2020 rev:4 rq:816864 version:3.2.24.3 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2020-03-21 00:01:18.321094487 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.3060/deepin-movie.changes 2020-06-25 15:08:19.821535152 +0200 @@ -1,0 +2,6 @@ +Wed Jun 24 14:55:45 UTC 2020 - Hillwood Yang <[email protected]> + +- Add deepin-movie-Qt-5_15.patch + * Support Qt 5.15 + +------------------------------------------------------------------- New: ---- deepin-movie-Qt-5_15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.BOGhAq/_old 2020-06-25 15:08:20.465537173 +0200 +++ /var/tmp/diff_new_pack.BOGhAq/_new 2020-06-25 15:08:20.465537173 +0200 @@ -27,10 +27,12 @@ URL: https://github.com/linuxdeepin/deepin-movie-reborn Source: https://github.com/linuxdeepin/deepin-movie-reborn/archive/%{version}/%{name}-reborn-%{version}.tar.gz # PATCH-FIX-UPSTEAM deepin-movie-reborn-add-pkgconfig-check.patch [email protected] - fix lost pkgconfig check -Patch0: deepin-movie-reborn-add-pkgconfig-check.patch +Patch0: %{name}-reborn-add-pkgconfig-check.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 +Patch1: %{name}-add-qthelper.patch +# PATCH-FIX-UPSTEAM deepin-movie-qt-5_15.patch [email protected] - Support Qt 5.15 +Patch2: %{name}-Qt-5_15.patch BuildRequires: dtkcore BuildRequires: fdupes BuildRequires: glslang-devel @@ -93,11 +95,14 @@ %setup -q -n %{name}-reborn-%{version} %patch0 -p1 %patch1 -p1 +%if 0%{?suse_version} > 1500 +%patch2 -p1 +%endif sed -i 's,/usr/lib/dtk2/dtk-settings-tool,/usr/bin/dtk-settings-tool,g' src/CMakeLists.txt %build %cmake -DCMAKE_BUILD_TYPE=Release -make %{?_smp_mflags} +%make_build %install %cmake_install ++++++ deepin-movie-Qt-5_15.patch ++++++ diff -Nur deepin-movie-reborn-3.2.24.3/src/common/utility.h deepin-movie-reborn-3.2.24.3-new/src/common/utility.h --- deepin-movie-reborn-3.2.24.3/src/common/utility.h 2019-07-31 09:24:18.000000000 +0800 +++ deepin-movie-reborn-3.2.24.3-new/src/common/utility.h 2020-06-17 21:48:28.863244192 +0800 @@ -32,6 +32,7 @@ #include <QImage> #include <QList> +#include <QPainterPath> #include <xcb/xproto.h> diff -Nur deepin-movie-reborn-3.2.24.3/src/widgets/tip.cpp deepin-movie-reborn-3.2.24.3-new/src/widgets/tip.cpp --- deepin-movie-reborn-3.2.24.3/src/widgets/tip.cpp 2019-07-31 09:24:18.000000000 +0800 +++ deepin-movie-reborn-3.2.24.3-new/src/widgets/tip.cpp 2020-06-24 22:09:38.094202195 +0800 @@ -33,6 +33,7 @@ #include <QHBoxLayout> #include <QLabel> #include <QPainter> +#include <QPainterPath> #include <QGraphicsDropShadowEffect> #include <QPropertyAnimation> #include <QGraphicsOpacityEffect>
