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 @@
library
PDF rendering library
poppler is a PDF rendering library based on xpdf.
- http://poppler.freedesktop.org/poppler-0.51.0.tar.xz
+ http://poppler.freedesktop.org/poppler-0.62.0.tar.xz
+ cmake
lcms2-devel
curl-devel
cairo-devel
@@ -23,7 +24,7 @@
libpng-devel
tiff-devel
fontconfig-devel
- openjpeg-devel
+ openjpeg2-devel
qt5-base-devel
@@ -31,6 +32,7 @@
poppler
+ zlib
lcms2
curl
freetype
@@ -38,7 +40,7 @@
libjpeg-turbo
libpng
tiff
- openjpeg
+ openjpeg2
fontconfig
poppler-data
@@ -134,6 +136,7 @@
Development files for poppler-glib
gtk2-devel
+ glib2-devel
cairo-devel
poppler-glib
poppler-devel
@@ -165,6 +168,8 @@
32-bit shared libraries for poppler
emul32
+ zlib-32bit
+ openjpeg2-32bit
lcms2-32bit
libjpeg-turbo-32bit
libpng-32bit
@@ -178,7 +183,7 @@
lcms2-32bit
libjpeg-turbo-32bit
libpng-32bit
- openjpeg-32bit
+ openjpeg2-32bit
tiff-32bit
freetype-32bit
fontconfig-32bit
@@ -211,6 +216,13 @@
+
+ 2018-08-08
+ 0.62.0
+ Rebuild New T.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2017-02-21
0.51.0