Changeset 4e0a40f

Timestamp:

08/09/2019 01:00:01 AM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.0, 9.1, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2ab28c8

Parents:

30bce567

Message:

Fix grantlee to allow it to compile against CMake 3.15 and newer
Remove unneccessary configure flags from MLT
Fix typos in Plasma and KDE Frameworks 5
Add /opt/kf5/lib/plugins/kcms to the QT PLUGIN PATH
Added Breeze as a recommended dependency to Kdenlive

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21919 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/genlib/grantlee.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• kde/kf5-apps/kdenlive5.xml (modified) (1 diff)
• kde/kf5/kf5-frameworks.xml (modified) (1 diff)
• kde/kf5/kf5-intro.xml (modified) (1 diff)
• kde/plasma5/plasma-all.xml (modified) (1 diff)
• multimedia/libdriv/mlt.xml (modified) (1 diff)

general/genlib/grantlee.xml

@@ -68 +68 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/grantlee-&grantlee-version;-upstream_fixes-1.patch"/>
+          <ulink url="&patch-root;/grantlee-&grantlee-version;-upstream_fixes-2.patch"/>
         </para>
       </listitem>
@@ -90 +90 @@
     <para>First, make some updates from upstream:</para>
 
-<screen><userinput>patch -Np1 -i ../grantlee-&grantlee-version;-upstream_fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../grantlee-&grantlee-version;-upstream_fixes-2.patch</userinput></screen>
 
     <para>Install <application>Grantlee</application> by

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <para>August 8th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix building Grantlee with CMake 3.15 or newer. Fixes
+          <ulink url="&blfs-ticket-root;12374">#12374</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fix building MLT against a /usr installed Qt5 by
+          removing configure switches that are unneccessary for both /opt and
+          /usr installs of Qt5. Fixes
+          <ulink url="&blfs-ticket-root;12201">#12201</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added $KF5_PREFIX/lib/plugins/kcms to the
+          QT Plugin Path. Fixes
+          <ulink url="&blfs-ticket-root;12206">#12206</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to cmake-3.15.2. Fixes

kde/kf5-apps/kdenlive5.xml

@@ -78 +78 @@
       <xref linkend="mlt"/>, and 
       <xref role="runtime" linkend="v4l-utils"/> (runtime)
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="breeze-icons"/>
     </para>
 

kde/kf5/kf5-frameworks.xml

@@ -425 +425 @@
         <listitem>
           <para>
-            is a tool to generate a dependency diagram for all frameworks at once..
+            is a tool to generate a dependency diagram for all frameworks at once.
           </para>
           <indexterm zone="kf5-frameworks depdiagram-generate-all">

kde/kf5/kf5-intro.xml

@@ -110 +110 @@
 export KF5_PREFIX=/opt/kf5
 
-pathappend $KF5_PREFIX/bin             PATH
-pathappend $KF5_PREFIX/lib/pkgconfig   PKG_CONFIG_PATH
-
-pathappend $KF5_PREFIX/etc/xdg         XDG_CONFIG_DIRS
-pathappend $KF5_PREFIX/share           XDG_DATA_DIRS
-
-pathappend $KF5_PREFIX/lib/plugins     QT_PLUGIN_PATH
-
-pathappend $KF5_PREFIX/lib/qml         QML2_IMPORT_PATH
+pathappend $KF5_PREFIX/bin              PATH
+pathappend $KF5_PREFIX/lib/pkgconfig    PKG_CONFIG_PATH
+
+pathappend $KF5_PREFIX/etc/xdg          XDG_CONFIG_DIRS
+pathappend $KF5_PREFIX/share            XDG_DATA_DIRS
+
+pathappend $KF5_PREFIX/lib/plugins      QT_PLUGIN_PATH
+pathappend $KF5_PREFIX/lib/plugins/kcms QT_PLUGIN_PATH
+
+pathappend $KF5_PREFIX/lib/qml          QML2_IMPORT_PATH
 
 pathappend $KF5_PREFIX/lib/python&python3-majorver;/site-packages PYTHONPATH
 
-pathappend $KF5_PREFIX/share/man       MANPATH
+pathappend $KF5_PREFIX/share/man        MANPATH
 # End /etc/profile.d/kf5.sh</literal>
 EOF

kde/plasma5/plasma-all.xml

@@ -225 +225 @@
     pushd $packagedir
 
-       # Fix some build issues when generating some configureation files
+       # Fix some build issues when generating some configuration files
        case $name in
          plasma-workspace)

multimedia/libdriv/mlt.xml

@@ -93 +93 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr            \
-            --enable-gpl             \
-            --enable-gpl3            \
-            --enable-opengl          \
-            --disable-gtk2           \
-            --qt-libdir=$QT5DIR/lib  \
-            --qt-includedir=$QT5DIR/include &amp;&amp;
+<screen><userinput>./configure --prefix=/usr     \
+            --enable-gpl      \
+            --enable-gpl3     \
+            --enable-opengl   \
+            --disable-gtk2    &amp;&amp;
 make</userinput></screen>