diff --git a/dde-introduction-5.6.0.7.tar.gz b/dde-introduction-5.6.0.7.tar.gz deleted file mode 100644 index 49c7034a1a5fa4023bc7a11a6dc411da1509fb00..0000000000000000000000000000000000000000 Binary files a/dde-introduction-5.6.0.7.tar.gz and /dev/null differ diff --git a/dde-introduction-5.6.13.tar.gz b/dde-introduction-5.6.13.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..94e9614896c8019a14fe9adeccd7c59c63c068bf Binary files /dev/null and b/dde-introduction-5.6.13.tar.gz differ diff --git a/dde-introduction.spec b/dde-introduction.spec index 250d0fe68af6f5c5cb248b427bf9ff7399829707..ba1ef2b91409d83110547d2c4d1ee46f2d473687 100644 --- a/dde-introduction.spec +++ b/dde-introduction.spec @@ -1,22 +1,32 @@ +%global debug_package %{nil} +%define specrelease 1%{?dist} +%if 0%{?openeuler} +%define specrelease 1 +%endif + Name: dde-introduction -Version: 5.6.0.7 -Release: 2 +Version: 5.6.13 +Release: %{specrelease} Summary: Introduction for UOS License: GPLv3+ URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: modify-QPainterPath-error.patch BuildRequires: gcc-c++ +BuildRequires: cmake3 BuildRequires: qt5-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: dtkcore-devel dtkwidget-devel +BuildRequires: dtkwidget-devel +BuildRequires: pkgconfig(dtkgui) +BuildRequires: pkgconfig(dtkcore) BuildRequires: pkgconfig(dframeworkdbus) -#BuildRequires: pkgconfig(libdmr) +# BuildRequires: pkgconfig(libdmr) BuildRequires: pkgconfig(gsettings-qt) - -#BuildRequires: ffmpegthumbnailer-devel +BuildRequires: deepin-desktop-base +BuildRequires: ffmpegthumbnailer-devel +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: qt5-qtbase-private-devel BuildRequires: deepin-desktop-server Requires: deepin-desktop-server @@ -27,7 +37,7 @@ Watch the introduction video to get new features, customize your desktop, enable effect and know more about UnionTech OS. %prep -%autosetup -p1 +%autosetup # disable dmr lib sed -i 's/contains(TARGET_ARCH, x86_64)/contains(TARGET_ARCH, mips)/' introduction.pro @@ -35,9 +45,10 @@ sed -i 's/contains(TARGET_ARCH, x86_64)/contains(TARGET_ARCH, mips)/' introducti %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH -mkdir build && pushd build -%qmake_qt5 ../ VERSION=%{version} DEFINES+="VERSION=%{version}" -%make_build +sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") +mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} +%make_build popd %install @@ -56,6 +67,9 @@ popd %{_datadir}/%{name}/ %changelog +* Mon Jul 18 2022 konglidong - 5.6.13-1 +- update version to 5.6.13 + * Tue Feb 08 2022 liweigang - 5.6.0.7-2 - fix build error diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch deleted file mode 100644 index 510742a434b7c296d7fc87bdb20a4f2c147bfca9..0000000000000000000000000000000000000000 --- a/modify-QPainterPath-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --color -Naur a/src/dvideowidget.h b/src/dvideowidget.h ---- a/src/dvideowidget.h 2022-02-08 10:58:23.000430309 +0800 -+++ b/src/dvideowidget.h 2022-02-08 11:00:21.694887451 +0800 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --color -Naur a/src/widgets/closebutton.h b/src/widgets/closebutton.h ---- a/src/widgets/closebutton.h 2022-02-08 10:58:23.004430302 +0800 -+++ b/src/widgets/closebutton.h 2022-02-08 10:59:16.412344856 +0800 -@@ -3,6 +3,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --color -Naur a/src/widgets/navigationbutton.h b/src/widgets/navigationbutton.h ---- a/src/widgets/navigationbutton.h 2022-02-08 10:58:23.004430302 +0800 -+++ b/src/widgets/navigationbutton.h 2022-02-08 10:59:40.029104263 +0800 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - #include