packages/deepin-font-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!10 update to upstream 5.8.7

Browse Source 
From: @xzyangha 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2022-10-28 02:35:34 +00:00 committed by Gitee
commit 94f01cf222
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 37 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
deepin-font-manager-5.6.23.tar.gz
View File

Binary file not shown.

BIN
deepin-font-manager-5.8.7.tar.gz Normal file
View File

Binary file not shown.

65
deepin-font-manager.spec
View File

@ -1,48 +1,61 @@
%define libname libdeepin-font-manager
# %define libname libdeepin-font-manager
%define pkgrelease 1
%if 0%{?openeuler}
%define specrelease %{pkgrelease}
%else
## allow specrelease to have configurable %%{?dist} tag in other distribution
%define specrelease %{pkgrelease}%{?dist}
%endif
Name: deepin-font-manager
Version: 5.6.23
Release: 2
Version: 5.8.7
Release: %{specrelease}
Summary: Deepin Font Manager is used to install and uninstall font file for users with bulk install function
License: GPLv3+
URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: fix-qtbase-QPainterPath.patch
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: qt5-devel
BuildRequires: dtkcore-devel
BuildRequires: dtkwidget-devel
BuildRequires: dtkwidget-devel
Buildrequires: dtkcore-devel
BuildRequires: dtkgui-devel
BuildRequires: pkgconfig(dtkgui)
BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(dde-file-manager)
BuildRequires: deepin-gettext-tools
BuildRequires: gtest-devel
BuildRequires: gmock-devel
BuildRequires: qt5-qtbase-private-devel
%description
%{summary}.
%package -n %{libname}
Summary: %{summary}
%description -n %{libname}
%{summary}.
%package -n %{libname}-devel
Summary: %{summary}
%description -n %{libname}-devel
%{summary}.
# %package -n %{libname}
# Summary: %{summary}
# %description -n %{libname}
# %{summary}.
#
# %package -n %{libname}-devel
# Summary: %{summary}
# %description -n %{libname}-devel
# %{summary}.
%prep
%autosetup -p1
%build
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
export PATH=%{_qt5_bindir}:$PATH
mkdir build && pushd build
%qmake_qt5 ../ DAPP_VERSION=%{version} DEFINES+="VERSION=%{version}"
%make_build
sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt")
sed -i "s|lib/${CMAKE_LIBRARY_ARCHITECTURE}|lib64|" ./deepin-font-preview-plugin/CMakeLists.txt
mkdir build && pushd build
%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version}
%make_build
popd
%install
@ -56,18 +69,14 @@ popd
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/translations/*.qm
%{_datadir}/applications/%{name}.desktop
%{_datadir}/deepin-manual/manual-assets/application/deepin-font-manager/font-manager/*
%{_datadir}/deepin-font-manager/contents.txt
%files -n %{libname}
%{_libdir}/%{libname}.so.*
%{_datadir}/deepin-font-manager/CONTENTS.txt
%files -n %{libname}-devel
%{_includedir}/%{name}/
%{_libdir}/%{libname}.so
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.8.7-1
- update to 5.8.7
* Fri Feb 11 2022 liweigang <liweiganga@uniontech.com> - 5.6.23-2
- fix build error

55
fix-qtbase-QPainterPath.patch
View File

@ -1,55 +0,0 @@
diff --color -Naur a/deepin-font-manager/interfaces/dfontpreviewer.cpp b/deepin-font-manager/interfaces/dfontpreviewer.cpp
--- a/deepin-font-manager/interfaces/dfontpreviewer.cpp 2022-02-11 09:38:55.999617049 +0800
+++ b/deepin-font-manager/interfaces/dfontpreviewer.cpp 2022-02-11 09:39:41.675711054 +0800
@@ -3,6 +3,7 @@
#include <QPainter>
#include <QPaintEvent>
+#include <QPainterPath>
#include <QRect>
#include <DPalette>
diff --color -Naur a/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp b/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp
--- a/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp 2022-02-11 09:38:55.999617049 +0800
+++ b/deepin-font-manager/interfaces/dfontpreviewitemdelegate.cpp 2022-02-11 10:05:20.575062102 +0800
@@ -4,6 +4,7 @@
#include "utils.h"
#include <QPainter>
+#include <QPainterPath>
#include <DApplication>
#include <DApplicationHelper>
diff --color -Naur a/deepin-font-manager/views/dfinstallerrorlistview.cpp b/deepin-font-manager/views/dfinstallerrorlistview.cpp
--- a/deepin-font-manager/views/dfinstallerrorlistview.cpp 2022-02-11 09:38:55.999617049 +0800
+++ b/deepin-font-manager/views/dfinstallerrorlistview.cpp 2022-02-11 10:07:36.171363953 +0800
@@ -3,6 +3,7 @@
#include "utils.h"
#include <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
#include <QStandardItemModel>
diff --color -Naur a/deepin-font-manager/views/dfontspinner.cpp b/deepin-font-manager/views/dfontspinner.cpp
--- a/deepin-font-manager/views/dfontspinner.cpp 2022-02-11 09:38:56.003617058 +0800
+++ b/deepin-font-manager/views/dfontspinner.cpp 2022-02-11 10:04:15.498917746 +0800
@@ -2,6 +2,7 @@
#include <QTimer>
#include <QPainter>
+#include <QPainterPath>
#include <QtMath>
#include <QEvent>
#include <QDebug>
diff --color -Naur a/deepin-font-manager/views/dsplitlistwidget.cpp b/deepin-font-manager/views/dsplitlistwidget.cpp
--- a/deepin-font-manager/views/dsplitlistwidget.cpp 2022-02-11 09:38:56.003617058 +0800
+++ b/deepin-font-manager/views/dsplitlistwidget.cpp 2022-02-11 10:06:56.747276058 +0800
@@ -2,6 +2,7 @@
#include "globaldef.h"
#include "utils.h"
#include <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
#include <DStyleHelper>