Changeset 09ae65ca


Ignore:
Timestamp:
08/24/2014 11:24:00 AM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
13832d9
Parents:
455835b
Message:

More checks and fixes.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14027 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • general/genutils/qtchooser-systemd.xml

    r455835b r09ae65ca  
    3737    </para>
    3838
    39     &lfs75_checked;
     39    &lfs76_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    165165      </para>
    166166
    167 <screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
     167<screen role="root"><userinput>install -v -dm755 /etc/xdg/qtchooser &amp;&amp;
    168168cat &gt; /etc/xdg/qtchooser/qt4.conf &lt;&lt; "EOF"
    169169<literal>/usr/lib/qt4/bin
    … …  
    183183      </para>
    184184
    185 <screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
     185<screen role="root"><userinput>install -v -dm755 /etc/xdg/qtchooser &amp;&amp;
    186186cat &gt; /etc/xdg/qtchooser/qt4.conf &lt;&lt; "EOF"
    187187<literal>/opt/qt4/lib/qt4/bin

  • general/graphlib/openjpeg.xml

    r455835b r09ae65ca  
    55  %general-entities;
    66
    7   <!ENTITY openjpeg-download-http "http://downloads.sourceforge.net/project/openjpeg.mirror/&openjpeg-version;/openjpeg-&openjpeg-version;.tar.gz">
    8 <!--  <!ENTITY openjpeg-download-http "http://openjpeg.googlecode.com/files/openjpeg-&openjpeg-version;.tar.gz">-->
     7  <!ENTITY openjpeg-download-http "&sourceforge-repo;/openjpeg.mirror/openjpeg-&openjpeg-version;.tar.gz">
    98  <!ENTITY openjpeg-download-ftp  " ">
    109  <!ENTITY openjpeg-md5sum        "c41772c30fb1c272358b3707233134a1">
    … …  
    3534    and can compress/decompress lossless 16-bit images.</para>
    3635
    37     &lfs75_checked;
     36    &lfs76_checked;
    3837
    3938    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    5857      </listitem>
    5958    </itemizedlist>
    60 <!--
    61     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    62     <itemizedlist spacing="compact">
    63       <listitem>
    64         <para>Required patch: <ulink
    65         url="&patch-root;/openjpeg-&openjpeg-version;-security_fixes-1.patch"/></para>
    66       </listitem>
    67     </itemizedlist>
    68 -->
     59
    6960    <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
    7061
    … …  
    10091    <title>Command Explanations</title>
    10192
    102     <para><option>--disable-static</option>: This prevents the
    103     static library from being built.</para>
     93    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     94      href="../../xincludes/static-libraries.xml"/>
    10495
    10596  </sect2>
    106 
    107   <!--
    108   <sect2 role="configuration">
    109     <title>Configuring OpenJPEG</title>
    110 
    111     <sect3>
    112       <title>Configuration Information</title>
    113 
    114     </sect3>
    115 
    116   </sect2>
    117   -->
    11897
    11998  <sect2 role="content">

  • general/graphlib/poppler-systemd.xml

    r455835b r09ae65ca  
    4444    </para>
    4545
    46     &lfs75_checked;
     46    &lfs76_checked;
    4747
    4848    <bridgehead renderas="sect3">Package Information</bridgehead>

  • x/lib/libdrm.xml

    r455835b r09ae65ca  
    7676    <bridgehead renderas="sect3">libdrm Dependencies</bridgehead>
    7777
    78     <bridgehead renderas="sect4">Required</bridgehead>
    79     <para role="required">
     78    <bridgehead renderas="sect4">Recommended</bridgehead>
     79    <para role="recommended">
    8080      <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa) <!-- libpciaccess -->
    8181    </para>

  • x/lib/qt4-systemd.xml

    r455835b r09ae65ca  
    4141    </para>
    4242
    43     &lfs75_checked;
     43    &lfs76_checked;
    4444
    4545    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    450450do
    451451  ln -sfrv $QT4BINDIR/$file /usr/bin/$file-qt4
    452 done</userinput></screen>
     452done
     453unset file</userinput></screen>
    453454
    454455  </sect2>

  • x/lib/qt5-systemd.xml

    r455835b r09ae65ca  
    4242    </para>
    4343
    44     &lfs75_checked;
     44    &lfs76_checked;
    4545
    4646    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    323323    -i $QT5PREFIX/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
    324324
    325 find $QT5PREFIX/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
     325find $QT5PREFIX/lib/lib{Enginio,qgsttools_p,Qt5*}.prl -exec sed -i -r \
    326326     '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput></screen>
    327327
    … …  
    414414do
    415415  ln -sfrv $QT5BINDIR/$file /usr/bin/$file-qt5
    416 done</userinput></screen>
     416done
     417unset file</userinput></screen>
    417418
    418419  </sect2>

  • xsoft/graphweb/firefox.xml

    r455835b r09ae65ca  
    4040    </para>
    4141
    42     &lfs75_checked;
     42    &lfs76_checked;
    4343
    4444    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    260260      commands:
    261261    </para>
    262 
    263     <note><para>
    264       If you are compiling <application>Firefox</application> in chroot, prepend
    265       <envar>SHELL=/bin/sh</envar> to the first make command below.
    266     </para></note>
    267262     
    268263<screen><userinput>make -f client.mk</userinput></screen>
    … …  
    272267    </para>
    273268
    274 <!--    <para>
    275       If you have <emphasis>not</emphasis> linked
    276       <application>Firefox</application> against an installed
    277       <application>Xulrunner</application>:
    278     </para>
    279 
    280 <screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
    281 -->
    282269    <para>
    283270      Now, as the <systemitem class="username">root</systemitem> user, if you
    … …  
    287274    </para>
    288275
    289 <!--<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
    290 mkdir  /usr/lib/firefox-&firefox-version; &amp;&amp;
    291 
    292 tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
    293     -C /usr/lib/firefox-&firefox-version; -\-strip-components=1 &amp;&amp;
    294 chown -R -v root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
    295 
    296 ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;-->
    297276<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
    298277
    … …  
    383362
    384363<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
    385 mkdir -pv /usr/share/pixmaps &amp;&amp;
    386364
    387365cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
    … …  
    400378EOF
    401379
    402 ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
    403         /usr/share/pixmaps/firefox.png</userinput></screen>
     380for s in 16 32 48
     381do
     382install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
     383                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
     384done &amp;&amp;
     385install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
     386                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
     387gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
     388unset s</userinput></screen>
    404389
    405390  </sect2>
    … …  
    411396      <segtitle>Installed Programs</segtitle>
    412397      <segtitle>Installed Libraries</segtitle>
    413       <segtitle>Installed Directory</segtitle>
     398      <segtitle>Installed Directories</segtitle>
    414399
    415400      <seglistitem>
    … …  
    418403        </seg>
    419404        <seg>
    420           Numerous libraries, browser components, plugins, extensions, and
    421           helper modules installed in
    422           <filename class="directory">/usr/lib/firefox-&firefox-version;</filename>
     405          None
    423406        </seg>
    424407        <seg>
    425           /usr/lib/firefox-&firefox-version;
     408          /usr/lib/firefox-&firefox-version; and
     409          /usr/lib/mozilla/plugins
    426410        </seg>
    427411      </seglistitem>

  • xsoft/other/thunderbird.xml

    r455835b r09ae65ca  
    3838    </para>
    3939
    40     &lfs75_checked;
     40    &lfs76_checked;
    4141
    4242    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    157157
    158158<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
    159 # If you have a multicore machine you can speed up the build by running
    160 # several jobs at once by uncommenting the following line and setting the
    161 # value to number of CPU cores:
    162 #mk_add_options MOZ_MAKE_FLAGS="-j4"
     159# If you have a multicore machine, firefox will now use all the cores by
     160# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
     161# by uncommenting the next line and setting a valid number of CPU cores.
     162#mk_add_options MOZ_MAKE_FLAGS="-j1"
    163163
    164164# If you have installed DBus-Glib comment out this line:
    … …  
    231231
    232232    <para>
    233       First, a bug needs to be fixed. Notice that thunderbuild needs to match
    234       the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
     233      First, a bug needs to be fixed. Notice that thunderbuild matches
     234      the value used in mozconfig (above) for the object directory
     235      (MOZ_OBJDIR):
    235236    </para>
    236237
    … …  
    242243    </para>
    243244
    244     <note><para>
    245       If you are compiling <application>Thunderbird</application> in chroot,
    246       prepend <envar>SHELL=/bin/sh</envar> to the <!--first -->make command below.
    247     </para></note>
    248 
    249 <screen><userinput>make -f client.mk<!--
    250 make -C thunderbuild/mail/installer--></userinput></screen>
     245<screen><userinput>make -f client.mk</userinput></screen>
    251246
    252247    <para>
    … …  
    258253      commands as the <systemitem class="username">root</systemitem> user:
    259254    </para>
    260 
    261 <!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
    262 tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
    263     -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
    264 ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
    265255
    266256<screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
    … …  
    275265
    276266<screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
     267
    277268  </sect2>
    278269
    279270  <sect2 role="commands">
    280271    <title>Command Explanations</title>
    281 
    282     <para>
    283       <command>mkdir -vp mozilla/thunderbuild</command>: fixes a build failure
    284       of Makefile at the beginning of build, where a file cannot be found.
    285     </para>
    286272
    287273    <para>
    … …  
    354340
    355341<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
    356 mkdir -pv /usr/share/pixmaps &amp;&amp;
    357342
    358343cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
    … …  
    371356EOF
    372357
    373 ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
    374         /usr/share/pixmaps/thunderbird.png</userinput></screen>
     358for s in 16 22 24 32 48 256
     359do
     360install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
     361                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
     362done &amp;&amp;
     363gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
     364unset s</userinput></screen>
     365
    375366    </sect3>
     367
    376368  </sect2>
    377369
Note: See TracChangeset for help on using the changeset viewer.