Merge pull request #12872 from Rmys/master

poppler rebuild qt6

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":
+    # if get.buildTYPE() == "emul32":
-        options = " -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+        # options = " -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
-                    -DCMAKE_INSTALL_PREFIX=/emul32 \
+                    # -DCMAKE_INSTALL_PREFIX=/emul32 \
-                    -DENABLE_QT5=OFF \
+                    # -DENABLE_QT5=OFF \
-                    -DENABLE_LIBCURL=OFF \
+                    # -DENABLE_LIBCURL=OFF \
-                    -DWITH_NSS3=OFF \
+                    # -DWITH_NSS3=OFF \
-                    -DWITH_GTK=OFF \
+                    # -DWITH_GTK=OFF \
-                    -DENABLE_BOOST=OFF \
+                    # -DENABLE_BOOST=OFF \
-                    -DWITH_GObjectIntrospection=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":
+    # if get.buildTYPE() == "emul32":
-        pisitools.removeDir("/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()):
+        # 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())
+            # pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), get.emul32prefixDIR(), get.defaultprefixDIR())
-        return
+        # return
-    
+    # pisitools.removeDir("/usr/share/gtk-doc")
-        pisitools.removeDir("/usr/share/gtk-doc")
+    shelltools.cd("..")
-        pisitools.dodoc("README", "AUTHORS", "ChangeLog", "NEWS", "README-XPDF", "TODO")
+    pisitools.dodoc("README*", "AUTHORS", "ChangeLog", "NEWS")

office/postscript/poppler/pspec.xml

@@ -31,6 +31,7 @@
             <Dependency>fontconfig-devel</Dependency>
             <Dependency>openjpeg2-devel</Dependency>
             <Dependency versionFrom="5.13.0">qt5-base-devel</Dependency>
+            <Dependency versionFrom="6.5.3">qt6-base-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -40,6 +41,7 @@
             <Dependency>zlib</Dependency>
             <Dependency>lcms2</Dependency>
             <Dependency>curl</Dependency>
+            <Dependency>nspr</Dependency>
             <Dependency>nss</Dependency>
             <Dependency>freetype</Dependency>
             <Dependency>libgcc</Dependency>
@@ -95,10 +97,39 @@
             <Dependency release="current">poppler-devel</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="header">/usr/include/poppler/qt5</Path>
             <Path fileType="data">/usr/lib/pkgconfig/poppler-qt5.pc</Path>
         </Files>
      </Package>
 
+     <Package>
+        <Name>poppler-qt6</Name>
+        <Summary>Qt wrapper for poppler</Summary>
+        <RuntimeDependencies>
+            <Dependency>qt6-base</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>lcms2</Dependency>
+            <Dependency>freetype</Dependency>
+            <Dependency release="current">poppler</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/libpoppler-qt6.so*</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>poppler-qt6-devel</Name>
+        <Summary>Development files for poppler-qt</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">poppler-qt6</Dependency>
+            <Dependency release="current">poppler-devel</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include/poppler/qt6</Path>
+            <Path fileType="data">/usr/lib/pkgconfig/poppler-qt6.pc</Path>
+        </Files>
+     </Package>
+
     <Package>
         <Name>poppler-cpp</Name>
         <Summary>Pure C++ wrapper for poppler</Summary>
@@ -119,6 +150,7 @@
             <Dependency release="current">poppler-devel</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="header">/usr/include/poppler/cpp</Path>
             <Path fileType="library">/usr/lib/pkgconfig/poppler-cpp.pc</Path>
         </Files>
     </Package>
@@ -151,6 +183,7 @@
             <Dependency release="current">poppler-devel</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="header">/usr/include/poppler/glib</Path>
             <Path fileType="library">/usr/lib/pkgconfig/poppler-glib.pc</Path>
             <Path fileType="library">/usr/lib/pkgconfig/poppler-cairo.pc</Path>
             <Path fileType="data">/usr/lib32/pkgconfig/poppler-glib.pc</Path>
@@ -170,7 +203,7 @@
         </Files>
     </Package>
 
-    <Package>
+    <!--Package>
         <Name>poppler-32bit</Name>
         <PartOf>emul32</PartOf>
         <Summary>32-bit shared libraries for poppler</Summary>
@@ -205,9 +238,9 @@
             <Path fileType="library">/usr/lib32/girepository-1.0/Poppler-0.18.typelib</Path>
             <Path fileType="library">/usr/lib32/pkgconfig</Path>
         </Files>
-    </Package>
+    </Package-->
 
-    <Package>
+    <!--Package>
         <Name>poppler-glib-32bit</Name>
         <PartOf>emul32</PartOf>
         <Summary>32-bit shared libraries for poppler-glib</Summary>
@@ -227,9 +260,16 @@
         <Files>
             <Path fileType="library">/usr/lib32/libpoppler-glib.so*</Path>
         </Files>
-    </Package>
+    </Package-->
 
     <History>
+        <Update release="16">
+            <Date>2023-11-06</Date>
+            <Version>23.04.0</Version>
+            <Comment>Rebuild qt6.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="15">
             <Date>2023-11-01</Date>
             <Version>23.04.0</Version>