Author: renodr
Date: Thu Aug 8 18:00:01 2019
New Revision: 21919
Log:
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
Modified:
trunk/BOOK/general/genlib/grantlee.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/kf5-apps/kdenlive5.xml
trunk/BOOK/kde/kf5/kf5-frameworks.xml
trunk/BOOK/kde/kf5/kf5-intro.xml
trunk/BOOK/kde/plasma5/plasma-all.xml
trunk/BOOK/multimedia/libdriv/mlt.xml
Modified: trunk/BOOK/general/genlib/grantlee.xml
==============================================================================
--- trunk/BOOK/general/genlib/grantlee.xml Thu Aug 8 15:34:44 2019
(r21918)
+++ trunk/BOOK/general/genlib/grantlee.xml Thu Aug 8 18:00:01 2019
(r21919)
@@ -67,7 +67,7 @@
<listitem>
<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>
</itemizedlist>
@@ -89,7 +89,7 @@
<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
running the following commands:</para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Thu Aug 8 15:34:44
2019 (r21918)
+++ trunk/BOOK/introduction/welcome/changelog.xml Thu Aug 8 18:00:01
2019 (r21919)
@@ -46,6 +46,21 @@
<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
<ulink url="&blfs-ticket-root;12372">#12372</ulink>.</para>
</listitem>
Modified: trunk/BOOK/kde/kf5-apps/kdenlive5.xml
==============================================================================
--- trunk/BOOK/kde/kf5-apps/kdenlive5.xml Thu Aug 8 15:34:44 2019
(r21918)
+++ trunk/BOOK/kde/kf5-apps/kdenlive5.xml Thu Aug 8 18:00:01 2019
(r21919)
@@ -79,6 +79,11 @@
<xref role="runtime" linkend="v4l-utils"/> (runtime)
</para>
+ <bridgehead renderas="sect4">Recommended</bridgehead>
+ <para role="recommended">
+ <xref linkend="breeze-icons"/>
+ </para>
+
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/kdenlive5"/>
</para>
Modified: trunk/BOOK/kde/kf5/kf5-frameworks.xml
==============================================================================
--- trunk/BOOK/kde/kf5/kf5-frameworks.xml Thu Aug 8 15:34:44 2019
(r21918)
+++ trunk/BOOK/kde/kf5/kf5-frameworks.xml Thu Aug 8 18:00:01 2019
(r21919)
@@ -424,7 +424,7 @@
<term><command>depdiagram-generate-all</command></term>
<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">
<primary
sortas="b-depdiagram-generate-all">depdiagram-generate-all</primary>
Modified: trunk/BOOK/kde/kf5/kf5-intro.xml
==============================================================================
--- trunk/BOOK/kde/kf5/kf5-intro.xml Thu Aug 8 15:34:44 2019 (r21918)
+++ trunk/BOOK/kde/kf5/kf5-intro.xml Thu Aug 8 18:00:01 2019 (r21919)
@@ -109,19 +109,20 @@
export KF5_PREFIX=/opt/kf5
-pathappend $KF5_PREFIX/bin PATH
-pathappend $KF5_PREFIX/lib/pkgconfig PKG_CONFIG_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/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 QT_PLUGIN_PATH
+pathappend $KF5_PREFIX/lib/plugins/kcms QT_PLUGIN_PATH
-pathappend $KF5_PREFIX/lib/qml QML2_IMPORT_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
Modified: trunk/BOOK/kde/plasma5/plasma-all.xml
==============================================================================
--- trunk/BOOK/kde/plasma5/plasma-all.xml Thu Aug 8 15:34:44 2019
(r21918)
+++ trunk/BOOK/kde/plasma5/plasma-all.xml Thu Aug 8 18:00:01 2019
(r21919)
@@ -224,7 +224,7 @@
tar -xf $file
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)
sed -i '/set.HAVE_X11/a set(X11_FOUND 1)' CMakeLists.txt
Modified: trunk/BOOK/multimedia/libdriv/mlt.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/mlt.xml Thu Aug 8 15:34:44 2019
(r21918)
+++ trunk/BOOK/multimedia/libdriv/mlt.xml Thu Aug 8 18:00:01 2019
(r21919)
@@ -92,13 +92,11 @@
<para>Install <application>MLT</application> by running the
following commands:</para>
-<screen><userinput>./configure --prefix=/usr \
- --enable-gpl \
- --enable-gpl3 \
- --enable-opengl \
- --disable-gtk2 \
- --qt-libdir=$QT5DIR/lib \
- --qt-includedir=$QT5DIR/include &&
+<screen><userinput>./configure --prefix=/usr \
+ --enable-gpl \
+ --enable-gpl3 \
+ --enable-opengl \
+ --disable-gtk2 &&
make</userinput></screen>
<para>This package does not come with a test suite. However a test .mp4
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
