Changeset 23f5584

Timestamp:

07/24/2014 02:48:58 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

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

Children:

e46c5994

Parents:

c65ac49d

Message:

Remove references to qt4-dir.

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

Files:

• general/genlib/grantlee.xml (modified) (2 diffs)
• general/genlib/libdbusmenuqt.xml (modified) (2 diffs)
• general/genlib/qca.xml (modified) (2 diffs)
• general/genlib/qjson.xml (modified) (2 diffs)
• kde/core/akonadi.xml (modified) (2 diffs)
• kde/core/config-systemd.xml (modified) (1 diff)
• kde/core/phonon.xml (modified) (2 diffs)

general/genlib/grantlee.xml

@@ -83 +83 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
       .. &amp;&amp;
@@ -113 +113 @@
         </seg>
         <seg>
-           &kde-dir;/lib/cmake/grantlee, 
-           &kde-dir;/lib/grantlee/0.4, and
-           &kde-dir;/include/grantlee</seg>
+           /usr/lib/cmake/grantlee, 
+           /usr/lib/grantlee/0.4, and
+           /usr/include/grantlee</seg>
       </seglistitem>
     </segmentedlist>

general/genlib/libdbusmenuqt.xml

@@ -92 +92 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release     \
       -DWITH_DOC=OFF .. &amp;&amp;
@@ -131 +131 @@
         <seg>None</seg>
         <seg>libdbusmenu-qt.so</seg>
-        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
+        <seg>/usr/include/dbusmenu-qt</seg>
       </seglistitem>
     </segmentedlist>

general/genlib/qca.xml

@@ -79 +79 @@
 
 <screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
-./configure --prefix=&qt4-dir; \
+./configure --prefix=/usr \
             --certstore-path=/etc/ssl/ca-bundle.crt \
             --no-separate-debug-info &amp;&amp;
@@ -119 +119 @@
         <seg>qcatool2</seg>
         <seg>libqca.so</seg>
-        <seg>&qt4-dir;/include/QtCrypto</seg>
+        <seg>/usr/include/QtCrypto</seg>
       </seglistitem>
     </segmentedlist>

general/genlib/qjson.xml

@@ -94 +94 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
@@ -135 +135 @@
         </seg>
         <seg>
-          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
+          /usr/include/json and /usr/lib/cmake/qjson
         </seg>
       </seglistitem>

kde/core/akonadi.xml

@@ -91 +91 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;  \
-      -DCMAKE_PREFIX_PATH=&qt4-dir;          \
       -DCMAKE_BUILD_TYPE=Release           \
       -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE  \
@@ -107 +106 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><option>-DCMAKE_PREFIX_PATH=&qt4-dir;</option>: This switch is used to
-    help <command>cmake</command> find <command>automoc4</command>.</para>
 
     <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply

kde/core/config-systemd.xml

@@ -77 +77 @@
     <title>Installing further KDE packages</title>
     <para>Every subsequent package can be built while having <application>KDE</application> up and
-    running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
+    running, but remember to keep <envar>&kde-dir;</envar> set.</para>
   </sect2>
 

kde/core/phonon.xml

@@ -85 +85 @@
     a better implementation.</para>
 
-    <para>
-      Fix building with <application>CMake</application> 3.0:
-    </para>
-
-<screen><userinput>rm -f cmake/FindQt4.cmake</userinput></screen>
-
     <para>Install <application>Phonon</application> by running the following
     commands:</para>
@@ -158 +152 @@
         </seg>
         <seg>
-          &qt4-dir;/include/KDE/Phonon,
-          &qt4-dir;/include/phonon, and
-          &qt4-dir;/share/phonon
+          &kde-dir;/include/KDE/Phonon,
+          &kde-dir;/include/phonon, and
+          &kde-dir;/share/phonon
         </seg>
       </seglistitem>