From ac99554cdb6fa365ca1ea75d2cb0222f05c7fe1f Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Thu, 9 Aug 2018 14:03:07 +0300
Subject: [PATCH] poppler:ver.bump

---
 office/postscript/poppler/actions.py | 49 +++++++++++++---------------
 office/postscript/poppler/pspec.xml  | 20 +++++++++---
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/office/postscript/poppler/actions.py b/office/postscript/poppler/actions.py
index 5083a9082b..5275fd7b25 100644
--- a/office/postscript/poppler/actions.py
+++ b/office/postscript/poppler/actions.py
@@ -8,45 +8,40 @@ from pisi.actionsapi import get
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import cmaketools
 
 
 def setup():
-    options = "--disable-static \
-               --disable-poppler-qt \
-               --disable-gtk-doc-html \
-               --disable-zlib \
-               --enable-libcurl \
-               --disable-gtk-test \
-               --disable-poppler-qt4 \
-               --enable-cairo-output \
-               --enable-xpdf-headers \
-               --enable-libjpeg \
-               --enable-libopenjpeg=openjpeg1"
+    shelltools.makedirs("build")
+    shelltools.cd("build")
+
+    options = "-DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+               -DENABLE_XPDF_HEADERS=ON \
+              "
 
     if get.buildTYPE() == "emul32":
-        options = " --libdir=/usr/lib32 \
-                     --disable-libcurl \
-                     --disable-utils \
-                     --disable-gtk-test \
-                     --disable-poppler-cpp \
-                     --disable-libopenjpeg \
-                     --disable-poppler-qt5"
+        options = " -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+                    -DENABLE_QT5=OFF \
+                    -DENABLE_LIBCURL=OFF"
 
-    autotools.configure(options)
+    cmaketools.configure(options, sourceDir="..")
 
 def build():
-    autotools.make()
+    shelltools.cd("build")
+    cmaketools.make()
 
 def install():
+    shelltools.cd("build")
+    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
     if get.buildTYPE() == "emul32":
-        pisitools.insinto("/usr/lib32", "poppler/.libs/libpoppler.so*")
-        pisitools.insinto("/usr/lib32", "glib/.libs/libpoppler-glib.so*")
+        #pisitools.insinto("/usr/lib32", "poppler/.libs/libpoppler.so*")
+        #pisitools.insinto("/usr/lib32", "glib/.libs/libpoppler-glib.so*")
         for f in ["poppler.pc", "poppler-glib.pc"]:
             pisitools.insinto("/usr/lib32/pkgconfig", f)
             pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), get.emul32prefixDIR(), get.defaultprefixDIR())
         return
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
-
-    pisitools.removeDir("/usr/share/gtk-doc")
-    pisitools.dodoc("README", "AUTHORS", "ChangeLog", "NEWS", "README-XPDF", "TODO")
+    
+        pisitools.removeDir("/usr/share/gtk-doc")
+        pisitools.dodoc("README", "AUTHORS", "ChangeLog", "NEWS", "README-XPDF", "TODO")
diff --git a/office/postscript/poppler/pspec.xml b/office/postscript/poppler/pspec.xml
index 761a6a0e47..3f2c5b6ccc 100644
--- a/office/postscript/poppler/pspec.xml
+++ b/office/postscript/poppler/pspec.xml
@@ -12,8 +12,9 @@
         <IsA>library</IsA>
         <Summary>PDF rendering library</Summary>
         <Description>poppler is a PDF rendering library based on xpdf.</Description>
-        <Archive sha1sum="06a9a4ea986c28df770f16b74a1bd7c87a65d3ee" type="tarxz">http://poppler.freedesktop.org/poppler-0.51.0.tar.xz</Archive>
+        <Archive sha1sum="45f5186f9c514d121acd8c4aeae0e0137916a5f4" type="tarxz">http://poppler.freedesktop.org/poppler-0.62.0.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>cmake</Dependency>
             <Dependency>lcms2-devel</Dependency>
             <Dependency>curl-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
@@ -23,7 +24,7 @@
             <Dependency>libpng-devel</Dependency>
             <Dependency>tiff-devel</Dependency>
             <Dependency>fontconfig-devel</Dependency>
-            <Dependency>openjpeg-devel</Dependency>
+            <Dependency>openjpeg2-devel</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
         </BuildDependencies>
     </Source>
@@ -31,6 +32,7 @@
     <Package>
         <Name>poppler</Name>
         <RuntimeDependencies>
+            <Dependency>zlib</Dependency>
             <Dependency>lcms2</Dependency>
             <Dependency>curl</Dependency>
             <Dependency>freetype</Dependency>
@@ -38,7 +40,7 @@
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>libpng</Dependency>
             <Dependency>tiff</Dependency>
-            <Dependency>openjpeg</Dependency>
+            <Dependency>openjpeg2</Dependency>
             <Dependency>fontconfig</Dependency>
             <Dependency>poppler-data</Dependency>
         </RuntimeDependencies>
@@ -134,6 +136,7 @@
         <Summary>Development files for poppler-glib</Summary>
         <RuntimeDependencies>
             <Dependency>gtk2-devel</Dependency>
+            <Dependency>glib2-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
             <Dependency release="current">poppler-glib</Dependency>
             <Dependency release="current">poppler-devel</Dependency>
@@ -165,6 +168,8 @@
         <Summary>32-bit shared libraries for poppler</Summary>
         <BuildType>emul32</BuildType>
         <BuildDependencies>
+            <Dependency>zlib-32bit</Dependency>
+            <Dependency>openjpeg2-32bit</Dependency>
             <Dependency>lcms2-32bit</Dependency>
             <Dependency>libjpeg-turbo-32bit</Dependency>
             <Dependency>libpng-32bit</Dependency>
@@ -178,7 +183,7 @@
             <Dependency>lcms2-32bit</Dependency>
             <Dependency>libjpeg-turbo-32bit</Dependency>
             <Dependency>libpng-32bit</Dependency>
-            <Dependency>openjpeg-32bit</Dependency>
+            <Dependency>openjpeg2-32bit</Dependency>
             <Dependency>tiff-32bit</Dependency>
             <Dependency>freetype-32bit</Dependency>
             <Dependency>fontconfig-32bit</Dependency>
@@ -211,6 +216,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2018-08-08</Date>
+            <Version>0.62.0</Version>
+            <Comment>Rebuild New T.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2017-02-21</Date>
             <Version>0.51.0</Version>