diff --git a/deepin-reader-5.7.0.21.tar.gz b/deepin-reader-5.7.0.21.tar.gz deleted file mode 100644 index d2ab1b1853f8a9d0e4d1889f8e9ed2859cb203fc..0000000000000000000000000000000000000000 Binary files a/deepin-reader-5.7.0.21.tar.gz and /dev/null differ diff --git a/deepin-reader-5.9.9.tar.gz b/deepin-reader-5.9.9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5094d6e59a182578863c5678ac510e80c71dffab Binary files /dev/null and b/deepin-reader-5.9.9.tar.gz differ diff --git a/deepin-reader.spec b/deepin-reader.spec index 11d93ab2bca5c24ad62496337cfdadf21bf5d5e8..835b4e60c72fa07d891adb6abb929dc69b112b18 100644 --- a/deepin-reader.spec +++ b/deepin-reader.spec @@ -1,19 +1,24 @@ +%global debug_package %{nil} +%define specrelease 1%{?dist} +%if 0%{?openeuler} +%define specrelease 1 +%endif + Name: deepin-reader -Version: 5.7.0.21 -Release: 2 +Version: 5.9.9 +Release: %{specrelease} Summary: A simple PDF reader, supporting bookmarks, highlights and annotations License: GPLv3+ URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: fix-qtbase-include.patch BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: qt5-devel -BuildRequires: dtkcore-devel -BuildRequires: dtkwidget-devel -BuildRequires: dtkgui-devel +BuildRequires: dtkwidget-devel +BuildRequires: dtkcore-devel +BuildRequires: dtkgui-devel BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(libjpeg) @@ -23,13 +28,20 @@ BuildRequires: poppler-qt5-devel BuildRequires: libspectre-devel BuildRequires: kf5-karchive-devel BuildRequires: libtiff-devel +BuildRequires: freetype-devel +BuildRequires: nspr-devel +BuildRequires: fontconfig-devel +BuildRequires: lcms2-devel +BuildRequires: libX11-devel BuildRequires: qt5-qtbase-private-devel + + %description %{summary}. %prep -%autosetup -p1 +%autosetup %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -49,8 +61,14 @@ popd %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/%{name}/translations/*.qm %{_datadir}/applications/%{name}.desktop +# /usr/lib/libdeepin-pdfium.* +%{_datadir}/deepin-manual/manual-assets/application/deepin-reader/document-viewer/* +/usr/lib/deepin-reader/libdeepin-poppler* %changelog +* Tue Jul 19 2022 konglidong - 5.9.9-1 +- update to 5.9.9 + * Thu Feb 10 2022 liweigang - 5.7.0.21-2 - fix build error @@ -62,4 +80,3 @@ popd * Thu Jul 30 2020 openEuler Buildteam - 5.6.2-1 - Package init - diff --git a/fix-qtbase-include.patch b/fix-qtbase-include.patch deleted file mode 100644 index 3e795dad8ed6e89df3c0332fa8615a0def94c16c..0000000000000000000000000000000000000000 --- a/fix-qtbase-include.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff --color -Naur a/src/CustomControl/RoundColorWidget.cpp b/src/CustomControl/RoundColorWidget.cpp ---- a/src/CustomControl/RoundColorWidget.cpp 2022-02-10 14:35:12.146852806 +0800 -+++ b/src/CustomControl/RoundColorWidget.cpp 2022-02-10 14:38:53.443472741 +0800 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --color -Naur a/src/djvuControl/SheetBrowserDJVU.cpp b/src/djvuControl/SheetBrowserDJVU.cpp ---- a/src/djvuControl/SheetBrowserDJVU.cpp 2022-02-10 14:35:12.166852863 +0800 -+++ b/src/djvuControl/SheetBrowserDJVU.cpp 2022-02-10 14:38:22.019385541 +0800 -@@ -39,6 +39,9 @@ - #include - #include - #include -+#include -+#include -+#include - - DWIDGET_USE_NAMESPACE - -diff --color -Naur a/src/document/djvumodel.cpp b/src/document/djvumodel.cpp ---- a/src/document/djvumodel.cpp 2022-02-10 14:35:12.146852806 +0800 -+++ b/src/document/djvumodel.cpp 2022-02-10 14:42:41.468099365 +0800 -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --color -Naur a/src/document/model.h b/src/document/model.h ---- a/src/document/model.h 2022-02-10 14:35:12.146852806 +0800 -+++ b/src/document/model.h 2022-02-10 14:35:55.890976539 +0800 -@@ -2,6 +2,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include -diff --color -Naur a/src/lpreviewControl/bookmark/bookmarkdelegate.cpp b/src/lpreviewControl/bookmark/bookmarkdelegate.cpp ---- a/src/lpreviewControl/bookmark/bookmarkdelegate.cpp 2022-02-10 14:35:12.150852818 +0800 -+++ b/src/lpreviewControl/bookmark/bookmarkdelegate.cpp 2022-02-10 14:41:55.931974985 +0800 -@@ -19,6 +19,7 @@ - #include "application.h" - - #include -+#include - #include - #include - #include -diff --color -Naur a/src/lpreviewControl/note/notesdelegate.cpp b/src/lpreviewControl/note/notesdelegate.cpp ---- a/src/lpreviewControl/note/notesdelegate.cpp 2022-02-10 14:35:12.150852818 +0800 -+++ b/src/lpreviewControl/note/notesdelegate.cpp 2022-02-10 14:48:31.816027212 +0800 -@@ -19,6 +19,7 @@ - #include "utils/utils.h" - - #include -+#include - #include - #include - #include -diff --color -Naur a/src/lpreviewControl/search/searchresdelegate.cpp b/src/lpreviewControl/search/searchresdelegate.cpp ---- a/src/lpreviewControl/search/searchresdelegate.cpp 2022-02-10 14:35:12.150852818 +0800 -+++ b/src/lpreviewControl/search/searchresdelegate.cpp 2022-02-10 15:07:50.068365245 +0800 -@@ -19,6 +19,7 @@ - #include "utils/utils.h" - - #include -+#include - #include - #include - #include -diff --color -Naur a/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp b/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp ---- a/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp 2022-02-10 14:35:12.150852818 +0800 -+++ b/src/lpreviewControl/thumbnail/ThumbnailDelegate.cpp 2022-02-10 15:07:21.856323445 +0800 -@@ -19,6 +19,7 @@ - #include "utils/utils.h" - - #include -+#include - #include - #include - #include -diff --color -Naur a/src/pdfControl/docview/commonstruct.h b/src/pdfControl/docview/commonstruct.h ---- a/src/pdfControl/docview/commonstruct.h 2022-02-10 14:35:12.154852830 +0800 -+++ b/src/pdfControl/docview/commonstruct.h 2022-02-10 14:44:13.904350919 +0800 -@@ -6,6 +6,8 @@ - #include - - #include -+#include -+#include - - enum ViewMode_EM { - ViewMode_SinglePage = 0, -diff --color -Naur a/src/uiframe/DocSheet.h b/src/uiframe/DocSheet.h ---- a/src/uiframe/DocSheet.h 2022-02-10 14:35:12.166852863 +0800 -+++ b/src/uiframe/DocSheet.h 2022-02-10 15:25:55.504676036 +0800 -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - #include "global.h" - #include "pdfControl/docview/commonstruct.h" -diff --color -Naur a/src/utils/utils.cpp b/src/utils/utils.cpp ---- a/src/utils/utils.cpp 2022-02-10 14:35:12.146852806 +0800 -+++ b/src/utils/utils.cpp 2022-02-10 14:45:13.936513702 +0800 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --color -Naur a/src/widgets/ScaleWidget.cpp b/src/widgets/ScaleWidget.cpp ---- a/src/widgets/ScaleWidget.cpp 2022-02-10 14:35:12.162852852 +0800 -+++ b/src/widgets/ScaleWidget.cpp 2022-02-10 14:43:26.176221180 +0800 -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - ScaleWidget::ScaleWidget(DWidget *parent) - : DWidget(parent) -diff --color -Naur a/src/widgets/SlideWidget.cpp b/src/widgets/SlideWidget.cpp ---- a/src/widgets/SlideWidget.cpp 2022-02-10 14:35:12.162852852 +0800 -+++ b/src/widgets/SlideWidget.cpp 2022-02-10 14:58:45.191734367 +0800 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - SlideWidget::SlideWidget(DocSheet *docsheet) - : DWidget(MainWindow::windowContainSheet(docsheet))