Changeset 2cd6717 for general/graphlib/poppler.xml

Timestamp:

11/18/2015 10:27:48 PM (8 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

de81317

Parents:

7ed0e9d

Message:

• cmake-3.4.0: Minor re-reword of the tests explanations.
• Update to nano-2.4.3.
• Update to poppler-0.38.0. Good simplification of instructions.
• Update to dbus-1.10.4.
• Update to gtk+-3.18.5 (gtk+3.18.5).

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16673 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/graphlib/poppler.xml (modified) (6 diffs)

general/graphlib/poppler.xml

@@ -7 +7 @@
   <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "c635e1742202cbbd9182cb0255d95652">
+  <!ENTITY poppler-md5sum             "850f0725e5b263c504f0cb0910d1fadc">
   <!ENTITY poppler-size               "1.6 MB (additional 9 MB for the test suite)">
-  <!ENTITY poppler-buildsize          "293 MB (with Qt4 and Qt5 libraries, and tests)">
-  <!ENTITY poppler-time               "2.0 SBU (with Qt4 and Qt5 libraries, and tests)">
+  <!ENTITY poppler-buildsize          "65 MB (with Qt4 and Qt5 libraries, and tests)">
+  <!ENTITY poppler-time               "1.6 SBU (with Qt4 and Qt5 libraries, and tests)">
 
 
@@ -166 +166 @@
 git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen>
 
-    <note><para>
-
-      This package can be optionally built with support for only one version of
-      Qt4 or Qt5. If you have only one, no modification is necessary. If both
-      are installed, and you wish support for only one, before executing the
-      <command>configure</command> command given below, use this command to
-      select Qt4:
-
-      <screen><userinput>source /usr/bin/setqt4</userinput></screen>
-
-      or this to select Qt5:
-
-      <screen><userinput>source /usr/bin/setqt5</userinput></screen>
-    </para></note>
+    <note>
+      <para>
+        This package can be optionally built with support for only one version
+        of Qt4 or Qt5 or without any Qt support. You can selectively disable
+        support for one or both, see "Command Explanations" section, below.
+      </para>
+    </note>
 
     <para>
@@ -186 +179 @@
     </para>
 
-<screen><userinput>MOCQT4=$QT4DIR/bin/moc                  \
-MOCQT5=$QT5DIR/bin/moc                  \
-./configure --prefix=/usr               \
+<screen><userinput>./configure --prefix=/usr               \
             --sysconfdir=/etc           \
             --disable-static            \
@@ -240 +231 @@
 
     <para>
-      <envar>MOCQT4=$QT4DIR/bin/moc</envar> and
-      <envar>MOCQT5=$QT5DIR/bin/moc</envar>:
-      These environment variables are necessary, for linking with the two Qt
-      versions, if both are installed.  If only one Qt version is installed or
-      you wish to link to only one version, you can remove them, although this
-      is not necessary.
-    </para>
-
-    <para>
       <parameter>--enable-build-type=release</parameter>: This switch is used
       to apply a higher level of compiler optimizations. Other options are:
@@ -280 +262 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para>
+      <option>--disable-poppler-qt4</option>: Don't compile poppler Qt4 wrapper.
+    </para>
+
+    <para>
+      <option>--disable-poppler-qt5</option>: Don't compile poppler Qt5 wrapper.
+    </para>
 
     <para>
@@ -311 +301 @@
         </seg>
         <seg>
-          /usr/include/poppler,
-          /usr/share/poppler,
-          /usr/share/gtk-doc/html/poppler, and
+          /usr/{include,share,share/gtk-doc/html}/poppler and
           /usr/share/doc/poppler-&poppler-version;
         </seg>