Changeset a2e1b33


Ignore:
Timestamp:
05/01/2023 09:38:46 AM (12 months ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
33c71a1
Parents:
405b258
Message:

Tidy up qt5 modular build (WIP)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/qt5.xml

    r405b258 ra2e1b33  
    66
    77
    8   <!ENTITY qt5-download-http "&qt5-url;/">
    9   <!ENTITY qt5-download-ftp  " ">
    10   <!ENTITY qt5-md5sum        "See below">
    11   <!ENTITY qt5-size          "11 MB for basic modules, 59 MB for qtwebengine,">
    12   <!ENTITY qt5-buildsize     "930 MB (23 MB installed) for basic modules">
    13   <!ENTITY qt5-time          "Using parallelism=4: 3.4 SBU for basic modules">
     8  <!ENTITY qt5-qttools-md5            "6b1918dc24e0a56c9fd48d69e78b13fa">
     9  <!ENTITY qt5-qtsvg-md5              "5fc7f98d8ba2078446c538a461566d4b">
     10  <!ENTITY qt5-qtx11extras-md5        "3646de5ffd3cf29c7a3b266d3a9b7a02">
     11  <!ENTITY qt5-qtwayland-md5          "decc31455e124036dce9644b5d8bd754">
     12  <!ENTITY qt5-qtdeclarative-md5      "7a811f6ee3b05320d5ae6fffbadc8136">
     13  <!ENTITY qt5-qtquickcontrols2-md5   "5e4b1b8145a738a36d6f14d2d6cb32ec">
     14  <!ENTITY qt5-qtgraphicaleffects-md5 "0f528e3c1bf0e81befb7c1037c2200de">
     15  <!ENTITY qt5-qtxmlpatterns-md5      "438c2f84b44ee681e13e2ebe13360338">
     16  <!ENTITY qt5-download-http          "&qt5-url;/">
     17  <!ENTITY qt5-download-ftp           " ">
     18  <!ENTITY qt5-md5sum                 "See below">
     19  <!ENTITY qt5-size                   "11 MB for basic modules, 59 MB for qtwebengine,">
     20  <!ENTITY qt5-buildsize              "930 MB (23 MB installed) for basic modules">
     21  <!ENTITY qt5-time                   "Using parallelism=4: 3.4 SBU for basic modules">
    1422]>
    1523
    … …  
    197205<screen><userinput>cat &gt; qt5-submodules-&qt5-version;.md5 &lt;&lt; "EOF"
    198206<literal># Begin basic group
    199 739403634e1326a3d52902a835015a4b  qttools-everywhere-src-5.15.2.tar.xz
    200 c0f5c1c2cc1b66e56ce4ef13a2b7093a  qtsvg-everywhere-src-5.15.2.tar.xz
    201 92cf72015788bb4dcab14494f2835b32  qtx11extras-everywhere-src-5.15.2.tar.xz
    202 26577fbbe0d011b7034bca3c64bc38ae  qtwayland-everywhere-src-5.15.2.tar.xz
     207&qt5-qttools-md5;  qttools-everywhere-opensource-src-&qt5-version;.tar.xz
     208&qt5-qtsvg-md5;  qtsvg-everywhere-opensource-src-&qt5-version;.tar.xz
     209&qt5-qtx11extras-md5;  qtx11extras-everywhere-opensource-src-&qt5-version;.tar.xz
     210&qt5-qtwayland-md5;  qtwayland-everywhere-opensource-src-&qt5-version;.tar.xz
    203211# End basic group
    204212# Begin KDE group
    205 db3c185d6f13fc60828f8f9f20e092c4  qtdeclarative-everywhere-src-5.15.2.tar.xz
    206 2abc5e7b8e6b4a80d7533daad37749e9  qtquickcontrols2-everywhere-src-5.15.2.tar.xz
    207 2ae1ef858425aa71d62b15467a84b022  qtgraphicaleffects-everywhere-src-5.15.2.tar.xz
    208 ef96631d72399cfa495f223ef21bb039  qtxmlpatterns-everywhere-src-5.15.2.tar.xz
     213&qt5-qtdeclarative-md5;  qtdeclarative-everywhere-opensource-src-&qt5-version;.tar.xz
     214&qt5-qtquickcontrols2-md5;  qtquickcontrols2-everywhere-opensource-src-&qt5-version;.tar.xz
     215&qt5-qtgraphicaleffects-md5;  qtgraphicaleffects-everywhere-opensource-src-&qt5-version;.tar.xz
     216&qt5-qtxmlpatterns-md5;  qtxmlpatterns-everywhere-opensource-src-&qt5-version;.tar.xz
    209217# TODO
    210218# End KDE group
    211219# Begin qtwebengine
    212 c88cbe3158feb20c4feb3d54262feb23  qtwebengine-everywhere-src-5.15.2.tar.xz
     220c88cbe3158feb20c4feb3d54262feb23  qtwebengine-everywhere-opensource-src-5.15.2.tar.xz
    213221# End qtwebengine
    214222# Begin optional group
    … …  
    253261      make
    254262      as_root make install
    255       if type -p post_install; then post_install; fi
    256263    popd
    257264
    … …  
    287294sed -n "/Begin basic/,/End basic/p" qt5-submodules-&qt5-version;.md5 | \
    288295                while read MD5_ENTRY; do
    289   if [ -z "${MD5_ENTRY%\#*}" ]; then continue; fi
    290   case "$MD5_ENTRY" in
    291     *qttools*)
    292       post_install(){
    293         QT5BINDIR=$QT5DIR/bin
    294 
    295         as_root sh &lt;&lt; ROOT_EOF
    296         install -v -dm755 /usr/share/pixmaps/
    297 
    298         install -v -Dm644 src/assistant/assistant/images/assistant-128.png \
    299                   /usr/share/pixmaps/assistant-qt5.png
    300 
    301         install -v -Dm644 src/designer/src/designer/images/designer.png \
    302                   /usr/share/pixmaps/designer-qt5.png
    303 
    304         install -v -Dm644 src/linguist/linguist/images/icons/linguist-128-32.png \
    305                   /usr/share/pixmaps/linguist-qt5.png
    306 
    307         install -v -Dm644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
    308                   /usr/share/pixmaps/qdbusviewer-qt5.png
    309 
    310         install -dm755 /usr/share/applications
    311 
    312         cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
    313 [Desktop Entry]
     296  if [ -n "${MD5_ENTRY%\#*}" ]; then module_build; fi
     297done
     298)</userinput></screen>
     299
     300    <para>
     301      Create desktop menu entries pointing to some tools from the
     302      Qt system. As the &root; user:
     303    </para>
     304
     305    <screen role="root"><userinput>QT5BINDIR=$QT5DIR/bin
     306install -v -dm755 /usr/share/pixmaps/
     307
     308install -v -Dm644 src/assistant/assistant/images/assistant-128.png \
     309          /usr/share/pixmaps/assistant-qt5.png
     310
     311install -v -Dm644 src/designer/src/designer/images/designer.png \
     312          /usr/share/pixmaps/designer-qt5.png
     313
     314install -v -Dm644 src/linguist/linguist/images/icons/linguist-128-32.png \
     315          /usr/share/pixmaps/linguist-qt5.png
     316
     317install -v -Dm644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
     318          /usr/share/pixmaps/qdbusviewer-qt5.png
     319
     320install -dm755 /usr/share/applications
     321
     322cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
     323<literal>[Desktop Entry]
    314324Name=Qt5 Assistant
    315325Comment=Shows Qt5 documentation and examples
    … …  
    319329Encoding=UTF-8
    320330Type=Application
    321 Categories=Qt;Development;Documentation;
     331Categories=Qt;Development;Documentation;</literal>
    322332EOF
    323333
    324         cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
    325 [Desktop Entry]
     334cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
     335<literal>[Desktop Entry]
    326336Name=Qt5 Designer
    327337GenericName=Interface Designer
    … …  
    333343Encoding=UTF-8
    334344Type=Application
    335 Categories=Qt;Development;
     345Categories=Qt;Development;</literal>
    336346EOF
    337347
    338         cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
    339 [Desktop Entry]
     348cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
     349<literal>[Desktop Entry]
    340350Name=Qt5 Linguist
    341351Comment=Add translations to Qt5 applications
    … …  
    346356Encoding=UTF-8
    347357Type=Application
    348 Categories=Qt;Development;
     358Categories=Qt;Development;</literal>
    349359EOF
    350360
    351         cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
    352 [Desktop Entry]
     361cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
     362<literal>[Desktop Entry]
    353363Name=Qt5 QDbusViewer
    354364GenericName=D-Bus Debugger
    … …  
    359369Encoding=UTF-8
    360370Type=Application
    361 Categories=Qt;Development;Debugger;
    362 EOF
    363 ROOT_EOF
    364       }
    365       export -f post_install ;;
    366 
    367     *) unset -f post_install ;;
    368   esac
    369 
    370   module_build
    371 
    372 done
    373 #     Some packages such as vlc look for certain
    374 #     executables with a -qt5 suffix:
    375 for file in lconvert lrelease lupdate; do
    376   as_root ln -sfrvn $QT5DIR/bin/$file /usr/bin/$file-qt5
    377 done
    378 
    379 )</userinput></screen>
     371Categories=Qt;Development;Debugger;</literal>
     372EOF</userinput></screen>
     373
     374    <para>
     375      Some packages such as vlc look for certain
     376      executables with a -qt5 suffix. Still as the &root; user:
     377    </para>
     378
     379<screen role="root"><userinput>for file in lconvert lrelease lupdate; do
     380  ln -sfrvn $QT5DIR/bin/$file /usr/bin/$file-qt5
     381done</userinput></screen>
    380382
    381383    <sect3 role="content">
    … …  
    658660      Install the modules needed for KDE with the following instructions:
    659661    </para>
     662
     663<screen><userinput>( # start a subshell
     664set -e # exit the subshell in case of error
     665
     666sed -n "/Begin KDE/,/End KDE/p" qt5-submodules-&qt5-version;.md5 | \
     667                while read MD5_ENTRY; do
     668  if [ -z "${MD5_ENTRY%\#*}" ]; then continue; fi
     669  case $MD5_ENTRY in
     670     TODO) OPTIONS=
     671  esac
     672done
     673)</userinput></screen>
     674
    660675  </sect2>
    661676
Note: See TracChangeset for help on using the changeset viewer.