diff --git a/0001-remove-docx-from-support-format.patch b/0001-remove-docx-from-support-format.patch deleted file mode 100644 index 7152779bbd99b5534fb375a5bcdd37b862ed39ae..0000000000000000000000000000000000000000 --- a/0001-remove-docx-from-support-format.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 911ba9ebff6d93656e2c26b14c291944937b717b Mon Sep 17 00:00:00 2001 -From: xingwei-liu -Date: Fri, 17 Dec 2021 09:35:43 +0800 -Subject: [PATCH] remove docx from support format - ---- - reader/uiframe/CentralNavPage.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/reader/uiframe/CentralNavPage.cpp b/reader/uiframe/CentralNavPage.cpp -index f5c7a53..0d5c4f0 100644 ---- a/reader/uiframe/CentralNavPage.cpp -+++ b/reader/uiframe/CentralNavPage.cpp -@@ -38,7 +38,7 @@ CentralNavPage::CentralNavPage(DWidget *parent) - tipsLabel->setForegroundRole(DPalette::TextTips); - DFontSizeManager::instance()->bind(tipsLabel, DFontSizeManager::T8); - -- auto formatLabel = new DLabel(tr("Format supported: %1").arg("PDF,DJVU,DOCX"), this); -+ auto formatLabel = new DLabel(tr("Format supported: %1").arg("PDF,DJVU"), this); - formatLabel->setAccessibleName(QString("Label_format supported: %1").arg("PDF,DJVU,DOCX")); - formatLabel->setAlignment(Qt::AlignHCenter); - formatLabel->setForegroundRole(DPalette::TextTips); --- -2.27.0 - diff --git a/0002-add-loongarch64-base-support.patch b/0002-add-loongarch64-base-support.patch deleted file mode 100644 index 7668697f95aa338198fd592655040380cd1dcd5e..0000000000000000000000000000000000000000 --- a/0002-add-loongarch64-base-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6b68fbafbd04067e8944e4dfce7f750e771618ee Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Tue, 15 Nov 2022 17:11:56 +0800 -Subject: [PATCH] add loongarch64 base support - ---- - .../src/3rdparty/pdfium/pdfium/build/build_config.h | 5 +++++ - .../allocator/partition_allocator/page_allocator_constants.h | 4 ++-- - .../partition_allocator/partition_alloc_constants.h | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/build/build_config.h b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/build/build_config.h -index ef6d460..18af0f8 100644 ---- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/build/build_config.h -+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/build/build_config.h -@@ -174,6 +174,11 @@ - #elif defined(__pnacl__) || defined(__asmjs__) || defined(__wasm__) - #define ARCH_CPU_32_BITS 1 - #define ARCH_CPU_LITTLE_ENDIAN 1 -+#elif defined(__loongarch__) -+#define ARCH_CPU_LOONGARCH_FAMILY 1 -+#define ARCH_CPU_LOONGARCH64 1 -+#define ARCH_CPU_64_BITS 1 -+#define ARCH_CPU_LITTLE_ENDIAN 1 - #elif defined(__MIPSEL__) - #if defined(__LP64__) - #define ARCH_CPU_MIPS_FAMILY 1 -diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h -index 0b94503..17e29ec 100644 ---- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h -+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h -@@ -13,7 +13,7 @@ namespace pdfium { - namespace base { - #if defined(OS_WIN) || defined(ARCH_CPU_PPC64) - static constexpr size_t kPageAllocationGranularityShift = 16; // 64KB --#elif defined(_MIPS_ARCH_LOONGSON) -+#elif defined(_MIPS_ARCH_LOONGSON) || defined(ARCH_CPU_LOONGARCH64) - static constexpr size_t kPageAllocationGranularityShift = 14; // 16KB - #elif defined(ARCH_CPU_SW64) - static constexpr size_t kPageAllocationGranularityShift = 13; // 8KB -@@ -29,7 +29,7 @@ static constexpr size_t kPageAllocationGranularityOffsetMask = - static constexpr size_t kPageAllocationGranularityBaseMask = - ~kPageAllocationGranularityOffsetMask; - --#if defined(_MIPS_ARCH_LOONGSON) -+#if defined(_MIPS_ARCH_LOONGSON) || defined(ARCH_CPU_LOONGARCH64) - static constexpr size_t kSystemPageSize = 16384; - #elif defined(ARCH_CPU_PPC64) - // Modern ppc64 systems support 4KB and 64KB page sizes. -diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h -index 28323b2..da9fb66 100644 ---- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h -+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h -@@ -36,7 +36,7 @@ static const size_t kBucketShift = (kAllocationGranularity == 8) ? 3 : 2; - // other constant values, we pack _all_ `PartitionRootGeneric::Alloc` sizes - // perfectly up against the end of a system page. - --#if defined(_MIPS_ARCH_LOONGSON) -+#if defined(_MIPS_ARCH_LOONGSON) || defined(ARCH_CPU_LOONGARCH64) - static const size_t kPartitionPageShift = 16; // 64 KiB - #elif defined(ARCH_CPU_PPC64) - static const size_t kPartitionPageShift = 18; // 256 KiB --- -2.20.1 - diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7342728d557c602f51c6d278bba9f3dd9faaf356 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +Anolis OS +======================================= +# 代码仓库说明 +## 分支说明 +>进行代码开发工作时，请注意选择当前版本对应的分支 +* aX分支为对应大版本的主分支,如a8分支对应当前最新版本 +* aX.Y分支为对应小版本的维护分支，如a8.2分支对应8.2版本 +## 开发流程 +1. 首先fork目标分支到自己的namespace +2. 在自己的fork分支上做出修改 +3. 向对应的仓库中提交merge request，源分支为fork分支 diff --git a/deepin-reader-5.9.13.tar.gz b/deepin-reader-5.9.13.tar.gz deleted file mode 100644 index 84530b5507cd87b6b14a01eb40e7e612a55d63d2..0000000000000000000000000000000000000000 Binary files a/deepin-reader-5.9.13.tar.gz and /dev/null differ diff --git a/deepin-reader-5.9.9.2.tar.gz b/deepin-reader-5.9.9.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ac32c6532cfb9118cd56f2d8568304445e28e62f Binary files /dev/null and b/deepin-reader-5.9.9.2.tar.gz differ diff --git a/deepin-reader.spec b/deepin-reader.spec index 2d39f0633104d02777edbc9408a97e2e0b062e54..47486fa6b096efda95e1d0e680c0edd766fcc988 100644 --- a/deepin-reader.spec +++ b/deepin-reader.spec @@ -1,17 +1,18 @@ -%global anolis_release .0.1 +%define anolis_release .0.1 +%define __arch_install_post %{nil} + +%define __os_install_post %{nil} +%global debug_package %{nil} + Name: deepin-reader -Version: 5.9.13 -Release: 3%{anolis_release}%{?dist} +Version: 5.9.9.2 +Release: 2%{anolis_release}%{?dist} 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 -Patch1: 0001-remove-docx-from-support-format.patch -Patch2: 0002-add-loongarch64-base-support.patch - BuildRequires: gcc-c++ -BuildRequires: glibc-headers BuildRequires: cmake BuildRequires: qt5-devel @@ -30,11 +31,11 @@ BuildRequires: nspr-devel BuildRequires: fontconfig-devel BuildRequires: lcms2-devel BuildRequires: libX11-devel -BuildRequires: libicu-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: gtest-devel -BuildRequires: libchardet-devel +# BuildRequires: libicu-devel +# BuildRequires: libpng-devel +# BuildRequires: zlib-devel +# BuildRequires: gtest-devel +# BuildRequires: libchardet-devel @@ -42,7 +43,7 @@ BuildRequires: libchardet-devel %{summary}. %prep -%autosetup -p1 +%autosetup %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -62,27 +63,17 @@ popd %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/%{name}/translations/*.qm %{_datadir}/applications/%{name}.desktop -/usr/lib/libdeepin-pdfium.* +# /usr/lib/libdeepin-pdfium.* %{_datadir}/deepin-manual/manual-assets/application/deepin-reader/document-viewer/* -#/usr/lib/deepin-reader/libdeepin-poppler* +/usr/lib/deepin-reader/libdeepin-poppler* %changelog -* Tue Nov 15 2022 liweiganga - 5.9.13-3.0.1 -- feat: add loongarch64 base support - -* Thu Jul 21 2022 liuxingwei liuxingwei@uniontech.com - 5.9.13-2.01 -- rebuild for an8.6 - -* Fri Nov 19 2021 liuxingwei - 5.9.13-1.01 -- Update to 5.9.13 -- remove docx from support format -- add patch 0001-remove-docx-from-support-format.patch +* Tue Jan 09 2024 yangxianzhao - 5.9.9.2-2.1 +- fix build error -* Thu May 6 2021 zhangdignwen - 5.9.9.10-1 -- fix bug +* Wed Feb 08 2023 liweiganga - 5.9.9.2-2 +- rebuild -* Thu Apr 16 2021 zhangdingwen - 5.9.9-1 -- Initial release for OpenEuler +* Mon Jun 13 2022 uoser - 5.9.9.2-1.01 +- update: update to 5.9.9.2-1.01 -* Fri Sep 18 2020 guoqinglan - 5.7.0.21-1 -- add qmake_qt5 version