Changeset 7b946c2

Timestamp:

08/02/2014 01:31:26 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

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

Children:

fa37f2a

Parents:

84950f90

Message:

Remove setqt hacks from packages.

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

Files:

• general/graphlib/graphlib.xml (modified) (1 diff)
• general/graphlib/poppler-systemd.xml (moved) (moved from general/graphlib/poppler.xml ) (2 diffs)
• general/prog/cmake-systemd.xml (moved) (moved from general/prog/cmake.xml ) (2 diffs)
• general/prog/doxygen.xml (modified) (1 diff)
• general/prog/prog.xml (modified) (1 diff)
• networking/netutils/wireshark.xml (modified) (2 diffs)
• xsoft/other/other.xml (modified) (1 diff)
• xsoft/other/transmission-systemd.xml (moved) (moved from xsoft/other/transmission.xml ) (1 diff)

general/graphlib/graphlib.xml

@@ -47 +47 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
 

general/graphlib/poppler-systemd.xml

@@ -153 +153 @@
 
     <para>
-      If you are not building both  <application>Qt</application> libraries,
-      jump to the following paragraph. In order to build both
-      <application>Qt4</application> and <application>Qt5</application>
-      libraries, you need to run the install commands twice, because although
-      both are detected, only wrapper for the first
-      <application>Qt</application> version in PATH is built. Either can be
-      built first, but to facilitate the explanation, we choose first the
-      <application>Qt4</application> library. You can do this using
-      <command>source setqt4</command> (script from <xref linkend="qt4"/>).
-    </para>
-
-    <para>
       Install <application>Poppler</application> by running the following
       commands:
@@ -185 +173 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you are not building both <application>Qt</application> libraries,
-      jump to the following paragraph. If you want to build both
-      <application>Qt</application> libraries, first switch back to
-      unpriviledged user, run <command>source setqt5</command>, from
-      <xref linkend="qt5"/>, and repeat the instructions from configuration
-      until install. After that, proceed to install the documents until the end.
-    </para>
 
     <para>

general/prog/cmake-systemd.xml

@@ -99 +99 @@
     <title>Installation of CMake</title>
 
-    <para>
+    <!-- <para>
        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-based GUI.
-    </para>
+    </para> -->
 
     <para>
@@ -153 +153 @@
       <application>Qt</application>-based  GUI for
       <application>CMake</application>.
+    </para>
+
+    <para>
+      <option>--qt-qmake=/usr/bin/qmake-qt5</option>: Use this switch if
+      you have both <application>Qt4</application> and
+      <application>Qt5</application> installed but wish to build the
+      <application>Qt5</application> based GUI (it defaults to
+      <application>Qt4</application> one).
     </para>
 

general/prog/doxygen.xml

@@ -145 +145 @@
       <option>--with-doxywizard</option>: Use this parameter if
       <application>Qt4</application> is installed and you wish to build the
-      GUI front-end. If both <application>Qt4</application> and
-      <application>Qt5</application> are installed, use
-      <command>source setqt4</command>. If <application>Qt4</application> is
-      installed in <filename class="directory">/opt</filename>, issue
-      <command>export QTDIR=$QT4DIR</command>.
+      GUI front-end.
     </para>
 

general/prog/prog.xml

@@ -25 +25 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>

networking/netutils/wireshark.xml

@@ -175 +175 @@
     <application>GTK+3</application> and another one linked to
     <application>Qt5</application> are built, by default. Instead, we chose to
-    build the <application>GTK+3</application> GUI only, as the BLFS default.
+    only build the <application>GTK+3</application> GUI, as the BLFS default.
     If you prefer otherwise, some modifications are mecessary. For
     modifications in the <command>configure</command> switches, see
@@ -250 +250 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's/Qt5 Qt/Qt/'</command>: This command is required
-    because without it, libraries and includes from
+    <para><command>sed -i 's/Qt5 Qt/Qt/' ...</command>: This command is required
+    because, without it, libraries and includes from
     <application>Qt5</application> are found and used first, if both versions
     are installed, when trying to build with <application>Qt4</application>,

xsoft/other/other.xml

@@ -32 +32 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunderbird.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tigervnc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transmission.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transmission-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-utils.xml"/>

xsoft/other/transmission-systemd.xml

@@ -128 +128 @@
 
     <para>
-       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;
+      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;
 popd</userinput></screen>