From 24faf53ffac3359116f1ba03db371e29c5644c3c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 19 Jan 2015 22:04:05 +0100 Subject: [PATCH] qt5: update to 5.4.0. (close #870) --- common/shlibs | 5 ++ srcpkgs/qt5-wayland | 1 + srcpkgs/qt5-wayland-devel | 1 + srcpkgs/qt5-webchannel | 1 + srcpkgs/qt5-webchannel-devel | 1 + srcpkgs/qt5-webengine | 1 + srcpkgs/qt5-webengine-devel | 1 + srcpkgs/qt5/template | 89 ++++++++++++++++++++++++++++++++---- 8 files changed, 91 insertions(+), 9 deletions(-) create mode 120000 srcpkgs/qt5-wayland create mode 120000 srcpkgs/qt5-wayland-devel create mode 120000 srcpkgs/qt5-webchannel create mode 120000 srcpkgs/qt5-webchannel-devel create mode 120000 srcpkgs/qt5-webengine create mode 120000 srcpkgs/qt5-webengine-devel diff --git a/common/shlibs b/common/shlibs index 275948f1607..9fac4009dff 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1807,6 +1807,11 @@ libQt5DesignerComponents.so.5 qt5-tools-5.3.2_1 libQt5Help.so.5 qt5-tools-5.3.2_1 libQt5WebSockets.so.5 qt5-websockets-5.3.2_1 libQt5X11Extras.so.5 qt5-x11extras-5.3.2_1 +libQt5WebChannel.so.5 qt5-webchannel-5.4.0_1 +libQt5WebEngine.so.5 qt5-webengine-5.4.0_1 +libQt5WebEngineCore.so.5 qt5-webengine-5.4.0_1 +libQt5WebEngineWidgets.so.5 qt5-webengine-5.4.0_1 +libQt5WaylandClient.so.5 qt5-wayland-5.4.0_1 libx265.so.35 x265-1.4_1 libQt5Xdg.so.1 libqtxdg-1.0.0_1 liblxqt-qt5.so.0 liblxqt-0.8.0_1 diff --git a/srcpkgs/qt5-wayland b/srcpkgs/qt5-wayland new file mode 120000 index 00000000000..75793eb6664 --- /dev/null +++ b/srcpkgs/qt5-wayland @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5-wayland-devel b/srcpkgs/qt5-wayland-devel new file mode 120000 index 00000000000..75793eb6664 --- /dev/null +++ b/srcpkgs/qt5-wayland-devel @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5-webchannel b/srcpkgs/qt5-webchannel new file mode 120000 index 00000000000..75793eb6664 --- /dev/null +++ b/srcpkgs/qt5-webchannel @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5-webchannel-devel b/srcpkgs/qt5-webchannel-devel new file mode 120000 index 00000000000..75793eb6664 --- /dev/null +++ b/srcpkgs/qt5-webchannel-devel @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5-webengine b/srcpkgs/qt5-webengine new file mode 120000 index 00000000000..75793eb6664 --- /dev/null +++ b/srcpkgs/qt5-webengine @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5-webengine-devel b/srcpkgs/qt5-webengine-devel new file mode 120000 index 00000000000..75793eb6664 --- /dev/null +++ b/srcpkgs/qt5-webengine-devel @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index cd2ed590117..98dcddae8ca 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,14 +1,14 @@ # Template file for 'qt5' pkgname=qt5 -version=5.3.2 -revision=6 +version=5.4.0 +revision=1 wrksrc="qt-everywhere-opensource-src-${version}" homepage="http://qt-project.com/" short_desc="A cross-platform application and UI framework (QT5)" maintainer="Juan RP " 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" -checksum=7f5bf93344cb57bac374ea4a32c8eda87f1357f998f14278e717cf84d0289bf0 +checksum=b2d9df47b9fd2fcfa5ebd162e1373b7eddf4759e6ba148c4589f3d8b6628c39c nocross=yes hostmakedepends="flex ruby gperf python perl pkg-config" @@ -20,26 +20,24 @@ makedepends=" xcb-util-keysyms-devel xcb-util-image-devel xcb-util-wm-devel libSM-devel libXcomposite-devel libwebp-devel libxkbcommon-devel harfbuzz-devel gtk+-devel mtdev-devel libmysqlclient-devel postgresql-libs-devel pulseaudio-devel - gst-plugins-base1-devel libxslt-devel" + libbluetooth-devel gst-plugins-base1-devel libxslt-devel pciutils-devel + nss-devel libcap-devel libxkbcommon-devel wayland-devel" depends="qtchooser" pre_configure() { - if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - # XXX http://build.voidlinux.eu:8010/builders/i686_builder/builds/7611/steps/shell_3/logs/stdio - CXXFLAGS="${CXXFLAGS/-fstack-protector-strong/-fstack-protector}" - fi sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf - sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf } do_configure() { export LD_LIBRARY_PATH="${wrksrc}/qtbase/lib:${wrksrc}/qttools/lib:${LD_LIBRARY_PATH}" export LD="$CXX" + unset CPP AR AS RANLIB ./configure -confirm-license -opensource -bindir /usr/lib/qt5/bin \ -prefix /usr -sysconfdir /etc/xdg -plugindir /usr/lib/qt5/plugins \ -docdir /usr/share/doc/qt5 -importdir /usr/lib/qt5/imports \ -translationdir /usr/share/qt5/translations \ + -examplesdir /usr/share/qt5/examples \ -datadir /usr/share/qt5 -headerdir /usr/include/qt5 \ -archdatadir /usr/lib/qt5 -nomake examples \ -accessibility -fontconfig -icu -openssl-linked -no-pch -no-strip \ @@ -49,6 +47,7 @@ do_configure() { do_build() { export LD_LIBRARY_PATH="${wrksrc}/qtbase/lib:${wrksrc}/qttools/lib:${LD_LIBRARY_PATH}" export LD="$CXX" + unset CPP AR AS RANLIB make ${makejobs} } do_install() { @@ -318,6 +317,78 @@ qt5-svg_package() { rm ${PKGDESTDIR}/usr/lib/*.prl } } +qt5-wayland_package() { + short_desc+=" - Wayland component" + pkg_install() { + cd ${wrksrc}/qtwayland + make INSTALL_ROOT=${PKGDESTDIR} install + rm -r ${PKGDESTDIR}/usr/include + rm -r ${PKGDESTDIR}/usr/lib/cmake + rm -r ${PKGDESTDIR}/usr/lib/pkgconfig + rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs + rm ${PKGDESTDIR}/usr/lib/*.so + rm ${PKGDESTDIR}/usr/lib/*.prl + } +} +qt5-wayland-devel_package() { + short_desc+=" - Wayland component (development)" + depends="qt5-wayland-${version}_${revision} qt5-devel-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/qtwayland + make INSTALL_ROOT=${PKGDESTDIR} install + rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins + rm ${PKGDESTDIR}/usr/lib/*.so.* + } +} +qt5-webchannel_package() { + short_desc+=" - Webchannel component" + pkg_install() { + cd ${wrksrc}/qtwebchannel + make INSTALL_ROOT=${PKGDESTDIR} install + rm -r ${PKGDESTDIR}/usr/include + rm -r ${PKGDESTDIR}/usr/lib/cmake + rm -r ${PKGDESTDIR}/usr/lib/pkgconfig + rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs + rm ${PKGDESTDIR}/usr/lib/*.so + rm ${PKGDESTDIR}/usr/lib/*.prl + } +} +qt5-webchannel-devel_package() { + short_desc+=" - Webchannel component (development)" + depends="qt5-webchannel-${version}_${revision} qt5-devel-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/qtwebchannel + make INSTALL_ROOT=${PKGDESTDIR} install + rm -r ${PKGDESTDIR}/usr/lib/qt5/qml + rm ${PKGDESTDIR}/usr/lib/*.so.* + } +} +qt5-webengine_package() { + short_desc+=" - Webengine component" + pkg_install() { + cd ${wrksrc}/qtwebengine + make INSTALL_ROOT=${PKGDESTDIR} install + rm -r ${PKGDESTDIR}/usr/include + rm -r ${PKGDESTDIR}/usr/lib/cmake + rm -r ${PKGDESTDIR}/usr/lib/pkgconfig + rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs + rm ${PKGDESTDIR}/usr/lib/*.so + rm ${PKGDESTDIR}/usr/lib/*.prl + } +} +qt5-webengine-devel_package() { + short_desc+=" - Webengine component (development)" + depends="qt5-webengine-${version}_${revision} qt5-devel-${version}_${revision}" + pkg_install() { + cd ${wrksrc}/qtwebengine + make INSTALL_ROOT=${PKGDESTDIR} install + rm -r ${PKGDESTDIR}/usr/share + rm -r ${PKGDESTDIR}/usr/lib/qt5/qml + rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins + rm -r ${PKGDESTDIR}/usr/lib/qt5/libexec + rm ${PKGDESTDIR}/usr/lib/*.so.* + } +} qt5-webkit-devel_package() { short_desc+=" - WebKit2 component (development)" depends="qt5-webkit-${version}_${revision} qt5-devel-${version}_${revision}"