Update to 21.07.0
Add requirement of boost for performance gain in splash Add qt6 subpackages Resolves: #1923798
This commit is contained in:
Marek Kasik
parent
696b83de07
commit
52ca443c6e
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
||||
/poppler-0.90.0.tar.xz
|
||||
/poppler-test-2021-01-11-03a4b9eb854a06a83c465e82de601796c458bbe9.tar.xz
|
||||
/poppler-21.01.0.tar.xz
|
||||
/poppler-21.07.0.tar.xz
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 5dbe101b7c3561aedf33872e218b8d1b6984f623 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Sat, 8 May 2021 00:54:13 +0200
|
||||
Subject: [PATCH] Restore setting the Encoding in createAnnotDrawFont
|
||||
|
||||
It was removed in 9db685f379c1c9195b5f0c9a693e7a581e6b214f and as far as
|
||||
i remember the reason was that signatures created with that hung Adobe
|
||||
Reader, but I can't reproduce it anymore and on top of that is causing
|
||||
regressions when rendering PDF files (Issue #1070) so restore it.
|
||||
---
|
||||
poppler/Annot.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
|
||||
index 5287b4dc..40b1085a 100644
|
||||
--- a/poppler/Annot.cc
|
||||
+++ b/poppler/Annot.cc
|
||||
@@ -2852,6 +2852,7 @@ static GfxFont *createAnnotDrawFont(XRef *xref, Dict *fontParentDict, const char
|
||||
Dict *fontDict = new Dict(xref);
|
||||
fontDict->add("BaseFont", Object(objName, fontname));
|
||||
fontDict->add("Subtype", Object(objName, "Type1"));
|
||||
+ fontDict->add("Encoding", Object(objName, "WinAnsiEncoding"));
|
||||
|
||||
Object fontsDictObj = fontParentDict->lookup("Font");
|
||||
if (!fontsDictObj.isDict()) {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template
|
||||
index 26a51b4..27be2b9 100644
|
||||
--- a/glib/poppler-enums.c.template
|
||||
+++ b/glib/poppler-enums.c.template
|
||||
@@ -15,7 +15,7 @@
|
||||
GType
|
||||
@enum_name@_get_type (void)
|
||||
{
|
||||
- static volatile gsize g_define_type_id__volatile = 0;
|
||||
+ static gsize g_define_type_id__volatile = 0;
|
||||
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) {
|
||||
static const G@Type@Value values[] = {
|
||||
|
||||
diff --git a/glib/poppler-private.h b/glib/poppler-private.h
|
||||
index 7726ec7..436bca5 100644
|
||||
--- a/glib/poppler-private.h
|
||||
+++ b/glib/poppler-private.h
|
||||
@@ -167,7 +167,7 @@ gboolean _poppler_convert_pdf_date_to_gtime (const GooString *date,
|
||||
#define POPPLER_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) \
|
||||
GType type_name##_get_type(void) \
|
||||
{ \
|
||||
- static volatile gsize g_define_type_id__volatile = 0; \
|
||||
+ static gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter(&g_define_type_id__volatile)) { \
|
||||
GType g_define_type_id = g_boxed_type_register_static(g_intern_static_string(#TypeName), (GBoxedCopyFunc)copy_func, (GBoxedFreeFunc)free_func); \
|
||||
g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \
|
||||
42
poppler.spec
42
poppler.spec
@ -3,8 +3,8 @@
|
||||
|
||||
Summary: PDF rendering library
|
||||
Name: poppler
|
||||
Version: 21.01.0
|
||||
Release: 8%{?dist}
|
||||
Version: 21.07.0
|
||||
Release: 1%{?dist}
|
||||
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
|
||||
URL: http://poppler.freedesktop.org/
|
||||
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
|
||||
@ -16,14 +16,8 @@ Patch0: poppler-0.30.0-rotated-words-selection.patch
|
||||
|
||||
Patch1: poppler-0.90.0-position-independent-code.patch
|
||||
|
||||
# Bogus volatiles detected by gcc-11
|
||||
Patch2: %{name}-gcc11.patch
|
||||
|
||||
Patch3: poppler-21.01.0-glib-introspection.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1958673
|
||||
Patch4: poppler-21.01.0-show-annotation-text.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
@ -53,6 +47,8 @@ BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Test)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(Qt5Xml)
|
||||
BuildRequires: pkgconfig(Qt6)
|
||||
BuildRequires: boost-devel
|
||||
|
||||
Requires: poppler-data
|
||||
|
||||
@ -108,6 +104,20 @@ Obsoletes: %{name}-qt-devel < 0.90.0-9
|
||||
%description qt5-devel
|
||||
%{summary}.
|
||||
|
||||
%package qt6
|
||||
Summary: Qt6 wrapper for poppler
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description qt6
|
||||
%{summary}.
|
||||
|
||||
%package qt6-devel
|
||||
Summary: Development files for Qt6 wrapper
|
||||
Requires: %{name}-qt6%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: qt6-qtbase-devel
|
||||
%description qt6-devel
|
||||
%{summary}.
|
||||
|
||||
%package cpp
|
||||
Summary: Pure C++ wrapper for poppler
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
@ -170,7 +180,7 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
|
||||
%files
|
||||
%doc README.md
|
||||
%license COPYING
|
||||
%{_libdir}/libpoppler.so.106*
|
||||
%{_libdir}/libpoppler.so.111*
|
||||
|
||||
%files devel
|
||||
%{_libdir}/pkgconfig/poppler.pc
|
||||
@ -204,6 +214,14 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
|
||||
%{_libdir}/pkgconfig/poppler-qt5.pc
|
||||
%{_includedir}/poppler/qt5/
|
||||
|
||||
%files qt6
|
||||
%{_libdir}/libpoppler-qt6.so.2*
|
||||
|
||||
%files qt6-devel
|
||||
%{_libdir}/libpoppler-qt6.so
|
||||
%{_libdir}/pkgconfig/poppler-qt6.pc
|
||||
%{_includedir}/poppler/qt6/
|
||||
|
||||
%files cpp
|
||||
%{_libdir}/libpoppler-cpp.so.0*
|
||||
|
||||
@ -217,6 +235,12 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 26 2021 Marek Kasik <mkasik@redhat.com> - 21.07.0-1
|
||||
- Update to 21.07.0
|
||||
- Add requirement of boost for performance gain in splash
|
||||
- Add qt6 subpackages
|
||||
- Resolves: #1923798
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.01.0-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (poppler-test-2021-01-11-03a4b9eb854a06a83c465e82de601796c458bbe9.tar.xz) = 257133b261b07076d3207456e3edad324e29911a45a960d4953eb84813ac175bc65be713a10454b52b96711870fcbeee533fd0fd7de8550a87390e833b1af8c5
|
||||
SHA512 (poppler-21.01.0.tar.xz) = aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
|
||||
SHA512 (poppler-21.07.0.tar.xz) = ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user