Changeset 5e94b6c3 for xsoft/other/transmission.xml

Timestamp:

02/11/2016 07:19:50 AM (9 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

58b6b9b2

Parents:

17fee97b

Message:

X Software section: Merge changes from trunk.

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

File:

• xsoft/other/transmission.xml (modified) (3 diffs)

xsoft/other/transmission.xml

@@ -37 +37 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -127 +127 @@
 
     <para>
-      To build the <application>Qt4</application> GUI, run the following commands:
-    </para>
-
-<screen><userinput>sed -i '/^CONFIG/aQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro &amp;&amp;
-pushd qt    &amp;&amp;
-  qmake-qt4 &amp;&amp;
-  make      &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      To build the <application>Qt5</application> GUI, run the following commands:
-    </para>
-
-<screen><userinput>pushd qt    &amp;&amp;
-  qmake-qt5 &amp;&amp;
-  make      &amp;&amp;
+       The following commands are used if you have installed Qt and would like
+       to compile the Qt GUI. If <application>Qt4</application> and
+       <application>Qt5</application> are installed in
+       <filename class="directory">/opt</filename>, use
+       <command>source setqt4</command> or <command>source setqt5</command> to
+       choose which one will be used to build the Qt GUI. For
+       <application>Qt4</application>, first fix the code with:
+    </para>
+
+<screen><userinput>sed -i '/^CONFIG/aQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro</userinput></screen>
+
+    <para>
+      Now, compile the Qt GUI, with the following commands:
+    </para>
+
+<screen><userinput>pushd qt        &amp;&amp;
+  qmake qtr.pro &amp;&amp;
+  make          &amp;&amp;
 popd</userinput></screen>
 
@@ -162 +164 @@
 <screen role="root"><userinput>make INSTALL_ROOT=/usr -C qt install &amp;&amp;
 
-install -v -m644 qt/transmission-qt.desktop /usr/share/applications/transmission-qt.desktop &amp;&amp;
-install -v -m644 qt/icons/transmission.png  /usr/share/pixmaps/transmission-qt.png</userinput></screen>
+install -m644 qt/transmission-qt.desktop /usr/share/applications/transmission-qt.desktop &amp;&amp;
+install -m644 qt/icons/transmission.png  /usr/share/pixmaps/transmission-qt.png</userinput></screen>
 
   </sect2>