Changeset 2b6bee98

Timestamp:

07/24/2014 11:57:12 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

41d4b7ec

Parents:

4b422698

Message:

Revive qtchooser.

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

Files:

• general/genutils/genutils.xml (modified) (1 diff)
• general/genutils/qtchooser-systemd.xml (moved) (moved from archive/qtchooser.xml ) (10 diffs)
• systemd.ent (modified) (1 diff)

general/genutils/genutils.xml

@@ -33 +33 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtchooser-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>

general/genutils/qtchooser-systemd.xml

@@ -33 +33 @@
 
     <para>
-      The <application>qtchooser</application> package contains a wrapper used to select
-      between <application>Qt</application> binary versions.  It is only needed if 
-      both Qt4 and Qt5 are installed for access via the /usr/bin directory.
-    </para>
-
-    &lfs74_checked;
+      The <application>qtchooser</application> package contains a wrapper used to
+      select between <application>Qt</application> binary versions.
+    </para>
+
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70 +69 @@
         <para>
           Estimated build time: &qtchooser-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qtchooser-&qtchooser-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
@@ -103 +112 @@
     </para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>patch -Np1 -i ../qtchooser-&qtchooser-version;-upstream_fixes-1.patch &amp;&amp;
+make</userinput></screen>
 
     <para>
@@ -113 +123 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-install -m644 doc/qtchooser.1 /usr/share/man/man1</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -149 +158 @@
 
       <para>
-        Create the configuration files by running the following commands as
+        If both <application>Qt4</application> and
+        <application>Qt5</application> are installed in
+        <filename class="directory">/usr</filename>, create the
+        configuration files by running the following commands as
         the <systemitem class="username">root</systemitem> user:
       </para>
 
 <screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
-cat &gt; /etc/xdg/qtchooser/4.conf &lt;&lt; "EOF"
+cat &gt; /etc/xdg/qtchooser/qt4.conf &lt;&lt; "EOF"
 <literal>/usr/lib/qt4/bin
 /usr/lib</literal>
 EOF
-cat &gt; /etc/xdg/qtchooser/5.conf &lt;&lt; "EOF"
+cat &gt; /etc/xdg/qtchooser/qt5.conf &lt;&lt; "EOF"
 <literal>/usr/lib/qt5/bin
 /usr/lib</literal>
@@ -164 +176 @@
 
       <para>
+        If both <application>Qt4</application> and
+        <application>Qt5</application> are installed in
+        <filename class="directory">/usr</filename>, create the
+        configuration files by running the following commands as
+        the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
+cat &gt; /etc/xdg/qtchooser/qt4.conf &lt;&lt; "EOF"
+<literal>/opt/qt4/lib/qt4/bin
+/opt/qt4/lib</literal>
+EOF
+cat &gt; /etc/xdg/qtchooser/qt5.conf &lt;&lt; "EOF"
+<literal>/opt/qt5/lib/qt5/bin
+/opt/qt5/lib</literal>
+EOF</userinput></screen>
+
+      <para>
+        Replace <filename class="directory">/opt/qt4</filename> and/or
+        <filename class="directory">/opt/qt5</filename> if you used
+        different prefix.
+      </para>
+
+      <para>
         To set <application>Qt4</application> as the default, run the following
         command as the <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>ln -sfv 4.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
+<screen role="root"><userinput>ln -sfv qt4.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
 
       <para>
@@ -175 +211 @@
       </para>
 
-<screen role="root"><userinput>ln -sfv 5.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
+<screen role="root"><userinput>ln -sfv qt5.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
 
       <para>
@@ -186 +222 @@
       </para>
 
-<screen><userinput>export QT_SELECT=4</userinput></screen>
+<screen><userinput>export QT_SELECT=qt4</userinput></screen>
 
       <para>
@@ -192 +228 @@
       </para>
 
-<screen><userinput>export QT_SELECT=5</userinput></screen>
+<screen><userinput>export QT_SELECT=qt5</userinput></screen>
 
     </sect3>
@@ -211 +247 @@
           pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml, qdbusviewer,
           qdbusxml2cpp, qdoc, qdoc3, qglinfo, qhelpconverter, qhelpgenerator,
-          qmake, qml, qml1plugindump, qmlbundle, qmlmin, qmlplugindump,
-          qmlprofiler, qmlscene, qmltestrunner, qmlviewer, qtchooser,
-          qtconfig, rcc, uic, uic3, xmlpatterns, and xmlpatternsvalidator
+          qlalr, qmake, qml, qml1plugindump, qmlbundle, qmlimportscanner,
+          qmlmin, qmlplugindump, qmlprofiler, qmlscene, qmltestrunner,
+          qmlviewer, qtchooser, qtconfig, qtdiag, qtpaths, rcc, uic, uic3,
+          xmlpatterns and xmlpatternsvalidator
         </seg>
         <seg>

systemd.ent

@@ -6 +6 @@
 <!ENTITY libxkbcommon-version         "0.4.2">
 <!ENTITY pyatspi2-version             "2.12.0">
+<!ENTITY qtchooser-version            "39">
 <!ENTITY sound-theme-freedesktop-version "0.8">
 <!ENTITY upower1-version              "0.99.0">