Changeset a4d3fe5 for xsoft

Timestamp:

11/22/2015 03:48: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:

b663ee2

Parents:

ec91d9f

Message:

• Update to gimp-2.8.16. Split Gimp and Gimp-Help in the same page (statistics, build instructions). Statistics, particularly, were too cluttered, but I believe it could be further simplified, perhaps moving some parts to the text (?).

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

File:

• xsoft/other/gimp.xml (modified) (9 diffs)

xsoft/other/gimp.xml

@@ -8 +8 @@
   <!ENTITY gimp-download-ftp  " ">
 <!--  <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">-->
-  <!ENTITY gimp-md5sum        "233c948203383fa078434cc3f8f925cb">
+  <!ENTITY gimp-md5sum        "30e0a1b7c18b0e3415f4ac54567252ac">
   <!ENTITY gimp-size          "20 MB">
-  <!ENTITY gimp-buildsize     "642 MB (additional 553 MB to run the test suite,
-                                the help files add from 307 MB (en only) to
-                                reputedly 1.3 GB (all 18 languages), typically
-                                increasing by 60 MB per translation)">
-  <!ENTITY gimp-time          "4.2 SBU (additional 0.9 SBU to run the test
-                                suite, and for the help files, from 0.6 SBU (en
-                                only) to reputedly 19 SBU (all) - typically 1.3
-                                SBU per translation)">
-
-  <!ENTITY gimp-help-version  "2.8.2">
-  <!ENTITY gimp-help-download "http://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
-  <!ENTITY gimp-help-md5sum   "a591c8974b2f4f584d0a769d52ed6c5b">
-  <!ENTITY gimp-help-size     "152 MB">
+  <!ENTITY gimp-buildsize     "632 MB (additional 690 MB to run
+                               the test suite)">
+  <!ENTITY gimp-time          "4.2 SBU (additional 0.7 SBU to run
+                               the test suite)">
+
+
+  <!ENTITY gimp-help-version    "2.8.2">
+  <!ENTITY gimp-help-download   "http://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
+  <!ENTITY gimp-help-md5sum     "a591c8974b2f4f584d0a769d52ed6c5b">
+  <!ENTITY gimp-help-size       "152 MB">
+  <!ENTITY gimp-help-buildsize  "From 307 MB (en only) to 1257 MB (all 18
+                                 languages), average of 52 MB per translation">
+  <!ENTITY gimp-help-time       "0.8 SBU (en only), average of 1.2 SBU per
+                                 translation (measured with 5 languages), 5.9
+                                 SBU, with parallelism=8, for all languages">
 ]>
 
@@ -103 +105 @@
       <listitem>
         <para>
+          Estimated disk space required: &gimp-help-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gimp-help-time;
+        </para>
+      </listitem>
+<!--      <listitem>
+        <para>
           Optional patch:
           <ulink url="&patch-root;/gimp-&gimp-version;-device_info-1.patch"/>
         </para>
-      </listitem>
+      </listitem>-->
 <!--      <listitem>
         <para>
@@ -147 +159 @@
       <xref linkend="libmng"/>,
       <xref linkend="librsvg"/>,
-      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>,
       <xref linkend="poppler"/>,
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
       <xref linkend="webkitgtk2"/> (required for the help-plugin) and
-      <xref linkend="gtk-doc"/>
+      <xref linkend="gtk-doc"/>, and
+      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
     </para>
 
@@ -171 +183 @@
 
     <para>
-      In order to get rid of an annoying message when running from a terminal
-      and/or if you wish to run the test suite, optionally use the
-      following patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gimp-&gimp-version;-device_info-1.patch</userinput></screen>
-
-    <para>
       Install <application>Gimp</application> by running
       the following commands:
     </para>
 
-<screen><userinput>LDFLAGS="$LDFLAGS -lm" \
-./configure --prefix=/usr \
-            -sysconfdir=/etc \
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
             --without-gvfs &amp;&amp;
 
@@ -202 +205 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/update-icons-and-desktop.xml"/>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gimp-Help</title>
+
     <para>
       The <filename>gimp-help</filename> tarball contains images and English
-      text help for help files, together with translations. It is
-      &quot;work in progress&quot;.
+      text help for help files, together with translations.<!-- It is
+      &quot;work in progress&quot;.-->
     </para>
 
@@ -253 +264 @@
 chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
   </sect2>
 
   <sect2 role="commands" id="gimp-cmd-explanations">
     <title>Command Explanations</title>
-
-    <para>
-      <envar>LDFLAGS="$LDFLAGS -lm" ...</envar>: help the linker to find some
-      symbols.
-    </para>
 
     <para>
@@ -334 +337 @@
       </para>
 
-      <para>
-        The <application>Gimp</application> executes the
-        <command>firefox</command> web browser by default to view the help
-        files. If you do not have <application>Firefox</application>, or
-        prefer a different web browser, you can set a new system value in
-        <filename>/etc/gimp/2.0/gimprc</filename>. Execute the following
-        command as the <systemitem class="username">root</systemitem> user,
-        replacing <replaceable>&lt;browser&gt;</replaceable> with your
-        preferred web browser:
-      </para>
-
-<screen role="root"><userinput>echo '(web-browser "<replaceable>&lt;browser&gt;</replaceable> %s")' &gt;&gt; /etc/gimp/2.0/gimprc</userinput></screen>
-
     </sect3>
 
@@ -361 +351 @@
       <seglistitem>
         <seg>
-          gimp, gimp-2.8, gimp-console, gimp-console-2.8 and
+          gimp, gimp-2.8,
+          gimp-console, gimp-console-2.8, and
           gimptool-2.0
         </seg>
@@ -367 +358 @@
           libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
           libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
-          libgimpthumb-2.0.so, libgimpui-2.0.so and libgimpwidgets-2.0.so
+          libgimpthumb-2.0.so, libgimpui-2.0.so, and libgimpwidgets-2.0.so
         </seg>
         <seg>
           /etc/gimp,
           /usr/include/gimp-2.0,
-          /usr/lib/gimp,
-          /usr/share/gimp,
+          /usr/{lib,share}/gimp,
           /usr/share/gimp/2.0/help/{en,lang2,lang3,...},
-          /usr/share/gtk-doc/html/{libgimp,libgimpbase,libgimpcolor},
-          /usr/share/gtk-doc/html/{libgimpconfig,libgimpmath},
-          /usr/share/gtk-doc/html/{libgimpmodule,libgimpthumb} and
-          /usr/share/gtk-doc/html/libgimpwidgets
+          /usr/share/gtk-doc/html/libgimp{,base,color,config}, and
+          /usr/share/gtk-doc/html/libgimp{math,module,thumb,widgets}
         </seg>
       </seglistitem>