Changeset 03c3caa4


Ignore:
Timestamp:
12/24/2020 12:59:37 PM (9 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • x/lib/qt5.xml

    rab30f3f r03c3caa4  
    236236  }
    237237  as_root /sbin/ldconfig
     238
     239  #   Remove references to the build directory from installed library
     240  #   dependency (prl) files:
     241  find $QT5DIR/ -name \*.prl \
     242     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
    238243}
    239244
     
    246251    <para role="required">
    247252      The modules in this group only depend on <xref linkend="qtbase"/>
    248       and a properly set <envar>QTDIR</envar> environment variable.
     253      and a properly set <envar>QT5DIR</envar> environment variable.
    249254    </para>
    250255
     
    263268    *qttools*)
    264269      post_install(){
    265         QT5BINDIR=$QTDIR/bin
     270        QT5BINDIR=$QT5DIR/bin
    266271
    267272        as_root sh &lt;&lt; ROOT_EOF
     
    343348
    344349done
     350#     Some packages such as vlc look for certain
     351#     executables with a -qt5 suffix:
     352for file in lconvert lrelease lupdate; do
     353  as_root ln -sfrvn $QT5DIR/bin/$file /usr/bin/$file-qt5
     354done
     355
    345356)</userinput></screen>
    346357
     
    386397          </seg>
    387398          <seg>
    388             $QTDIR/phrasebooks,
    389             $QTDIR/include/{QtUiTools,QtHelp,QtDesigner,QtX11Extras,QtSvg},
    390             $QTDIR/include/{QtWaylandCompositor,QtWaylandClient},
    391             $QTDIR/include/{QtDesignerComponents,QtUiPlugin},
    392             $QTDIR/lib/cmake/{Qt5AttributionsScannerTools,Qt5Help,Qt5Designer},
    393             $QTDIR/lib/cmake/{Qt5X11Extras,Qt5Svg,Qt5UiTools,Qt5DocTools},
    394             $QTDIR/lib/cmake/{Qt5WaylandCompositor,Qt5WaylandClient},
    395             $QTDIR/lib/cmake/{Qt5DesignerComponents,Qt5UiPlugin},
    396             $QTDIR/lib/cmake/Qt5LinguistTools,
    397             $QTDIR/plugins/wayland-graphics-integration-client,
    398             $QTDIR/plugins/wayland-graphics-integration-server,
    399             $QTDIR/plugins/wayland-decoration-client, and
    400             $QTDIR/plugins/iconengines
     399            $QT5DIR/phrasebooks,
     400            $QT5DIR/include/{QtUiTools,QtHelp,QtDesigner,QtX11Extras,QtSvg},
     401            $QT5DIR/include/{QtWaylandCompositor,QtWaylandClient},
     402            $QT5DIR/include/{QtDesignerComponents,QtUiPlugin},
     403            $QT5DIR/lib/cmake/{Qt5AttributionsScannerTools,Qt5Help,Qt5Designer},
     404            $QT5DIR/lib/cmake/{Qt5X11Extras,Qt5Svg,Qt5UiTools,Qt5DocTools},
     405            $QT5DIR/lib/cmake/{Qt5WaylandCompositor,Qt5WaylandClient},
     406            $QT5DIR/lib/cmake/{Qt5DesignerComponents,Qt5UiPlugin},
     407            $QT5DIR/lib/cmake/Qt5LinguistTools,
     408            $QT5DIR/plugins/wayland-graphics-integration-client,
     409            $QT5DIR/plugins/wayland-graphics-integration-server,
     410            $QT5DIR/plugins/wayland-decoration-client, and
     411            $QT5DIR/plugins/iconengines
    401412          </seg>
    402413        </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.