diff --git a/office/postscript/poppler/actions.py b/office/postscript/poppler/actions.py
index 2cab230b1b..0fd1191af6 100644
--- a/office/postscript/poppler/actions.py
+++ b/office/postscript/poppler/actions.py
@@ -20,18 +20,18 @@ def setup():
-DCMAKE_INSTALL_LIBDIR=lib \
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-DENABLE_XPDF_HEADERS=ON \
- -DENABLE_QT6:BOOL=OFF \
+ -DENABLE_QT6:BOOL=ON \
"
- if get.buildTYPE() == "emul32":
- options = " -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
- -DCMAKE_INSTALL_PREFIX=/emul32 \
- -DENABLE_QT5=OFF \
- -DENABLE_LIBCURL=OFF \
- -DWITH_NSS3=OFF \
- -DWITH_GTK=OFF \
- -DENABLE_BOOST=OFF \
- -DWITH_GObjectIntrospection=OFF"
+ # if get.buildTYPE() == "emul32":
+ # options = " -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+ # -DCMAKE_INSTALL_PREFIX=/emul32 \
+ # -DENABLE_QT5=OFF \
+ # -DENABLE_LIBCURL=OFF \
+ # -DWITH_NSS3=OFF \
+ # -DWITH_GTK=OFF \
+ # -DENABLE_BOOST=OFF \
+ # -DWITH_GObjectIntrospection=OFF"
cmaketools.configure(options, sourceDir="..")
@@ -42,13 +42,13 @@ def build():
def install():
shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
- if get.buildTYPE() == "emul32":
- pisitools.removeDir("/emul32")
+ # if get.buildTYPE() == "emul32":
+ # pisitools.removeDir("/emul32")
#pisitools.insinto("/usr/lib32", "poppler/.libs/libpoppler.so*")
#pisitools.insinto("/usr/lib32", "glib/.libs/libpoppler-glib.so*")
- for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()):
- pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), get.emul32prefixDIR(), get.defaultprefixDIR())
- return
-
- pisitools.removeDir("/usr/share/gtk-doc")
- pisitools.dodoc("README", "AUTHORS", "ChangeLog", "NEWS", "README-XPDF", "TODO")
+ # for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()):
+ # pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), get.emul32prefixDIR(), get.defaultprefixDIR())
+ # return
+ # pisitools.removeDir("/usr/share/gtk-doc")
+ shelltools.cd("..")
+ pisitools.dodoc("README*", "AUTHORS", "ChangeLog", "NEWS")
diff --git a/office/postscript/poppler/pspec.xml b/office/postscript/poppler/pspec.xml
index 7a96ee54d4..008ac9b9d6 100644
--- a/office/postscript/poppler/pspec.xml
+++ b/office/postscript/poppler/pspec.xml
@@ -31,6 +31,7 @@
fontconfig-devel
openjpeg2-devel
qt5-base-devel
+ qt6-base-devel
@@ -40,6 +41,7 @@
zlib
lcms2
curl
+ nspr
nss
freetype
libgcc
@@ -95,10 +97,39 @@
poppler-devel
+ /usr/include/poppler/qt5
/usr/lib/pkgconfig/poppler-qt5.pc
+
+ poppler-qt6
+ Qt wrapper for poppler
+
+ qt6-base
+ libgcc
+ lcms2
+ freetype
+ poppler
+
+
+ /usr/lib/libpoppler-qt6.so*
+
+
+
+
+ poppler-qt6-devel
+ Development files for poppler-qt
+
+ poppler-qt6
+ poppler-devel
+
+
+ /usr/include/poppler/qt6
+ /usr/lib/pkgconfig/poppler-qt6.pc
+
+
+
poppler-cpp
Pure C++ wrapper for poppler
@@ -119,6 +150,7 @@
poppler-devel
+ /usr/include/poppler/cpp
/usr/lib/pkgconfig/poppler-cpp.pc
@@ -151,6 +183,7 @@
poppler-devel
+ /usr/include/poppler/glib
/usr/lib/pkgconfig/poppler-glib.pc
/usr/lib/pkgconfig/poppler-cairo.pc
/usr/lib32/pkgconfig/poppler-glib.pc
@@ -170,7 +203,7 @@
-
+
-
+
+
+ 2023-11-06
+ 23.04.0
+ Rebuild qt6.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2023-11-01
23.04.0