Changeset 572f2ee


Ignore:
Timestamp:
07/18/2024 04:35:02 PM (2 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
12.2, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128
Children:
15df65cd
Parents:
62032e7
Message:

Restore gim3 instructions.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/other/gimp.xml

    r62032e7 r572f2ee  
    55  %general-entities;
    66
    7   <!ENTITY gimp-download-http "https://download.gimp.org/pub/gimp/v2.10/gimp-&gimp-version;.tar.bz2">
     7  <!ENTITY gimp-download-http "&sources-anduin-http;/BLFS/gimp/gimp-&gimp-version;.tar.xz">
    88  <!ENTITY gimp-download-ftp  " ">
    9   <!ENTITY gimp-md5sum        "b5e37c9570a8ee723debe6d3728555ae">
    10   <!ENTITY gimp-size          "31 MB">
    11   <!ENTITY gimp-buildsize     "872 MB (193 MB installed, add 829 MB for tests)">
    12   <!ENTITY gimp-time          "1.8 SBU (Using parallelism=4; add 0.5 SBU for tests)">
     9  <!ENTITY gimp-md5sum        "17fcd0bfc8e66fc61d672b4409cb3e3a">
     10  <!ENTITY gimp-size          "26 MB">
     11  <!ENTITY gimp-buildsize     "456 MB (162 MB installed)">
     12  <!ENTITY gimp-time          "1.2 SBU (Using parallelism=4)">
    1313
    1414  <!-- pro-tem, a pull of gimp-help, https://gitlab.gnome.org/GNOME/gimp-help.git
    … …  
    3131
    3232  <!ENTITY gimp-help-version    "&gimp-version;">
    33 <!--  <!ENTITY gimp-help-download   "&sources-anduin-http;/gimp/gimp-help-&gimp-help-version;.tar.xz"> -->
    34   <!ENTITY gimp-help-download   "https://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
    35   <!ENTITY gimp-help-md5sum     "5e393d61c802e73ffe6c550759ed0853">
    36   <!ENTITY gimp-help-size       "158 MB">
    37   <!ENTITY gimp-help-buildsize  "From 405 MB (en only) to 2.6 GB (for all
    38                                  languages)">
    39   <!ENTITY gimp-help-time       "0.8 SBU (en only), 4.6 SBU, with parallelism=4,
    40                                  for all languages">
     33  <!ENTITY gimp-help-download   "&sources-anduin-http;/BLFS/gimp/gimp-help-&gimp-help-version;.tar.xz">
     34<!--  <!ENTITY gimp-help-download   "https://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">-->
     35  <!ENTITY gimp-help-md5sum     "162d57a67ff737ed221a8d7f274d119f">
     36  <!ENTITY gimp-help-size       "129 MB">
     37  <!ENTITY gimp-help-buildsize  "From 351 MB (74 MB installed) for en only to 1.5 GB for all
     38                                 languages">
     39  <!ENTITY gimp-help-time       "0.4 SBU (en only), 5.1 SBU for all languages; using parallelism=4">
    4140]>
    4241
    4342<sect1 id="gimp" xreflabel="Gimp-&gimp-version;">
    4443  <?dbhtml filename="gimp.html" ?>
    45 
    4644
    4745  <title>Gimp-&gimp-version;</title>
    … …  
    117115      <listitem>
    118116        <para>
    119           Required patch:
    120           <ulink url="&patch-root;/gimp-&gimp-version;-gcc14-1.patch"/>
    121         </para>
    122       </listitem>
    123       <listitem>
    124         <para>
    125117          Download (HTTP): <ulink url="&gimp-help-download;"/>
    126118        </para>
    … …  
    152144    <bridgehead renderas="sect4">Required</bridgehead>
    153145    <para role="required">
     146      <xref linkend="appstream-glib"/>,
    154147      <xref linkend="gegl"/>,
    155148      <xref linkend="gexiv2"/>,
    … …  
    188181      <xref linkend="libwebp"/>,
    189182      <xref linkend="openjpeg2"/>,
    190       <!--<xref linkend="pygtk"/> (including the gtk, pango and pangocairo modules),
    191       an <xref linkend="server-mail"/> (that provides a
    192       <command>sendmail</command> program),-->
    193183      <xref linkend="gtk-doc"/>,
    194184      <ulink url="https://people.freedesktop.org/~hughsient/appstream-glib">appstream-glib</ulink>,
    … …  
    201191    </para>
    202192
    203     <para>
    204       When you have run configure, you will see that WebKit is not found -
    205       that dependency is for the legacy webkit-1.0 which should never be used
    206       on a modern system exposed to the internet.
    207     </para>
    208 
    209193    <bridgehead renderas="sect4">Optional, for building the help system</bridgehead>
    210194    <para role="optional">
    … …  
    228212    </para>
    229213
    230 <screen><userinput>patch -p1 -i ../gimp-&gimp-version;-gcc14-1.patch                   &amp;&amp;
    231 ./configure --prefix=/usr --sysconfdir=/etc --disable-python &amp;&amp;
    232 make</userinput></screen>
     214<screen><userinput>mkdir gimp-build &amp;&amp;
     215cd    gimp-build &amp;&amp;
     216
     217meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
     218ninja</userinput></screen>
    233219
    234220    <para>
    235221      To test the results (requires an X-Windowed terminal) issue:
    236       <command>make check</command>.
     222      <command>ninja test</command>.
    237223      <!-- km: in 2.10.16 no failures, 2 tests were skipped -->
    238224
    … …  
    240226
    241227    <para>
    242       Now, as the <systemitem class="username">root</systemitem>
    243       user:
    244     </para>
    245 
    246 <screen role="root"><userinput>make install</userinput></screen>
     228      Now, as the &root; user:
     229    </para>
     230
     231<screen role="root"><userinput>ninja test</userinput></screen>
    247232
    248233    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    256241    <para>
    257242      The <filename>gimp-help</filename> tarball contains images and English
    258       text help for help files, together with translations. <!--
     243      text help for help files, together with translations.
     244      If you wish to install local copies of the help files to read offline,
     245      unpack the gimp-help tarball and change into the root of the newly
     246      created source tree.
     247
     248      <!--
    259249      The documentation generated by gimp-help-2.10.34 and online help have
    260250      the same contents, so I comment this out. [pierre Nov. 2023]
    … …  
    268258    </para>
    269259
    270     <para>
    271       <!--     If you nevertheless wish to install local copies of the help files to read
    272       offline, u-->Unpack the <filename>gimp-help</filename> tarball
    273       and change into the root of the newly created source tree. Prepare for
    274       the build with the following command:
    275     </para>
    276 
    277 <screen><userinput>ALL_LINGUAS=&quot;ca cs da de en en_GB es fa fr hr ko lt nl nn pt pt_BR ro sl sv uk zh_CN&quot; \
     260<screen><userinput>tar -xf ../../gimp3-help-&gimp-version;.tar.xz &amp;&amp;
     261cd gimp3-help-&gimp-version;
     262
     263ALL_LINGUAS=&quot;ca cs da de en en_GB es fa fr hr ko lt nl nn pt pt_BR ro sl sv uk zh_CN&quot; \
    278264./configure --prefix=/usr</userinput></screen>
    279265
    … …  
    291277
    292278    <para>
    293       Issue the following commands as the
    294       <systemitem class="username">root</systemitem> user to install the help
    295       files:
     279      Issue the following commands as the &root; user to install the help files:
    296280    </para>
    297281
    298282<screen role="root"><userinput>make install &amp;&amp;
    299 chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
     283chown -R root:root /usr/share/gimp/3.0/help</userinput></screen>
    300284
    301285  </sect2>
    … …  
    315299    </para>
    316300
    317     <para>
    318        <parameter>patch -p1 -i ../gimp-&gimp-version;-gcc14-1.patch</parameter>:
    319        This patch allow the package to build with gcc14.
    320     </para>
    321 
    322     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    323       href="../../xincludes/gtk-doc-rebuild.xml"/>
    324 
    325301  </sect2>
    326302
    … …  
    332308
    333309      <para>
    334         <filename>/etc/gimp/2.0/*</filename> and
    335         <filename>~/.gimp-2.8/gimprc</filename>
     310        <filename>/etc/gimp/3.0/*</filename>
    336311      </para>
    337312
    338313      <indexterm zone="gimp gimp-config">
    339         <primary sortas="e-AA.gimp-2.0/gimprc">~/.g/GIMP/2.10/*</primary>
    340       </indexterm>
    341 
    342       <indexterm zone="gimp gimp-config">
    343         <primary sortas="e-etc-gimp-2.0-star">/etc/gimp/2.0/*</primary>
     314        <primary sortas="e-etc-gimp-3.0-star">/etc/gimp/3.0/*</primary>
    344315      </indexterm>
    345316
    … …  
    358329      <seglistitem>
    359330        <seg>
    360           gimp (symlink), gimp-2.10,
    361           gimp-console (symlink), gimp-console-2.10,
    362           gimp-test-clipboard-2.0, and
    363           gimptool-2.0
     331          gimp-2.99,
     332          gimp-console-2.99,
     333          gimptool-2.99,
     334          gimp-test-clipboard-2.99, and
     335          gimp-script-fu-interpreter-3.0
    364336        </seg>
    365337        <seg>
    366           libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
    367           libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
    368           libgimpthumb-2.0.so, libgimpui-2.0.so, and libgimpwidgets-2.0.so
     338          libgimp-3.0.so,
     339          libgimp-scriptfu-3.0,
     340          libgimpbase-3.0.so,
     341          libgimpcolor-3.0.so,
     342          libgimpconfig-3.0.so,
     343          libgimpmath-3.0.so,
     344          libgimpmodule-3.0.so,
     345          libgimpui-3.0.so, and
     346          libgimpwidgets-3.0.so
    369347        </seg>
    370348        <seg>
    371349          /etc/gimp,
    372           /usr/include/gimp-2.0,
    373           /usr/{lib,share}/gimp,
    374           /usr/share/gtk-doc/html/libgimp{,base,color,config}, and
    375           /usr/share/gtk-doc/html/libgimp{math,module,thumb,widgets}
     350          /usr/include/gimp-3.0,
     351          /usr/lib/gimp-3.0,
     352          /usr/lib/gimp/3.0,
     353          /usr/share/gimp/3.0, and
     354          /usr/share/doc/gimp-2.99
    376355        </seg>
    377356      </seglistitem>
    … …  
    383362      <?dbhtml list-presentation="table"?>
    384363
    385       <varlistentry id="gimp-prog">
    386         <term><command>gimp</command></term>
    387         <listitem>
    388           <para>
    389             is a symbolic link to <command>gimp-2.10</command>
    390           </para>
    391           <indexterm zone="gimp gimp-prog">
    392             <primary sortas="b-gimp">gimp</primary>
    393           </indexterm>
    394         </listitem>
    395       </varlistentry>
    396 
    397       <varlistentry id="gimp-2.10">
    398         <term><command>gimp-2.10</command></term>
     364      <varlistentry id="gimp-2.99">
     365        <term><command>gimp-2.99</command></term>
    399366        <listitem>
    400367          <para>
    … …  
    402369            of image formats and provides a large selection of tools
    403370          </para>
    404           <indexterm zone="gimp gimp-2.10">
    405             <primary sortas="b-gimp-2.10">gimp-2.10</primary>
    406           </indexterm>
    407         </listitem>
    408       </varlistentry>
    409 
    410       <varlistentry id="gimp-console">
    411         <term><command>gimp-console</command></term>
    412         <listitem>
    413           <para>
    414             is a symbolic link to <command>gimp-console-2.10</command>
    415           </para>
    416           <indexterm zone="gimp gimp-console">
    417             <primary sortas="b-gimp-console">gimp-console</primary>
    418           </indexterm>
    419         </listitem>
    420       </varlistentry>
    421 
    422       <varlistentry id="gimp-console-2.10">
    423         <term><command>gimp-console-2.10</command></term>
     371          <indexterm zone="gimp gimp-2.99">
     372            <primary sortas="b-gimp-2.99">gimp-2.99</primary>
     373          </indexterm>
     374        </listitem>
     375      </varlistentry>
     376
     377      <varlistentry id="gimp-console-2.99">
     378        <term><command>gimp-console-2.99</command></term>
    424379        <listitem>
    425380          <para>
    … …  
    428383            <option>--no-interface</option> command-line option
    429384          </para>
    430           <indexterm zone="gimp gimp-console-2.10">
    431             <primary sortas="b-gimp-console-2.10">gimp-console-2.10</primary>
    432           </indexterm>
    433         </listitem>
    434       </varlistentry>
    435 
    436       <varlistentry id="gimptool-2.0">
    437         <term><command>gimptool-2.0</command></term>
     385          <indexterm zone="gimp gimp-console-2.99">
     386            <primary sortas="b-gimp-console-2.99">gimp-console-2.99</primary>
     387          </indexterm>
     388        </listitem>
     389      </varlistentry>
     390
     391      <varlistentry id="gimptool-2.99">
     392        <term><command>gimptool-2.99</command></term>
    438393        <listitem>
    439394          <para>
    … …  
    444399            <application>Gimp</application> was compiled with
    445400          </para>
    446           <indexterm zone="gimp gimptool-2.0">
    447             <primary sortas="b-gimptool-2.0">gimptool-2.0</primary>
    448           </indexterm>
    449         </listitem>
    450       </varlistentry>
    451 
    452       <varlistentry id="libgimp-2.0">
    453         <term><filename class="libraryfile">libgimp-2.0.so</filename></term>
     401          <indexterm zone="gimp gimptool-2.99">
     402            <primary sortas="b-gimptool-2.99">gimptool-2.99</primary>
     403          </indexterm>
     404        </listitem>
     405      </varlistentry>
     406
     407      <varlistentry id="libgimp-3.0">
     408        <term><filename class="libraryfile">libgimp-3.0.so</filename></term>
    454409        <listitem>
    455410          <para>
    … …  
    458413            and to functionality provided by plug-ins
    459414          </para>
    460           <indexterm zone="gimp libgimp-2.0">
    461             <primary sortas="c-libgimp-2.0">libgimp-2.0.so</primary>
    462           </indexterm>
    463         </listitem>
    464       </varlistentry>
    465 
    466       <varlistentry id="libgimpbase-2.0">
    467         <term><filename class="libraryfile">libgimpbase-2.0.so</filename></term>
     415          <indexterm zone="gimp libgimp-3.0">
     416            <primary sortas="c-libgimp-3.0">libgimp-3.0.so</primary>
     417          </indexterm>
     418        </listitem>
     419      </varlistentry>
     420
     421      <varlistentry id="libgimpbase-3.0">
     422        <term><filename class="libraryfile">libgimpbase-3.0.so</filename></term>
    468423        <listitem>
    469424          <para>
    … …  
    474429            handling data files and accessing the environment
    475430          </para>
    476           <indexterm zone="gimp libgimpbase-2.0">
    477             <primary sortas="c-libgimpbase-2.0">libgimpbase-2.0.so</primary>
    478           </indexterm>
    479         </listitem>
    480       </varlistentry>
    481 
    482       <varlistentry id="libgimpcolor-2.0">
    483         <term><filename class="libraryfile">libgimpcolor-2.0.so</filename></term>
     431          <indexterm zone="gimp libgimpbase-3.0">
     432            <primary sortas="c-libgimpbase-3.0">libgimpbase-3.0.so</primary>
     433          </indexterm>
     434        </listitem>
     435      </varlistentry>
     436
     437      <varlistentry id="libgimpcolor-3.0">
     438        <term><filename class="libraryfile">libgimpcolor-3.0.so</filename></term>
    484439        <listitem>
    485440          <para>
    … …  
    488443            performing adaptive supersampling on an area
    489444          </para>
    490           <indexterm zone="gimp libgimpcolor-2.0">
    491             <primary sortas="c-libgimpcolor-2.0">libgimpcolor-2.0.so</primary>
    492           </indexterm>
    493         </listitem>
    494       </varlistentry>
    495 
    496       <varlistentry id="libgimpconfig-2.0">
    497         <term><filename class="libraryfile">libgimpconfig-2.0.so</filename></term>
     445          <indexterm zone="gimp libgimpcolor-3.0">
     446            <primary sortas="c-libgimpcolor-3.0">libgimpcolor-3.0.so</primary>
     447          </indexterm>
     448        </listitem>
     449      </varlistentry>
     450
     451      <varlistentry id="libgimpconfig-3.0">
     452        <term><filename class="libraryfile">libgimpconfig-3.0.so</filename></term>
    498453        <listitem>
    499454          <para>
    500455            contains C functions for reading and writing config information
    501456          </para>
    502           <indexterm zone="gimp libgimpconfig-2.0">
    503             <primary sortas="c-libgimpconfig-2.0">libgimpconfig-2.0.so</primary>
    504           </indexterm>
    505         </listitem>
    506       </varlistentry>
    507 
    508       <varlistentry id="libgimpmath-2.0">
    509         <term><filename class="libraryfile">libgimpmath-2.0.so</filename></term>
     457          <indexterm zone="gimp libgimpconfig-3.0">
     458            <primary sortas="c-libgimpconfig-3.0">libgimpconfig-3.0.so</primary>
     459          </indexterm>
     460        </listitem>
     461      </varlistentry>
     462
     463      <varlistentry id="libgimpmath-3.0">
     464        <term><filename class="libraryfile">libgimpmath-3.0.so</filename></term>
    510465        <listitem>
    511466          <para>
    … …  
    514469            vectors and the MD5 message-digest algorithm
    515470          </para>
    516           <indexterm zone="gimp libgimpmath-2.0">
    517             <primary sortas="c-libgimpmath-2.0">libgimpmath-2.0.so</primary>
    518           </indexterm>
    519         </listitem>
    520       </varlistentry>
    521 
    522       <varlistentry id="libgimpmodule-2.0">
    523         <term><filename class="libraryfile">libgimpmodule-2.0.so</filename></term>
     471          <indexterm zone="gimp libgimpmath-3.0">
     472            <primary sortas="c-libgimpmath-3.0">libgimpmath-3.0.so</primary>
     473          </indexterm>
     474        </listitem>
     475      </varlistentry>
     476
     477      <varlistentry id="libgimpmodule-3.0">
     478        <term><filename class="libraryfile">libgimpmodule-3.0.so</filename></term>
    524479        <listitem>
    525480          <para>
    … …  
    528483            searchpath
    529484          </para>
    530           <indexterm zone="gimp libgimpmodule-2.0">
    531             <primary sortas="c-libgimpmodule-2.0">libgimpmodule-2.0.so</primary>
    532           </indexterm>
    533         </listitem>
    534       </varlistentry>
    535 
    536       <varlistentry id="libgimpthumb-2.0">
    537         <term><filename class="libraryfile">libgimpthumb-2.0.so</filename></term>
     485          <indexterm zone="gimp libgimpmodule-3.0">
     486            <primary sortas="c-libgimpmodule-3.0">libgimpmodule-2.0.so</primary>
     487          </indexterm>
     488        </listitem>
     489      </varlistentry>
     490
     491      <varlistentry id="libgimpthumb-3.0">
     492        <term><filename class="libraryfile">libgimpthumb-3.0.so</filename></term>
    538493        <listitem>
    539494          <para>
    … …  
    541496            <application>Gimp</application>'s thumbnail objects
    542497          </para>
    543           <indexterm zone="gimp libgimpthumb-2.0">
    544             <primary sortas="c-libgimpthumb-2.0">libgimpthumb-2.0.so</primary>
    545           </indexterm>
    546         </listitem>
    547       </varlistentry>
    548 
    549       <varlistentry id="libgimpui-2.0">
    550         <term><filename class="libraryfile">libgimpui-2.0.so</filename></term>
     498          <indexterm zone="gimp libgimpthumb-3.0">
     499            <primary sortas="c-libgimpthumb-3.0">libgimpthumb-3.0.so</primary>
     500          </indexterm>
     501        </listitem>
     502      </varlistentry>
     503
     504      <varlistentry id="libgimpui-3.0">
     505        <term><filename class="libraryfile">libgimpui-3.0.so</filename></term>
    551506        <listitem>
    552507          <para>
    … …  
    554509            interface functions
    555510          </para>
    556           <indexterm zone="gimp libgimpui-2.0">
    557             <primary sortas="c-libgimpui-2.0">libgimpui-2.0.so</primary>
    558           </indexterm>
    559         </listitem>
    560       </varlistentry>
    561 
    562       <varlistentry id="libgimpwidgets-2.0">
    563         <term><filename class="libraryfile">libgimpwidgets-2.0.so</filename></term>
     511          <indexterm zone="gimp libgimpui-3.0">
     512            <primary sortas="c-libgimpui-3.0">libgimpui-3.0.so</primary>
     513          </indexterm>
     514        </listitem>
     515      </varlistentry>
     516
     517      <varlistentry id="libgimpwidgets-3.0">
     518        <term><filename class="libraryfile">libgimpwidgets-3.0.so</filename></term>
    564519        <listitem>
    565520          <para>
    … …  
    568523            manipulation functions
    569524          </para>
    570           <indexterm zone="gimp libgimpwidgets-2.0">
    571             <primary sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
     525          <indexterm zone="gimp libgimpwidgets-3.0">
     526            <primary sortas="c-libgimpwidgets-3.0">libgimpwidgets-3.0.so</primary>
    572527          </indexterm>
    573528        </listitem>
Note: See TracChangeset for help on using the changeset viewer.