From a1bd30bf19a0dbce8da8b5e364747ac4f252450c Mon Sep 17 00:00:00 2001 From: jbu Date: Sat, 6 Jun 2015 21:50:11 +0200 Subject: [PATCH] qt5: update to 5.4.2 - remove obsolete qtwebkit patch - don't use -reduce-relocations with musl - add qt5-examples package (uncompiled, noarch) --- srcpkgs/qt5-examples | 1 + ...kit-opensource-src-5.4.0-mutexlocker.patch | 218 ------------------ srcpkgs/qt5/template | 153 ++++++++---- 3 files changed, 115 insertions(+), 257 deletions(-) create mode 120000 srcpkgs/qt5-examples delete mode 100644 srcpkgs/qt5/patches/qtwebkit-opensource-src-5.4.0-mutexlocker.patch diff --git a/srcpkgs/qt5-examples b/srcpkgs/qt5-examples new file mode 120000 index 0000000000..75793eb666 --- /dev/null +++ b/srcpkgs/qt5-examples @@ -0,0 +1 @@ +qt5 \ No newline at end of file diff --git a/srcpkgs/qt5/patches/qtwebkit-opensource-src-5.4.0-mutexlocker.patch b/srcpkgs/qt5/patches/qtwebkit-opensource-src-5.4.0-mutexlocker.patch deleted file mode 100644 index 8354889d37..0000000000 --- a/srcpkgs/qt5/patches/qtwebkit-opensource-src-5.4.0-mutexlocker.patch +++ /dev/null @@ -1,218 +0,0 @@ ---- qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than 2015-02-17 15:22:29.921309725 +0100 -+++ qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-17 15:26:05.340557547 +0100 -@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObj - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObj - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitW - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKit - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrc - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithPar - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithPar - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIH - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(G - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMain - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAp - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMa - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(Gst - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(W - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(G - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(G - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - s_cachedResourceLoader = player->cachedResourceLoader(); - } -@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer( - mapGstBuffer(buffer); - #endif - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -921,7 +921,7 @@ void StreamingClient::handleResponseRece - - GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - // If we seeked we need 206 == PARTIAL_CONTENT - if (priv->requestedOffset && response.httpStatusCode() != 206) { -@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); - -@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinish - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasB - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cann - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 54b8f0ffb4..1e40520380 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,14 +1,14 @@ # Template file for 'qt5' pkgname=qt5 -version=5.4.1 -revision=5 +version=5.4.2 +revision=1 wrksrc="qt-everywhere-opensource-src-${version}" homepage="http://qt.io/" short_desc="A cross-platform application and UI framework (QT5)" maintainer="Juan RP " license="GPL-3, LGPL-2.1" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz" -checksum=1b7eb91e153176ac917f72b6bf443f987abf47c4208cdd43e2307684a7fad860 +checksum=8c6d070613b721452f8cffdea6bddc82ce4f32f96703e3af02abb91a59f1ea25 nocross=yes hostmakedepends="flex ruby gperf python perl pkg-config" @@ -46,17 +46,30 @@ 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 \ + local opts="-confirm-license -opensource \ + -prefix /usr \ + -bindir /usr/lib/qt5/bin \ + -datadir /usr/share/qt5 \ + -headerdir /usr/include/qt5 \ + -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 \ + -archdatadir /usr/lib/qt5 \ + -no-compile-examples -accessibility -fontconfig -icu -openssl-linked \ + -dbus-linked -no-pch -no-strip -silent -optimized-qmake \ -system-libjpeg -system-libpng -system-sqlite -system-zlib \ - -system-harfbuzz -dbus-linked -silent -optimized-qmake -reduce-relocations + -system-harfbuzz" + case "$XBPS_TARGET_MACHINE" in + *-musl) # -reduce-relocations is experimental; may cause linker errors + ;; + *) opts+=" -reduce-relocations" + ;; + esac + + ./configure ${opts} } do_build() { export LD_LIBRARY_PATH="${wrksrc}/qtbase/lib:${wrksrc}/qttools/lib:${LD_LIBRARY_PATH}" @@ -75,6 +88,19 @@ do_install() { done } +# Move examples from $PKGDESTDIR to $DESTDIR +# Subdirectories may already exist, thus copy recursively and remove source +collect_examples() { + local src=$1/usr/share/qt5/examples + local dst=$2/usr/share/qt5/examples + if [ -d $src ]; then + mkdir -p $dst + cp -pR $src/* $dst + rm -r $src + rmdir -p --ignore-fail-on-non-empty $1/usr/share/qt5 + fi +} + qt5-connectivity-devel_package() { short_desc+=" - Connectivity component (development)" depends="qt5-connectivity-${version}_${revision} qt5-devel-${version}_${revision}" @@ -83,6 +109,7 @@ qt5-connectivity-devel_package() { make INSTALL_ROOT=${PKGDESTDIR} install rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-connectivity_package() { @@ -97,6 +124,7 @@ qt5-connectivity_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-declarative-devel_package() { @@ -109,6 +137,7 @@ qt5-declarative-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-declarative_package() { @@ -127,6 +156,7 @@ qt5-declarative_package() { for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5 done + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-doc_package() { @@ -168,6 +198,7 @@ qt5-doc_package() { for m in $(find . -iname "Makefile*.orig" -type f); do mv $m ${m%.orig} done + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-enginio-devel_package() { @@ -178,6 +209,7 @@ qt5-enginio-devel_package() { make INSTALL_ROOT=${PKGDESTDIR} install rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-enginio_package() { @@ -191,6 +223,15 @@ qt5-enginio_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) + } +} +qt5-examples_package() { + noarch=yes + short_desc+=" - Examples" + depends="qt5-${version}_${revision}" + pkg_install() { + vmove usr/share/qt5/examples } } qt5-graphicaleffects_package() { @@ -198,6 +239,7 @@ qt5-graphicaleffects_package() { pkg_install() { cd ${wrksrc}/qtgraphicaleffects make INSTALL_ROOT=${PKGDESTDIR} install + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-imageformats_package() { @@ -205,6 +247,7 @@ qt5-imageformats_package() { pkg_install() { cd ${wrksrc}/qtimageformats make INSTALL_ROOT=${PKGDESTDIR} install + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-location-devel_package() { @@ -216,6 +259,7 @@ qt5-location-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-location_package() { @@ -229,6 +273,7 @@ qt5-location_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-multimedia-devel_package() { @@ -240,6 +285,7 @@ qt5-multimedia-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-multimedia_package() { @@ -253,6 +299,7 @@ qt5-multimedia_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-quick1-devel_package() { @@ -267,6 +314,7 @@ qt5-quick1-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm -r ${PKGDESTDIR}/usr/lib/qt5/imports rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-quick1_package() { @@ -284,6 +332,7 @@ qt5-quick1_package() { for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5 done + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-quickcontrols_package() { @@ -291,6 +340,7 @@ qt5-quickcontrols_package() { pkg_install() { cd ${wrksrc}/qtquickcontrols make INSTALL_ROOT=${PKGDESTDIR} install + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-script-devel_package() { @@ -300,6 +350,7 @@ qt5-script-devel_package() { cd ${wrksrc}/qtscript make INSTALL_ROOT=${PKGDESTDIR} install rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-script_package() { @@ -313,6 +364,7 @@ qt5-script_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-sensors-devel_package() { @@ -324,6 +376,7 @@ qt5-sensors-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-sensors_package() { @@ -337,6 +390,7 @@ qt5-sensors_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-serialport-devel_package() { @@ -346,6 +400,7 @@ qt5-serialport-devel_package() { cd ${wrksrc}/qtserialport make INSTALL_ROOT=${PKGDESTDIR} install rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-serialport_package() { @@ -359,6 +414,7 @@ qt5-serialport_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-svg-devel_package() { @@ -369,6 +425,7 @@ qt5-svg-devel_package() { make INSTALL_ROOT=${PKGDESTDIR} install rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-svg_package() { @@ -382,6 +439,18 @@ qt5-svg_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) + } +} +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.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-wayland_package() { @@ -396,16 +465,18 @@ qt5-wayland_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } -qt5-wayland-devel_package() { - short_desc+=" - Wayland component (development)" - depends="qt5-wayland-${version}_${revision} qt5-devel-${version}_${revision}" +qt5-webchannel-devel_package() { + short_desc+=" - Webchannel component (development)" + depends="qt5-webchannel-${version}_${revision} qt5-devel-${version}_${revision}" pkg_install() { - cd ${wrksrc}/qtwayland + cd ${wrksrc}/qtwebchannel make INSTALL_ROOT=${PKGDESTDIR} install - rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins + rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-webchannel_package() { @@ -419,29 +490,7 @@ qt5-webchannel_package() { 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 + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-webengine-devel_package() { @@ -455,6 +504,21 @@ qt5-webengine-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm -r ${PKGDESTDIR}/usr/lib/qt5/libexec rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) + } +} +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 + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-webkit-devel_package() { @@ -466,6 +530,7 @@ qt5-webkit-devel_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm -r ${PKGDESTDIR}/usr/lib/qt5/libexec rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-webkit_package() { @@ -479,6 +544,7 @@ qt5-webkit_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-websockets-devel_package() { @@ -489,6 +555,7 @@ qt5-websockets-devel_package() { make INSTALL_ROOT=${PKGDESTDIR} install rm -r ${PKGDESTDIR}/usr/lib/qt5/qml rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-websockets_package() { @@ -502,6 +569,7 @@ qt5-websockets_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-x11extras-devel_package() { @@ -511,6 +579,7 @@ qt5-x11extras-devel_package() { cd ${wrksrc}/qtx11extras make INSTALL_ROOT=${PKGDESTDIR} install rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-x11extras_package() { @@ -524,6 +593,7 @@ qt5-x11extras_package() { rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs rm ${PKGDESTDIR}/usr/lib/*.so rm ${PKGDESTDIR}/usr/lib/*.prl + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-xmlpatterns-devel_package() { @@ -534,6 +604,7 @@ qt5-xmlpatterns-devel_package() { make INSTALL_ROOT=${PKGDESTDIR} install rm -r ${PKGDESTDIR}/usr/lib/qt5/bin rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-xmlpatterns_package() { @@ -551,6 +622,7 @@ qt5-xmlpatterns_package() { for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5 done + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-translations_package() { @@ -558,6 +630,7 @@ qt5-translations_package() { pkg_install() { cd ${wrksrc}/qttranslations make INSTALL_ROOT=${PKGDESTDIR} install + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-tools-devel_package() { @@ -570,6 +643,7 @@ qt5-tools-devel_package() { rm -r ${PKGDESTDIR}/usr/share rm -r ${PKGDESTDIR}/usr/lib/qt5/plugins rm ${PKGDESTDIR}/usr/lib/*.so.* + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-tools_package() { @@ -608,6 +682,7 @@ qt5-tools_package() { for f in ${PKGDESTDIR}/usr/lib/qt5/bin/*; do ln -s /usr/lib/qt5/bin/$(basename $f) ${PKGDESTDIR}/usr/bin/$(basename $f)-qt5 done + $(collect_examples $PKGDESTDIR $DESTDIR) } } qt5-devel_package() {