Fix showing of non-ASCII characters in annotations

Resolves: #1958673

poppler-21.01.0-show-annotation-text.patch

@@ -0,0 +1,28 @@
+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
+

poppler.spec

@@ -4,7 +4,7 @@
 Summary: PDF rendering library
 Name:    poppler
 Version: 21.01.0
-Release: 6%{?dist}
+Release: 7%{?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
@@ -21,6 +21,9 @@ 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++
@@ -214,6 +217,10 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jun 1 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-7
+- Fix showing of non-ASCII characters in annotations
+- Resolves: #1958673
+
 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 21.01.0-6
 - Rebuilt for removed libstdc++ symbol (#1937698)