Changeset 80ae32d

Timestamp:

07/27/2014 01:19:39 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

f17c309

Parents:

6c126c68

Message:

Move ibus to sysutils section.

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

Files:

• general/sysutils/ibus-systemd.xml (moved) (moved from gnome-systemd/applications/ibus.xml ) (8 diffs)
• general/sysutils/sysutils.xml (modified) (1 diff)
• systemd.ent (modified) (1 diff)

general/sysutils/ibus-systemd.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!-- <!ENTITY ibus-download-http "https://github.com/ibus/ibus/releases/download/&ibus-version;/ibus-&ibus-version;.tar.gz"> -->
-  <!ENTITY ibus-download-http "http://ibus.googlecode.com/files/ibus-&ibus-version;.tar.gz">
+  <!ENTITY ibus-download-http "https://github.com/ibus/ibus/releases/download/&ibus-version;/ibus-&ibus-version;.tar.gz">
   <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "59b8d2fbed3ceb14edac130f882ccfd4">
-  <!ENTITY ibus-size          "2.0 MB">
+  <!ENTITY ibus-md5sum        "b9fcfa20bd7b555bb4b438f719c0f2fb">
+  <!ENTITY ibus-size          "2.1 MB">
   <!ENTITY ibus-buildsize     "40 MB">
   <!ENTITY ibus-time          "0.5 SBU">
@@ -77 +76 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dconf"/>,
-      <xref linkend="dbus"/>, and
+      <xref linkend="dconf"/> and
       <xref linkend="iso-codes"/>
     </para>
@@ -86 +84 @@
       <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="gtk3"/>, and
+      <xref linkend="gtk3"/>,
+      <xref linkend="libnotify"/>, and
       <xref linkend="vala"/>
     </para>
@@ -92 +91 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="gtk-doc"/>, and
-      <xref linkend="pyxdg"/>
+      <xref linkend="dbus-python"/> and
+      <xref linkend="pygobject"/> (both to build the Python support library),
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="python3"/>,
+      <xref linkend="pyxdg"/> (for the <command>ibus-setup</command>), and
+      <xref linkend="libxkbcommon"/> and
+      <xref linkend="wayland"/> (both to build the Wayland support programs)
     </para>
 
@@ -110 +113 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
---sysconfdir=/etc --enable-wayland &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>. Two
-      tests may fail due to problems with the tests.
+      To test the results, issue: <command>make -k check</command>.
+      Some tests may fail for unknown reasons.
     </para>
 
@@ -124 +126 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -133 +136 @@
       of the <application>GTK+ 2</application> immodule. Use it if
       you have not installed <application>GTK+ 2</application>.
+    </para>
+
+    <para>
+      <option>--enable-python-library</option>: This switch enables
+      building of the <application>Python</application> support
+      library. Use it if have installed the optional dependencies.
+    </para>
+
+    <para>
+      <option>--enable-wayland</option>: This switch enables building
+      of the <application>Wayland</application> support programs.
+      Use it if you have installed the optional dependencies.
+    </para>
+
+    <para>
+      <option>--with-python=python3</option>: This switch makes
+      the <command>configure</command> look for
+      <application>Python 3</application>. Use it if you want
+      to build the <application>Python 3</application> support
+      library alongside the <application>Python 2</application>
+      one.
     </para>
 
@@ -200 +224 @@
         <listitem>
           <para>
-            contains <application>IBus</application> API functions.
+            contains the <application>IBus</application> API functions.
           </para>
           <indexterm zone="ibus libibus-1.0">

general/sysutils/sysutils.xml

@@ -30 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>

systemd.ent

@@ -2 +2 @@
 <!ENTITY colord-gtk-version           "0.1.25">
 <!ENTITY highlight-version            "3.18">
+<!ENTITY ibus-version                 "1.5.8">
 <!ENTITY libepoxy-version             "1.2">
 <!ENTITY libevdev-version             "1.2.2">