From 90d734e3b3350f519aab7cb5cf02e6190234a874 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Feb 14 2018 18:27:02 +0000
Subject: Update to 0.62.0


---

diff --git a/.gitignore b/.gitignore
index d4c2b7b..094db3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /poppler-0.60.1.tar.xz
 /poppler-0.61.0.tar.xz
 /poppler-0.61.1.tar.xz
+/poppler-0.62.0.tar.xz
diff --git a/mingw-poppler.spec b/mingw-poppler.spec
index 6da9e98..011229a 100644
--- a/mingw-poppler.spec
+++ b/mingw-poppler.spec
@@ -3,8 +3,8 @@
 %global pkgname poppler
 
 Name:          mingw-%{pkgname}
-Version:       0.61.1
-Release:       2%{?dist}
+Version:       0.62.0
+Release:       1%{?dist}
 Summary:       MinGW Windows Poppler library
 
 License:       (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
@@ -27,7 +27,6 @@ BuildRequires: mingw32-openjpeg2
 BuildRequires: mingw32-cairo
 BuildRequires: mingw32-gtk3
 BuildRequires: mingw32-lcms2
-BuildRequires: mingw32-qt
 BuildRequires: mingw32-qt5-qtbase-devel
 
 BuildRequires: mingw64-filesystem >= 95
@@ -38,7 +37,6 @@ BuildRequires: mingw64-openjpeg2
 BuildRequires: mingw64-cairo
 BuildRequires: mingw64-gtk3
 BuildRequires: mingw64-lcms2
-BuildRequires: mingw64-qt
 BuildRequires: mingw64-qt5-qtbase-devel
 
 
@@ -66,16 +64,6 @@ MinGW Windows Poppler-Glib library.
 
 ###############################################################################
 
-%package -n mingw32-%{pkgname}-qt
-Summary:       MinGW Windows Poppler-Qt4 library
-Requires:      mingw32-%{pkgname} = %{version}-%{release}
-Obsoletes:     mingw32-%{pkgname}-qt-static
-
-%description -n mingw32-%{pkgname}-qt
-MinGW Windows Poppler-Qt4 library.
-
-###############################################################################
-
 %package -n mingw32-%{pkgname}-qt5
 Summary:       MinGW Windows Poppler-Qt5 library
 Requires:      mingw32-%{pkgname} = %{version}-%{release}
@@ -115,16 +103,6 @@ MinGW Windows Poppler-Glib library.
 
 ###############################################################################
 
-%package -n mingw64-%{pkgname}-qt
-Summary:       MinGW Windows Poppler-Qt4 library
-Requires:      mingw64-%{pkgname} = %{version}-%{release}
-Obsoletes:     mingw64-%{pkgname}-qt-static
-
-%description -n mingw64-%{pkgname}-qt
-MinGW Windows Poppler-Qt4 library.
-
-###############################################################################
-
 %package -n mingw64-%{pkgname}-qt5
 Summary:       MinGW Windows Poppler-Qt5 library
 Requires:      mingw64-%{pkgname} = %{version}-%{release}
@@ -181,7 +159,7 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 %files -n mingw32-%{pkgname}
 %license COPYING
 %doc README
-%{mingw32_bindir}/libpoppler-72.dll
+%{mingw32_bindir}/libpoppler-73.dll
 %{mingw32_includedir}/poppler/
 %exclude %{mingw32_includedir}/poppler/cpp/
 %exclude %{mingw32_includedir}/poppler/glib/
@@ -198,12 +176,6 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 %{mingw32_libdir}/pkgconfig/poppler-glib.pc
 %{mingw32_libdir}/pkgconfig/poppler-cairo.pc
 
-%files -n mingw32-%{pkgname}-qt
-%{mingw32_bindir}/libpoppler-qt4-4.dll
-%{mingw32_includedir}/poppler/qt4/
-%{mingw32_libdir}/libpoppler-qt4.dll.a
-%{mingw32_libdir}/pkgconfig/poppler-qt4.pc
-
 %files -n mingw32-%{pkgname}-qt5
 %{mingw32_bindir}/libpoppler-qt5-1.dll
 %{mingw32_includedir}/poppler/qt5/
@@ -219,7 +191,7 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 %files -n mingw64-%{pkgname}
 %license COPYING
 %doc README
-%{mingw64_bindir}/libpoppler-72.dll
+%{mingw64_bindir}/libpoppler-73.dll
 %{mingw64_includedir}/poppler/
 %exclude %{mingw64_includedir}/poppler/cpp/
 %exclude %{mingw64_includedir}/poppler/glib/
@@ -236,12 +208,6 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 %{mingw64_libdir}/pkgconfig/poppler-glib.pc
 %{mingw64_libdir}/pkgconfig/poppler-cairo.pc
 
-%files -n mingw64-%{pkgname}-qt
-%{mingw64_bindir}/libpoppler-qt4-4.dll
-%{mingw64_includedir}/poppler/qt4/
-%{mingw64_libdir}/libpoppler-qt4.dll.a
-%{mingw64_libdir}/pkgconfig/poppler-qt4.pc
-
 %files -n mingw64-%{pkgname}-qt5
 %{mingw64_bindir}/libpoppler-qt5-1.dll
 %{mingw64_includedir}/poppler/qt5/
@@ -256,6 +222,10 @@ rm -f %{buildroot}%{mingw64_bindir}/*.exe
 
 
 %changelog
+* Wed Feb 14 2018 Sandro Mani <manisandro@gmail.com> - 0.62.0-1
+- Update to 0.62
+- Drop qt4 frontend
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.61.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/poppler_CVE-2017-9083.patch b/poppler_CVE-2017-9083.patch
index 0dd06f6..0aa00e7 100644
--- a/poppler_CVE-2017-9083.patch
+++ b/poppler_CVE-2017-9083.patch
@@ -1,6 +1,6 @@
-diff -rupN poppler-0.61.0/poppler/JPXStream.cc poppler-0.61.0-new/poppler/JPXStream.cc
---- poppler-0.61.0/poppler/JPXStream.cc	2017-11-03 11:25:02.000000000 +0100
-+++ poppler-0.61.0-new/poppler/JPXStream.cc	2017-11-08 22:47:39.495398171 +0100
+diff -rupN poppler-0.62.0/poppler/JPXStream.cc poppler-0.62.0-new/poppler/JPXStream.cc
+--- poppler-0.62.0/poppler/JPXStream.cc	2017-12-03 20:25:06.000000000 +0100
++++ poppler-0.62.0-new/poppler/JPXStream.cc	2018-02-14 19:23:35.865242162 +0100
 @@ -965,6 +965,11 @@ GBool JPXStream::readCodestream(Guint le
  	      "Different number of components in JPX SIZ marker segment");
  	return gFalse;
diff --git a/sources b/sources
index b27904a..5a51d13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (poppler-0.61.1.tar.xz) = 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
+SHA512 (poppler-0.62.0.tar.xz) = 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706