Changeset 50182be

Timestamp:

05/28/2020 06:55:38 AM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 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:

50cbddce

Parents:

7c017a3

Message:

Fix vlc to build with qt-5.15,
based on a patch at OpenSuse.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/vlc.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Adapt vlc-3.0.10 for changes in Qt-5.15.</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Upgrade to openssh-8.3p1. Fixes
           <ulink url="&blfs-ticket-root;13580">#13580</ulink>.</para>

multimedia/videoutils/vlc.xml

@@ -232 +232 @@
     <screen><userinput>sed -i '/vlc_demux.h/a #define LUA_COMPAT_APIINTCASTS' modules/lua/vlc.h   &amp;&amp;
 sed -i '/LIBSSH2_VERSION_NUM/s/10801/10900/' modules/access/sftp.c &amp;&amp;
+sed -i '/#include &lt;QWidget&gt;/a\#include &lt;QPainterPath&gt;/'            \
+    modules/gui/qt/util/timetooltip.hpp                            &amp;&amp;
+sed -i '/#include/&lt;QPainter&gt;/a\#include &lt;QPainterPath&gt;/'           \
+    modules/gui/qt/components/playlist/views.cpp                   \
+    modules/gui/qt/dialogs/plugins.cpp                             &amp;&amp;
 
 BUILDCC=gcc ./configure --prefix=/usr    \
@@ -266 +271 @@
       building with <xref linkend="libssh2"/>.
     </para>
+
+    <para>
+      <command>sed ... a\#include &lt;QPainterPath&gt;/ ...</command>: These two
+      sed commands fix building with Qt-5.15.0.
+
+     </para>
 
     <para>