Changeset 58b6b9b2 for xfce/apps


Ignore:
Timestamp:
02/11/2016 07:56:36 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
c3c3cbf
Parents:
5e94b6c3
Message:

Merge changes from trunk in XFCE4 section.

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

Location:
xfce/apps
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • xfce/apps/apps.xml

    r5e94b6c3 r58b6b9b2  
    2323  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="midori.xml"/>
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parole.xml"/>
    25   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview2.xml"/>
     25<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview2.xml"/> -->
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mousepad.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte2.xml"/>

  • xfce/apps/midori.xml

    r5e94b6c3 r58b6b9b2  
    1010  <!ENTITY midori-md5sum        "fcc03ef759fce4fe9f2446d9da4a065e">
    1111  <!ENTITY midori-size          "1.4 MB">
    12   <!ENTITY midori-buildsize     "79 MB">
     12  <!ENTITY midori-buildsize     "91 MB">
    1313  <!ENTITY midori-time          "0.8 SBU">
    1414]>
    … …  
    3636    </para>
    3737
    38     &lfs77_checked;
     38    &lfs78_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
     41
    4142    <itemizedlist spacing="compact">
    4243      <listitem>
    … …  
    7980      <xref linkend="gcr"/>,
    8081      <xref linkend="libnotify"/>,
    81       <xref linkend="webkitgtk2"/> (Compiled against either GTK+ 2 or GTK+ 3 - see "Command Explanations"), and
     82      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
    8283      <xref linkend="vala"/>
    8384    </para>
    … …  
    9091    <bridgehead renderas="sect4">Optional</bridgehead>
    9192    <para role="optional">
    92       <xref linkend="gtk-doc"/> and
     93      <xref linkend="gtk-doc"/>,
     94      <xref linkend="libunique"/> (if built with gtk+2) and
    9395      <xref linkend="libzeitgeist"/>
    9496    </para>
    … …  
    101103  <sect2 role="installation">
    102104    <title>Installation of Midori</title>
     105<!--
     106    <note>
     107      <para>
     108        The tarball was not created from a directory, thus it is better to create a directory to uncompress it:
     109      </para>
     110<screen><userinput>mkdir -v midori-&midori-version; &amp;&amp;
     111tar -xf midori_&midori-version;_all_.tar.bz2 -C midori-&midori-version; &amp;&amp;
     112cd midori-&midori-version;</userinput></screen>
     113    </note>-->
    103114
    104115    <para>
    … …  
    113124      -DCMAKE_BUILD_TYPE=Release  \
    114125      -DUSE_ZEITGEIST=OFF         \
     126      -DUSE_GTK3=1                \
    115127      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
    116128      ..  &amp;&amp;
    … …  
    118130
    119131    <para>
    120       This package does not have a working testsuite.
     132      This package does not come with a working test suite.
    121133    </para>
    122134
    … …  
    135147
    136148    <para>
    137       <parameter>-DUSE_ZEITGEIST=OFF</parameter>: This switch disables Zeitgeist
    138       support. Remove it if you have installed <xref linkend="libzeitgeist"/>.
    139     </para>
    140 
    141     <para>
    142       <option>-DUSE_GTK3=1</option>: Use this switch if you want to build
    143       <application>Midori</application> using
     149      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
     150      Zeitgeist is installed.
     151    </para>
     152
     153    <para>
     154      <parameter>-DUSE_GTK3=1</parameter>: Use this switch chooses
    144155      <application>WebKitGTK+</application> built against
    145       <application>GTK+ 3</application>. <command>cmake</command>
    146       defaults to the <application>WebKitGTK+</application> built
    147       against <application>GTK+ 2</application>.
     156      <application>GTK+ 3</application>, for <application>WebKit2</application>
     157      layer support.
    148158    </para>
    149159
    … …  
    151161      <option>-DUSE_APIDOCS=1</option>: Use this switch if
    152162      <application>GTK-Doc</application> is installed and you
    153       wish to build and install the API documentation. 
     163      wish to build and install the API documentation.
    154164    </para>
    155165
    … …  
    172182        </seg>
    173183        <seg>
    174           /etc/xdg/midori,
    175           /usr/lib/midori,
    176           /usr/share/doc/midori-&midori-version; and
    177           /usr/share/midori
     184          /{etc/xdg,/usr/{lib,share}}/midori and
     185          /usr/share/doc/midori-&midori-version;
    178186        </seg>
    179187      </seglistitem>

  • xfce/apps/mousepad.xml

    r5e94b6c3 r58b6b9b2  
    3737    </para>
    3838
    39     &lfs77_checked;
     39    &lfs78_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7777    <bridgehead renderas="sect4">Required</bridgehead>
    7878    <para role="required">
    79       <xref linkend="gtksourceview2"/> or
    80       <xref linkend="gtksourceview"/>
     79      <xref linkend="gtksourceview"/> (optionally, it can be built with
     80      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/">gtksourceview-2</ulink>)
    8181    </para>
    8282

  • xfce/apps/parole.xml

    r5e94b6c3 r58b6b9b2  
    88           "http://archive.xfce.org/src/apps/parole/0.8/parole-&parole-version;.tar.bz2">
    99  <!ENTITY parole-download-ftp  " ">
    10   <!ENTITY parole-md5sum        "fffdc23d2aa22271f01410a9e27c3404">
     10  <!ENTITY parole-md5sum        "361e3059f1263c76a3711db2c7c1a97b">
    1111  <!ENTITY parole-size          "796 KB">
    12   <!ENTITY parole-buildsize     "13.5 MB">
    13   <!ENTITY parole-time          "0.1 SBU">
     12  <!ENTITY parole-buildsize     "17 MB">
     13  <!ENTITY parole-time          "0.2 SBU">
    1414]>
    1515
    … …  
    3737    </para>
    3838
    39     &lfs77_checked;
     39    &lfs78_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7777    <bridgehead renderas="sect4">Required</bridgehead>
    7878    <para role="required">
    79       <xref linkend="gst-plugins-base"/> or
    8079      <xref linkend="gst10-plugins-base"/> and
    8180      <xref linkend="libxfce4ui"/>
    … …  
    121120    <para>
    122121      <parameter>--with-gstreamer=1.0</parameter>: Use this switch if
    123       you want to use <xref linkend="gst10-plugins-base"/> instead of
    124       <xref linkend="gst-plugins-base"/>.
     122      the deprecated gstreamer-0.x is installed.
    125123    </para>
    126124

  • xfce/apps/ristretto.xml

    r5e94b6c3 r58b6b9b2  
    3636    </para>
    3737
    38     &lfs77_checked;
     38    &lfs78_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>

  • xfce/apps/vte2.xml

    r5e94b6c3 r58b6b9b2  
    103103<screen><userinput>./configure --prefix=/usr \
    104104            --libexecdir=/usr/lib/vte \
    105             --disable-static &amp;&amp;
     105            --disable-static  &amp;&amp;
    106106make</userinput></screen>
    107107
    … …  
    122122
    123123    <para>
    124      <parameter>--libexecdir=/usr/lib/vte</parameter>: Both this package and
     124     <parameter>--libexecdir=/usr/lib/vte</parameter>: both this package and
    125125     <xref linkend="vte"/> install files of the same name. This switch ensures
    126126     that they do not overwrite each other if both are installed.

  • xfce/apps/xfburn.xml

    r5e94b6c3 r58b6b9b2  
    3838    </para>
    3939
    40     &lfs77_checked;
     40    &lfs78_checked;
    4141
    4242    <bridgehead renderas="sect3">Package Information</bridgehead>

  • xfce/apps/xfce4-notifyd.xml

    r5e94b6c3 r58b6b9b2  
    4141    </para>
    4242
    43     &lfs77_checked;
     43    &lfs78_checked;
    4444
    4545    <bridgehead renderas="sect3">Package Information</bridgehead>

  • xfce/apps/xfce4-terminal.xml

    r5e94b6c3 r58b6b9b2  
    3838    </para>
    3939
    40     &lfs77_checked;
     40    &lfs78_checked;
    4141
    4242    <bridgehead renderas="sect3">Package Information</bridgehead>
Note: See TracChangeset for help on using the changeset viewer.