Changeset 03c3caa4

Timestamp:

12/24/2020 12:59:37 PM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

qt5new

Children:

4005416

Parents:

ab30f3f

Message:

A few corrections to the new qt5

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

File:

• x/lib/qt5.xml (modified) (5 diffs)

x/lib/qt5.xml

@@ -236 +236 @@
   }
   as_root /sbin/ldconfig
+
+  #   Remove references to the build directory from installed library
+  #   dependency (prl) files:
+  find $QT5DIR/ -name \*.prl \
+     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
 }
 
@@ -246 +251 @@
     <para role="required">
       The modules in this group only depend on <xref linkend="qtbase"/>
-      and a properly set <envar>QTDIR</envar> environment variable.
+      and a properly set <envar>QT5DIR</envar> environment variable.
     </para>
 
@@ -263 +268 @@
     *qttools*)
       post_install(){
-        QT5BINDIR=$QTDIR/bin
+        QT5BINDIR=$QT5DIR/bin
 
         as_root sh &lt;&lt; ROOT_EOF
@@ -343 +348 @@
 
 done
+#     Some packages such as vlc look for certain
+#     executables with a -qt5 suffix:
+for file in lconvert lrelease lupdate; do
+  as_root ln -sfrvn $QT5DIR/bin/$file /usr/bin/$file-qt5
+done
+
 )</userinput></screen>
 
@@ -386 +397 @@
           </seg>
           <seg>
-            $QTDIR/phrasebooks,
-            $QTDIR/include/{QtUiTools,QtHelp,QtDesigner,QtX11Extras,QtSvg},
-            $QTDIR/include/{QtWaylandCompositor,QtWaylandClient},
-            $QTDIR/include/{QtDesignerComponents,QtUiPlugin},
-            $QTDIR/lib/cmake/{Qt5AttributionsScannerTools,Qt5Help,Qt5Designer},
-            $QTDIR/lib/cmake/{Qt5X11Extras,Qt5Svg,Qt5UiTools,Qt5DocTools},
-            $QTDIR/lib/cmake/{Qt5WaylandCompositor,Qt5WaylandClient},
-            $QTDIR/lib/cmake/{Qt5DesignerComponents,Qt5UiPlugin},
-            $QTDIR/lib/cmake/Qt5LinguistTools,
-            $QTDIR/plugins/wayland-graphics-integration-client,
-            $QTDIR/plugins/wayland-graphics-integration-server,
-            $QTDIR/plugins/wayland-decoration-client, and
-            $QTDIR/plugins/iconengines
+            $QT5DIR/phrasebooks,
+            $QT5DIR/include/{QtUiTools,QtHelp,QtDesigner,QtX11Extras,QtSvg},
+            $QT5DIR/include/{QtWaylandCompositor,QtWaylandClient},
+            $QT5DIR/include/{QtDesignerComponents,QtUiPlugin},
+            $QT5DIR/lib/cmake/{Qt5AttributionsScannerTools,Qt5Help,Qt5Designer},
+            $QT5DIR/lib/cmake/{Qt5X11Extras,Qt5Svg,Qt5UiTools,Qt5DocTools},
+            $QT5DIR/lib/cmake/{Qt5WaylandCompositor,Qt5WaylandClient},
+            $QT5DIR/lib/cmake/{Qt5DesignerComponents,Qt5UiPlugin},
+            $QT5DIR/lib/cmake/Qt5LinguistTools,
+            $QT5DIR/plugins/wayland-graphics-integration-client,
+            $QT5DIR/plugins/wayland-graphics-integration-server,
+            $QT5DIR/plugins/wayland-decoration-client, and
+            $QT5DIR/plugins/iconengines
           </seg>
         </seglistitem>