Changeset af73a280 for x


Ignore:
Timestamp:
06/05/2013 09:28:44 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
5b00a2a
Parents:
13e0a61
Message:

Merge trunk and systemd branch.

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

Location:
x
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • x/lib/cairo.xml

    r13e0a61 raf73a280  
    106106      <xref linkend="libdrm"/>,
    107107      <xref linkend="mesalib"/>,
    108       <xref linkend="qt"/>,
     108      <xref linkend="qt4"/>,
    109109      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
    110110      <ulink url="http://www.valgrind.org">Valgrind</ulink>

  • x/lib/lib.xml

    r13e0a61 raf73a280  
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
    55   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
     55  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
    5656  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
    5757  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>

  • x/wm/openbox.xml

    r13e0a61 raf73a280  
    7272    <para role="required">
    7373      <xref linkend="x-window-system"/> and
    74       <xref linkend="pango"/> (compiled with support for libXft).
     74      <xref linkend="pango"/> (compiled with support for libXft)
    7575    </para>
    7676
    7777    <bridgehead renderas="sect4">Optional</bridgehead>
    7878    <para role="optional">
    79       <xref linkend="imlib2"/> (to enable icons in the right click menu).
     79      <xref linkend="imlib2"/> (to enable icons in the right click menu) and
     80      <ulink url="http://freedesktop.org/wiki/Software/pyxdg">PyXDG</ulink>
    8081    </para>
    8182
    … …  
    99100    </para>
    100101
    101 <screen><userinput>./configure -&#45;prefix=/usr -&#45;sysconfdir=/etc -&#45;disable-static \
    102   -&#45;docdir=/usr/share/doc/openbox-&openbox-version; &amp;&amp;
     102<screen><userinput>./configure --prefix=/usr                         /
     103            --libexecdir=/usr/lib/openbox         /
     104            --sysconfdir=/etc                     /
     105            --docdir=/usr/share/doc/openbox-&openbox-version; /
     106            --disable-static                      &amp;&amp;
    103107make</userinput></screen>
    104108
    … …  
    118122
    119123    <para>
    120       <option>-&#45;sysconfdir=/etc</option>: This option puts
     124      <option>--sysconfdir=/etc</option>: This option puts
    121125      <application>Openbox</application>'s configuration files in
    122126      /etc/xdg/openbox instead of /usr/etc/xdg/openbox.
    … …  
    124128
    125129    <para>
    126       <option>-&#45;disable-static</option>: This option stops it compiling
    127       static versions of the libraries.
    128     </para>
    129 
    130     <para>
    131       <option>-&#45;docdir=/usr/share/doc/openbox-&openbox-version;</option>:
     130      <option>--docdir=/usr/share/doc/openbox-&openbox-version;</option>:
    132131      this puts a few files in a versioned directory in
    133132      <filename class="directory">/usr/share/doc</filename>.
    134133    </para>
     134
     135    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     136      href="../../xincludes/static-libraries.xml"/>
     137
    135138  </sect2>
    136139
    … …  
    142145
    143146      <para>
    144         /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
    145         ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
    146       </para>
     147        /etc/xdg/openbox/autostart, /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
     148        ~/.config/openbox/autostart, ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
     149      </para>
     150
     151      <indexterm zone="openbox openbox-config">
     152        <primary sortas="e-AA.autostart">~/.config/openbox/autostart</primary>
     153      </indexterm>
    147154
    148155      <indexterm zone="openbox openbox-config">
    … …  
    152159      <indexterm zone="openbox openbox-config">
    153160        <primary sortas="e-AA.rc">~/.config/openbox/rc.xml</primary>
     161      </indexterm>
     162
     163      <indexterm zone="openbox openbox-config">
     164        <primary sortas="e-etc-path-autostart">/etc/xdg/openbox/autostart</primary>
    154165      </indexterm>
    155166
    … …  
    227238      </para>
    228239
    229 <screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
    230 display -backdrop -window root /path/to/beautiful/picture.jpeg
    231 exec openbox
    232 HERE_DOC</userinput></screen>
     240<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     241<literal>display -backdrop -window root /path/to/beautiful/picture.jpeg
     242exec openbox</literal>
     243EOF</userinput></screen>
    233244
    234245      <para>
    … …  
    238249      </para>
    239250
    240 <screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
    241 # make an array which lists the pictures:
     251<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     252<literal># make an array which lists the pictures:
    242253picture_list=(~/.config/backgrounds/*)
    243254# create a random integer between 0 and the number of pictures:
    … …  
    245256# display the chosen picture:
    246257display -backdrop -window root "${picture_list[${random_number}]}"
    247 exec openbox
    248 HERE_DOC</userinput></screen>
     258exec openbox</literal>
     259EOF</userinput></screen>
    249260
    250261      <para>
    … …  
    255266      </para>
    256267
    257 <screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
    258 . /etc/profile
     268<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     269<literal>. /etc/profile
    259270picture_list=(~/.config/backgrounds/*)
    260271random_number=$(( ${RANDOM} % ${#picture_list[*]} ))
    … …  
    263274eval $(dbus-launch --auto-syntax --exit-with-session)
    264275lxpanel &amp;
    265 exec openbox
    266 HERE_DOC</userinput></screen>
     276exec openbox</literal>
     277EOF</userinput></screen>
    267278    </sect3>
    268279  </sect2>
    … …  
    278289      <seglistitem>
    279290        <seg>
    280           gdm-control, gnome-panel-control, obxprop, openbox,
    281           openbox-gnome-session, openbox-kde-session and openbox-session
     291          gdm-control, gnome-panel-control, obxprop, openbox, openbox-autostart,
     292          openbox-gnome-session, openbox-kde-session, openbox-session and
     293          openbox-xdg-autostart
    282294        </seg>
    283295        <seg>
    … …  
    349361      </varlistentry>
    350362
     363      <varlistentry id="openbox-autostart">
     364        <term><command>openbox-autostart</command></term>
     365        <listitem>
     366          <para>
     367            is a script that runs commands and applications at Openbox startup.
     368          </para>
     369          <indexterm zone="openbox openbox-autostart">
     370            <primary sortas="b-openbox-autostart">openbox-autostart</primary>
     371          </indexterm>
     372        </listitem>
     373      </varlistentry>
     374
     375      <varlistentry id="openbox-xdg-autostart">
     376        <term><command>openbox-xdg-autostart</command></term>
     377        <listitem>
     378          <para>
     379            is a script that runs xdg autostart .desktop files.
     380          </para>
     381          <indexterm zone="openbox openbox-xdg-autostart">
     382            <primary sortas="b-openbox-xdg-autostart">openbox-xdg-autostart</primary>
     383          </indexterm>
     384        </listitem>
     385      </varlistentry>
     386
    351387      <varlistentry id="openbox-gnome-session">
    352388        <term><command>openbox-gnome-session</command></term>
    … …  
    354390          <para>
    355391            is a script to launch an <application>Gnome</application> session
    356             with openbox as your window manager from your
    357             <filename>~/.xinitrc</filename>.
     392            with <application>Openbox</application> as your window manager from
     393            your <filename>~/.xinitrc</filename>.
    358394          </para>
    359395          <indexterm zone="openbox openbox-gnome-session">
Note: See TracChangeset for help on using the changeset viewer.