qt5: Create a qt5-doc package and various fixes
Closes #1520 - Append -qt5 instead of prepending qt5- for assistant, designer, linguist, qdbusviewer - Cosmetics: Use a sub packages description style where the first letter is always uppercase
This commit is contained in:
jbu
Juan RP
parent
5f94535a96
commit
b9326bac16
7 changed files with 85 additions and 42 deletions
|
|
@ -1821,6 +1821,7 @@ libQt5WebKitWidgets.so.5 qt5-webkit-5.3.2_1
|
|||
libQt5WebKit.so.5 qt5-webkit-5.3.2_1
|
||||
libQt5Sensors.so.5 qt5-sensors-5.3.2_1
|
||||
libQt5Positioning.so.5 qt5-location-5.3.2_1
|
||||
libQt5Location.so.5 qt5-location-5.4.1_4
|
||||
libQt5Bluetooth.so.5 qt5-connectivity-5.3.2_1
|
||||
libQt5Nfc.so.5 qt5-connectivity-5.3.2_1
|
||||
libQt5QuickParticles.so.5 qt5-declarative-5.3.2_1
|
||||
|
|
|
|||
1
srcpkgs/qt5-doc
Symbolic link
1
srcpkgs/qt5-doc
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
qt5
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
[Desktop Entry]
|
||||
Name=Qt5 Assistant
|
||||
Comment=Shows Qt5 documentation and examples
|
||||
Exec=/usr/bin/qt5-assistant
|
||||
Icon=qt5-assistant
|
||||
Exec=/usr/bin/assistant-qt5
|
||||
Icon=assistant-qt5
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Qt;Development;Documentation;
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
Name=Qt5 Designer
|
||||
GenericName=Interface Designer
|
||||
Comment=Design GUIs for Qt5 applications
|
||||
Exec=/usr/bin/qt5-designer
|
||||
Icon=qt5-designer
|
||||
Exec=/usr/bin/designer-qt5
|
||||
Icon=designer-qt5
|
||||
MimeType=application/x-designer;
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
[Desktop Entry]
|
||||
Name=Qt5 Linguist
|
||||
Comment=Add translations to Qt5 applications
|
||||
Exec=/usr/bin/qt5-linguist
|
||||
Icon=qt5-linguist
|
||||
Exec=/usr/bin/linguist-qt5
|
||||
Icon=linguist-qt5
|
||||
MimeType=text/vnd.trolltech.linguist;application/x-linguist;
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
Name=Qt5 QDbusViewer
|
||||
GenericName=D-Bus Debugger
|
||||
Comment=Debug D-Bus applications
|
||||
Exec=/usr/bin/qt5-qdbusviewer
|
||||
Icon=qt5-qdbusviewer
|
||||
Exec=/usr/bin/qdbusviewer-qt5
|
||||
Icon=qdbusviewer-qt5
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Qt;Development;Debugger;
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
#!/bin/bash
|
||||
# Template file for 'qt5'
|
||||
pkgname=qt5
|
||||
version=5.4.1
|
||||
revision=3
|
||||
revision=4
|
||||
wrksrc="qt-everywhere-opensource-src-${version}"
|
||||
homepage="http://qt-project.com/"
|
||||
homepage="http://qt.io/"
|
||||
short_desc="A cross-platform application and UI framework (QT5)"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL-3, LGPL-2.1"
|
||||
distfiles="http://download.qt-project.org/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz"
|
||||
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz"
|
||||
checksum=1b7eb91e153176ac917f72b6bf443f987abf47c4208cdd43e2307684a7fad860
|
||||
|
||||
nocross=yes
|
||||
|
|
@ -42,7 +43,7 @@ do_configure() {
|
|||
-archdatadir /usr/lib/qt5 -nomake examples \
|
||||
-accessibility -fontconfig -icu -openssl-linked -no-pch -no-strip \
|
||||
-system-libjpeg -system-libpng -system-sqlite -system-zlib \
|
||||
-system-harfbuzz -dbus-linked -optimized-qmake -reduce-relocations
|
||||
-system-harfbuzz -dbus-linked -silent -optimized-qmake -reduce-relocations
|
||||
}
|
||||
do_build() {
|
||||
export LD_LIBRARY_PATH="${wrksrc}/qtbase/lib:${wrksrc}/qttools/lib:${LD_LIBRARY_PATH}"
|
||||
|
|
@ -55,7 +56,6 @@ do_install() {
|
|||
cd qtbase
|
||||
make INSTALL_ROOT=${DESTDIR} install
|
||||
vlicense LGPL_EXCEPTION.txt
|
||||
rm -r ${DESTDIR}/usr/share/doc
|
||||
vmkdir usr/bin
|
||||
for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do
|
||||
ln -s /usr/lib/qt5/bin/$(basename $f) ${DESTDIR}/usr/bin/$(basename $f)-qt5
|
||||
|
|
@ -63,7 +63,7 @@ do_install() {
|
|||
}
|
||||
|
||||
qt5-connectivity-devel_package() {
|
||||
short_desc+=" - connectivity component (development)"
|
||||
short_desc+=" - Connectivity component (development)"
|
||||
depends="qt5-connectivity-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtconnectivity
|
||||
|
|
@ -73,7 +73,7 @@ qt5-connectivity-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-connectivity_package() {
|
||||
short_desc+=" - connectivity component"
|
||||
short_desc+=" - Connectivity component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtconnectivity
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -87,7 +87,7 @@ qt5-connectivity_package() {
|
|||
}
|
||||
}
|
||||
qt5-declarative-devel_package() {
|
||||
short_desc+=" - declarative component (development)"
|
||||
short_desc+=" - Declarative component (development)"
|
||||
depends="qt5-declarative-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtdeclarative
|
||||
|
|
@ -99,7 +99,7 @@ qt5-declarative-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-declarative_package() {
|
||||
short_desc+=" - declarative component"
|
||||
short_desc+=" - Declarative component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtdeclarative
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -116,8 +116,49 @@ qt5-declarative_package() {
|
|||
done
|
||||
}
|
||||
}
|
||||
qt5-doc_package() {
|
||||
short_desc+=" - Documentation"
|
||||
# This requires qdoc from qtbase and qhelpgenerator from qttools
|
||||
depends="qt5-${version}_${revision} qt5-tools-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd $wrksrc
|
||||
vmove usr/share/doc
|
||||
# Original (installed) binaries directory
|
||||
local qtbin=/usr/lib/qt5/bin
|
||||
# Temporary binaries directory
|
||||
local tmpbin=$wrksrc/docbuild/bin
|
||||
local tmplib=$wrksrc/docbuild/lib
|
||||
local plugins=$wrksrc/qtbase/plugins
|
||||
mkdir -p $tmpbin/platforms $tmpbin/sqldrivers $tmplib
|
||||
# Install qdoc binary
|
||||
install $wrksrc/qtbase/bin/qdoc $tmpbin/
|
||||
# Install qhelpgenerator binary
|
||||
install $wrksrc/qttools/bin/qhelpgenerator $tmpbin/
|
||||
# Install required plugins below $tmpbin
|
||||
install $plugins/platforms/libqminimal.so $tmpbin/platforms/
|
||||
install $plugins/sqldrivers/libqsqlite.so $tmpbin/sqldrivers/
|
||||
# Install required libraries
|
||||
install $wrksrc/qtbase/lib/*.so* $tmplib
|
||||
install $wrksrc/qttools/lib/*.so* $tmplib
|
||||
# Patch Makefiles to refer to $tmpbin/{qdoc,qhelpgenerator}
|
||||
for m in $(find . -iname "Makefile*" -type f | grep -v "\.orig$"); do
|
||||
mv $m $m.orig
|
||||
sed $m.orig \
|
||||
-e "s;$qtbin/qdoc;$tmpbin/qdoc;g" \
|
||||
-e "s;$qtbin/qhelpgenerator;$tmpbin/qhelpgenerator;g" \
|
||||
> $m
|
||||
done
|
||||
export LD_LIBRARY_PATH="$tmplib:$LD_LIBRARY_PATH"
|
||||
make ${makejobs} docs
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install_docs
|
||||
# Restore original Makefiles just in case...
|
||||
for m in $(find . -iname "Makefile*.orig" -type f); do
|
||||
mv $m ${m%.orig}
|
||||
done
|
||||
}
|
||||
}
|
||||
qt5-enginio-devel_package() {
|
||||
short_desc+=" - enginio component (development)"
|
||||
short_desc+=" - Enginio component (development)"
|
||||
depends="qt5-enginio-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtenginio
|
||||
|
|
@ -127,7 +168,7 @@ qt5-enginio-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-enginio_package() {
|
||||
short_desc+=" - enginio component"
|
||||
short_desc+=" - Enginio component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtenginio
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -140,7 +181,7 @@ qt5-enginio_package() {
|
|||
}
|
||||
}
|
||||
qt5-graphicaleffects_package() {
|
||||
short_desc+=" - graphicaleffects component"
|
||||
short_desc+=" - Graphicaleffects component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtgraphicaleffects
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -154,7 +195,7 @@ qt5-imageformats_package() {
|
|||
}
|
||||
}
|
||||
qt5-location-devel_package() {
|
||||
short_desc+=" - location component (development)"
|
||||
short_desc+=" - Location component (development)"
|
||||
depends="qt5-location-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtlocation
|
||||
|
|
@ -165,7 +206,7 @@ qt5-location-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-location_package() {
|
||||
short_desc+=" - location component"
|
||||
short_desc+=" - Location component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtlocation
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -178,7 +219,7 @@ qt5-location_package() {
|
|||
}
|
||||
}
|
||||
qt5-multimedia-devel_package() {
|
||||
short_desc+=" - multimedia component (development)"
|
||||
short_desc+=" - Multimedia component (development)"
|
||||
depends="qt5-multimedia-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtmultimedia
|
||||
|
|
@ -189,7 +230,7 @@ qt5-multimedia-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-multimedia_package() {
|
||||
short_desc+=" - multimedia component"
|
||||
short_desc+=" - Multimedia component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtmultimedia
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -262,7 +303,7 @@ qt5-script_package() {
|
|||
}
|
||||
}
|
||||
qt5-sensors-devel_package() {
|
||||
short_desc+=" - sensors component (development)"
|
||||
short_desc+=" - Sensors component (development)"
|
||||
depends="qt5-sensors-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtsensors
|
||||
|
|
@ -273,7 +314,7 @@ qt5-sensors-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-sensors_package() {
|
||||
short_desc+=" - sensors component"
|
||||
short_desc+=" - Sensors component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtsensors
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -286,7 +327,7 @@ qt5-sensors_package() {
|
|||
}
|
||||
}
|
||||
qt5-serialport-devel_package() {
|
||||
short_desc+=" - serialport component (development)"
|
||||
short_desc+=" - Serialport component (development)"
|
||||
depends="qt5-serialport-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtserialport
|
||||
|
|
@ -295,7 +336,7 @@ qt5-serialport-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-serialport_package() {
|
||||
short_desc+=" - serialport component"
|
||||
short_desc+=" - Serialport component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtserialport
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -308,7 +349,7 @@ qt5-serialport_package() {
|
|||
}
|
||||
}
|
||||
qt5-svg-devel_package() {
|
||||
short_desc+=" - svg component (development)"
|
||||
short_desc+=" - Svg component (development)"
|
||||
depends="qt5-svg-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtsvg
|
||||
|
|
@ -318,7 +359,7 @@ qt5-svg-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-svg_package() {
|
||||
short_desc+=" - svg component"
|
||||
short_desc+=" - Svg component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtsvg
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -428,7 +469,7 @@ qt5-webkit_package() {
|
|||
}
|
||||
}
|
||||
qt5-websockets-devel_package() {
|
||||
short_desc+=" - websockets component (development)"
|
||||
short_desc+=" - Websockets component (development)"
|
||||
depends="qt5-websockets-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtwebsockets
|
||||
|
|
@ -438,7 +479,7 @@ qt5-websockets-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-websockets_package() {
|
||||
short_desc+=" - websockets component"
|
||||
short_desc+=" - Websockets component"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qtwebsockets
|
||||
make INSTALL_ROOT=${PKGDESTDIR} install
|
||||
|
|
@ -507,7 +548,7 @@ qt5-translations_package() {
|
|||
}
|
||||
}
|
||||
qt5-tools-devel_package() {
|
||||
short_desc+=" - development tools (development)"
|
||||
short_desc+=" - Development tools (development)"
|
||||
depends="qt5-tools-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qttools
|
||||
|
|
@ -519,7 +560,7 @@ qt5-tools-devel_package() {
|
|||
}
|
||||
}
|
||||
qt5-tools_package() {
|
||||
short_desc+=" - development tools"
|
||||
short_desc+=" - Development tools"
|
||||
depends="qt5-translations desktop-file-utils hicolor-icon-theme"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}/qttools
|
||||
|
|
@ -535,18 +576,18 @@ qt5-tools_package() {
|
|||
for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
|
||||
size=$(echo $(basename ${icon}) | cut -d- -f2)
|
||||
install -p -D -m644 ${icon} \
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/qt5-linguist.png
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt5.png
|
||||
done
|
||||
install -Dm644 src/assistant/assistant/images/assistant.png \
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/32x32/apps/qt5-assistant.png
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/32x32/apps/assistant-qt5.png
|
||||
install -Dm644 src/assistant/assistant/images/assistant-128.png \
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/128x128/apps/qt5-assistant.png
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/128x128/apps/assistant-qt5.png
|
||||
install -Dm644 src/designer/src/designer/images/designer.png \
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/128x128/apps/qt5-designer.png
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/128x128/apps/designer-qt5.png
|
||||
install -Dm644 src/qdbus/qdbusviewer/images/qdbusviewer.png \
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/32x32/apps/qt5-qdbusviewer.png
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt5.png
|
||||
install -Dm644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/128x128/apps/qt5-qdbusviewer.png
|
||||
${PKGDESTDIR}/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
|
||||
# install desktop files
|
||||
vmkdir usr/share/applications
|
||||
install -m644 ${FILESDIR}/*.desktop ${PKGDESTDIR}/usr/share/applications
|
||||
|
|
@ -562,7 +603,7 @@ qt5-devel_package() {
|
|||
dbus-devel icu-devel qt5-${version}_${revision}
|
||||
qt5-plugin-gtk-${version}_${revision}
|
||||
qt5-qmake-${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
short_desc+=" - Development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
|
|
@ -602,7 +643,7 @@ qt5-plugin-sqlite_package() {
|
|||
}
|
||||
}
|
||||
qt5-qmake_package() {
|
||||
short_desc+=" - qmake Makefile generator tool"
|
||||
short_desc+=" - Qmake Makefile generator tool"
|
||||
pkg_install() {
|
||||
vmove usr/lib/qt5/bin/qmake
|
||||
vmove usr/lib/qt5/mkspecs
|
||||
|
|
|
|||
Loading…
Reference in a new issue