!14 update to upstream 5.7.15
From: @xzyangha Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
commit
0e16cf975e
@ -1,18 +1,25 @@
|
||||
Name: deepin-image-viewer
|
||||
Version: 5.6.3.49
|
||||
Release: 2
|
||||
Version: 5.7.15
|
||||
Release: 1
|
||||
Summary: Deepin Image Viewer
|
||||
License: GPLv3
|
||||
URL: https://github.com/linuxdeepin/deepin-image-viewer
|
||||
Source0: %{name}_%{version}.tar.gz
|
||||
Patch0: modify-QPainterPath-error.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: qt5-devel
|
||||
|
||||
BuildRequires: freeimage-devel
|
||||
BuildRequires: dtkcore-devel
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
||||
BuildRequires: pkgconfig(Qt5DBus)
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5OpenGL)
|
||||
BuildRequires: pkgconfig(Qt5PrintSupport)
|
||||
BuildRequires: pkgconfig(Qt5Sql)
|
||||
BuildRequires: pkgconfig(Qt5Svg)
|
||||
BuildRequires: pkgconfig(Qt5X11Extras)
|
||||
BuildRequires: dtkwidget-devel
|
||||
BuildRequires: dtkcore-devel
|
||||
BuildRequires: dtkgui-devel
|
||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||
BuildRequires: pkgconfig(libraw)
|
||||
@ -20,32 +27,30 @@ BuildRequires: pkgconfig(libexif)
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
||||
BuildRequires: pkgconfig(xcb-util)
|
||||
BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: pkgconfig(Qt5Multimedia)
|
||||
BuildRequires: udisks2-qt5-devel
|
||||
BuildRequires: libgio-qt libgio-qt-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
Requires: hicolor-icon-theme
|
||||
|
||||
|
||||
Requires: qt5-qtimageformats
|
||||
%description
|
||||
%{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||
export PATH=%{_qt5_bindir}:$PATH
|
||||
mkdir build && pushd build
|
||||
%qmake_qt5 PREFIX=%{_prefix} VERSION=%{version} DEFINES+="VERSION=%{version}" ../
|
||||
%qmake_qt5 PREFIX=%{_prefix} DEFINES+="VERSION=%{version}"
|
||||
%make_build
|
||||
popd
|
||||
|
||||
%install
|
||||
%make_install -C build INSTALL_ROOT="%buildroot"
|
||||
|
||||
%make_install INSTALL_ROOT=%{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
@ -56,8 +61,12 @@ popd
|
||||
%{_datadir}/dman/%{name}/
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
%{_datadir}/deepin-manual/manual-assets/application/*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.7.15-1
|
||||
- update to 5.7.15
|
||||
|
||||
* Mon Feb 07 2022 liweigang <liweiganga@uniontech.com> - 5.6.3.49-2
|
||||
- fix build error
|
||||
|
||||
|
||||
Binary file not shown.
BIN
deepin-image-viewer_5.7.15.tar.gz
Normal file
BIN
deepin-image-viewer_5.7.15.tar.gz
Normal file
Binary file not shown.
@ -1,55 +0,0 @@
|
||||
diff --color -Naur a/viewer/module/view/contents/imageinfowidget.cpp b/viewer/module/view/contents/imageinfowidget.cpp
|
||||
--- a/viewer/module/view/contents/imageinfowidget.cpp 2022-02-07 14:32:34.180823978 +0800
|
||||
+++ b/viewer/module/view/contents/imageinfowidget.cpp 2022-02-07 14:47:58.781017892 +0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <QFileInfo>
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
+#include <QPainterPath>
|
||||
#include <QPushButton>
|
||||
#include <QScrollBar>
|
||||
#include <QString>
|
||||
diff --color -Naur a/viewer/module/view/contents/ttbcontent.cpp b/viewer/module/view/contents/ttbcontent.cpp
|
||||
--- a/viewer/module/view/contents/ttbcontent.cpp 2022-02-07 14:32:34.180823978 +0800
|
||||
+++ b/viewer/module/view/contents/ttbcontent.cpp 2022-02-07 14:37:02.997108175 +0800
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <QDebug>
|
||||
#include <QFileInfo>
|
||||
#include <QHBoxLayout>
|
||||
+#include <QPainterPath>
|
||||
#include <QTimer>
|
||||
#include <QtMath>
|
||||
|
||||
diff --color -Naur a/viewer/widgets/popupmenustyle.cpp b/viewer/widgets/popupmenustyle.cpp
|
||||
--- a/viewer/widgets/popupmenustyle.cpp 2022-02-07 14:32:34.164823644 +0800
|
||||
+++ b/viewer/widgets/popupmenustyle.cpp 2022-02-07 14:35:33.059939972 +0800
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <QPixmap>
|
||||
#include <QPixmapCache>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QStyleOption>
|
||||
#include <QStyleOptionMenuItem>
|
||||
|
||||
diff --color -Naur a/viewer/widgets/thumbnaildelegate.cpp b/viewer/widgets/thumbnaildelegate.cpp
|
||||
--- a/viewer/widgets/thumbnaildelegate.cpp 2022-02-07 14:32:34.164823644 +0800
|
||||
+++ b/viewer/widgets/thumbnaildelegate.cpp 2022-02-07 14:47:07.064895896 +0800
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <QHBoxLayout>
|
||||
#include <QLineEdit>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QPixmapCache>
|
||||
#include <QStandardItemModel>
|
||||
#include <QThread>
|
||||
diff --color -Naur a/viewer/widgets/thumbnaillistview.cpp b/viewer/widgets/thumbnaillistview.cpp
|
||||
--- a/viewer/widgets/thumbnaillistview.cpp 2022-02-07 14:32:34.160823559 +0800
|
||||
+++ b/viewer/widgets/thumbnaillistview.cpp 2022-02-07 14:35:18.247724706 +0800
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <QMutex>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QPen>
|
||||
#include <QScrollBar>
|
||||
#include <QStandardItemModel>
|
||||
Loading…
x
Reference in New Issue
Block a user