Changeset f46244e8 for xfce

Timestamp:

10/28/2014 08:54:05 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

krejzi/svn

Children:

18fa498

Parents:

44ed64ac

Message:

Changes to Xfce section.

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

Location:

xfce

Files:

• apps/midori.xml (modified) (2 diffs)
• apps/vte2.xml (modified) (1 diff)
• core/core.xml (modified) (2 diffs)
• core/thunar-systemd.xml (moved) (moved from xfce/core/thunar.xml ) (2 diffs)
• core/thunar-volman-systemd.xml (moved) (moved from xfce/core/thunar-volman.xml )
• core/xfce4-session-systemd.xml (moved) (moved from xfce/core/xfce4-session.xml ) (3 diffs)
• core/xfce4-settings.xml (modified) (2 diffs)

xfce/apps/midori.xml

@@ -79 +79 @@
       <xref linkend="cmake"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
+      <xref linkend="webkitgtk2"/> (Compiled against either GTK+ 2 or GTK+ 3 - see "Command Explanations"), and
       <xref linkend="vala"/>
     </para>
@@ -140 +140 @@
 
     <para>
-      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
-      <xref linkend="libzeitgeist"/> is installed. 
+      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: This switch disables Zeitgeist
+      support. Remove it if you have installed <xref linkend="libzeitgeist"/>. 
     </para>
 
     <para>
       <option>-DUSE_GTK3=1</option>: Use this switch if you want to build
-      <application>Midori</application> with
-      <application>WebKitGTK+</application> built against <application>GTK+
-      3</application>, because by default it chooses
-      <application>WebKitGTK+</application> built against <application>GTK+
-      2</application>.
+      <application>Midori</application> using
+      <application>WebKitGTK+</application> built against
+      <application>GTK+ 3</application>. <command>cmake</command>
+      defaults to the <application>WebKitGTK+</application> built
+      against <application>GTK+ 2</application>.
     </para>
 

xfce/apps/vte2.xml

@@ -103 +103 @@
 <screen><userinput>./configure --prefix=/usr \
             --libexecdir=/usr/lib/vte \
-            --disable-static  &amp;&amp;
+            --disable-static &amp;&amp;
 make</userinput></screen>
 

xfce/core/core.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxfcegui4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tumbler.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-appfinder.xml"/>
@@ -52 +52 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfdesktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfwm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session-systemd.xml"/>
 
 </chapter>

xfce/core/thunar-systemd.xml

@@ -81 +81 @@
     </para>
 
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gnome-icon-theme"/> or
-      <xref linkend="lxde-icon-theme"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -100 +94 @@
       <xref linkend="libexif"/> and
       <xref linkend="tumbler"/> (runtime)
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
+    <para role="optional">
+      An icon theme such as <xref linkend="adwaita-icon-theme"/>,
+      <xref linkend="gnome-icon-theme"/> or
+      <xref linkend="lxde-icon-theme"/>
     </para>
 

xfce/core/xfce4-session-systemd.xml

@@ -75 +75 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
 
@@ -97 +107 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --disable-legacy-sm &amp;&amp;
@@ -131 +142 @@
       There are several optional run time dependencies for
       <application>Xfce4</application>:
-      <xref linkend="systemd"/>,
       <xref linkend="dbus"/>,
       <xref linkend="gnupg2"/>,
-      <xref linkend="hicolor-icon-theme"/> and
-      <xref linkend="openssh"/>
+      <xref linkend="hicolor-icon-theme"/>,
+      <xref linkend="openssh"/> and
+      <xref linkend="systemd"/> (for Logind)
     </para>
 
     <para>
       To launch <application>Xfce4</application> use the command
-      <command>startxfce4</command>. If you have <xref linkend="systemd"/>
-      installed, use <command>startxfce4 --with-ck-launch</command>.
-      <application>ConsoleKit</application> is required to perform any
-      task that requires administrative access, including shut down
-      and reboot.
+      <command>startxfce4</command>.
     </para>
 

xfce/core/xfce4-settings.xml

@@ -82 +82 @@
     </para>
 
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gnome-icon-theme"/> or
-      <xref linkend="lxde-icon-theme"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -93 +87 @@
       <xref linkend="libnotify"/> and
       <xref linkend="libxklavier"/>
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
+    <para role="optional">
+      An icon theme such as <xref linkend="adwaita-icon-theme"/>,
+      <xref linkend="gnome-icon-theme"/> or
+      <xref linkend="lxde-icon-theme"/>
     </para>