From 10aaced3002d44f16122961c92855f9b79a48836 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 4 Sep 2017 10:03:32 +0200
Subject: [PATCH] new upstream release 0.59.0

---
 .gitignore                                |  1 +
 0001-workaround-a-bug-in-nss-header.patch | 50 +++++++++++++++++++++++
 poppler.spec                              | 11 +++--
 sources                                   |  2 +-
 4 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 0001-workaround-a-bug-in-nss-header.patch

diff --git a/.gitignore b/.gitignore
index e6f8eec..b4f7760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /poppler-0.55.0.tar.xz
 /poppler-0.56.0.tar.xz
 /poppler-0.57.0.tar.xz
+/poppler-0.59.0.tar.xz
diff --git a/0001-workaround-a-bug-in-nss-header.patch b/0001-workaround-a-bug-in-nss-header.patch
new file mode 100644
index 0000000..af48315
--- /dev/null
+++ b/0001-workaround-a-bug-in-nss-header.patch
@@ -0,0 +1,50 @@
+From 004cb512cdd1349a247955ecbed7814ea60e909f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 4 Sep 2017 14:59:01 +0200
+Subject: [PATCH] workaround a bug in nss header
+
+---
+ poppler/SignatureInfo.cc | 1 +
+ qt5/src/poppler-form.cc  | 1 +
+ utils/pdfsig.cc          | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/poppler/SignatureInfo.cc b/poppler/SignatureInfo.cc
+index 7ca8b96..254d42e 100644
+--- a/poppler/SignatureInfo.cc
++++ b/poppler/SignatureInfo.cc
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ 
+ #ifdef ENABLE_NSS3
++    #include <prtypes.h>
+     #include <hasht.h>
+ #else
+     static const int HASH_AlgNULL = -1;
+diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
+index 02c3a5d..17d4097 100644
+--- a/qt5/src/poppler-form.cc
++++ b/qt5/src/poppler-form.cc
+@@ -39,6 +39,7 @@
+ #include <ctype.h>
+ 
+ #ifdef ENABLE_NSS3
++  #include <prtypes.h>
+   #include <hasht.h>
+ #endif
+ 
+diff --git a/utils/pdfsig.cc b/utils/pdfsig.cc
+index 8b5182d..2e0ce7d 100644
+--- a/utils/pdfsig.cc
++++ b/utils/pdfsig.cc
+@@ -19,6 +19,7 @@
+ #include <stddef.h>
+ #include <string.h>
+ #include <time.h>
++#include <prtypes.h>
+ #include <hasht.h>
+ #include "parseargs.h"
+ #include "Object.h"
+-- 
+2.13.5
+
diff --git a/poppler.spec b/poppler.spec
index 1f37826..59580ac 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -3,7 +3,7 @@
 
 Summary: PDF rendering library
 Name:    poppler
-Version: 0.57.0
+Version: 0.59.0
 Release: 1%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 URL:     http://poppler.freedesktop.org/
@@ -13,6 +13,8 @@ Source1: %{name}-test-%{test_date}_%{test_sha}.tar.xz
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1185007
 Patch0:  poppler-0.30.0-rotated-words-selection.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1113172
+Patch1:  0001-workaround-a-bug-in-nss-header.patch
 
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig(cairo)
@@ -163,7 +165,7 @@ sed -i \
   --enable-gtk-doc \
   --enable-gtk-test \
   --enable-introspection=yes \
-  --enable-libjpeg \
+  --enable-dctdecoder=libjpeg \
   --enable-libopenjpeg=openjpeg2 \
   --enable-libpng \
   --enable-poppler-glib \
@@ -217,7 +219,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %files
 %doc README
 %license COPYING
-%{_libdir}/libpoppler.so.68*
+%{_libdir}/libpoppler.so.70*
 
 %files devel
 %{_libdir}/pkgconfig/poppler.pc
@@ -277,6 +279,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %{_bindir}/poppler-glib-demo
 
 %changelog
+* Mon Sep 04 2017 David Tardon <dtardon@redhat.com> - 0.59.0-1
+- new upstream release
+
 * Thu Aug 03 2017 David Tardon <dtardon@redhat.com> - 0.57.0-1
 - new upstream release
 
diff --git a/sources b/sources
index 6f85427..f94cc15 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (poppler-0.57.0.tar.xz) = 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
+SHA512 (poppler-0.59.0.tar.xz) = 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
 SHA512 (poppler-test-2009-05-13_0d2bfd4af4c76a3bac27ccaff793d9129df7b57a.tar.xz) = f8ce114357043a893100de2d52ada8bd850148d19f0e8c889988ea97e9a92313f0545c0b88ef32a1ce7f0e9e58edc1a8c9066278c20b7718ca619913fd4bfb3c