Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb6666a0fece3fb243e586b129527b0dfff29380
commit fb6666a0fece3fb243e586b129527b0dfff29380 Author: Marius Cirsta <[email protected]> Date: Thu Mar 17 01:14:10 2016 +0200 qt5-webchannel-5.6.0-1-x86_64 * version bump diff --git a/source/xlib-extra/qt5-webchannel/FrugalBuild b/source/xlib-extra/qt5-webchannel/FrugalBuild index 213e3c1..218fb8e 100644 --- a/source/xlib-extra/qt5-webchannel/FrugalBuild +++ b/source/xlib-extra/qt5-webchannel/FrugalBuild @@ -2,23 +2,14 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=qt5-webchannel -pkgrel=4 +pkgrel=1 depends=('qt5-declarative') Finclude qt5 -source=(${source[@]} add_declarative.patch) replaces=('libqt5webchannel') conflicts=("${replaces[@]}") provides=("${replaces[@]}") -sha1sums=('37f2cdf7d289b2d48d3f35d4181908acd8f353eb' \ - 'd5a76d39ad95dc666435c319c37070955ce04eec') +sha1sums=('24067408ce1ec087a21e2e7248c2f4f21b7fb474') -build() -{ - Fpatchall - build_qt5 - Frm /usr/lib/qt5/bin/qdbuscpp2xml - Frm /usr/bin/qdbuscpp2xml-qt5 -} -# optimization OK +# optimization OK diff --git a/source/xlib-extra/qt5-webchannel/add_declarative.patch b/source/xlib-extra/qt5-webchannel/add_declarative.patch deleted file mode 100644 index 62d52dc..0000000 --- a/source/xlib-extra/qt5-webchannel/add_declarative.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9af0d51b25b136a1495e14b609190cd6f67d7697 Mon Sep 17 00:00:00 2001 -From: Andy Shaw <[email protected]> -Date: Wed, 23 Sep 2015 06:52:01 +0000 -Subject: [PATCH] Compile when QML is disabled - -Since QJSValue is part of the QML module then it should check if that is -available before using it so we add a QT_NO_JSVALUE define to help with -this. - -Task-number: QTBUG-46850 -Change-Id: I1974518a5c134dbb8508a46505b43c820a7a700a ---- - src/webchannel/qmetaobjectpublisher.cpp | 4 ++++ - src/webchannel/webchannel.pro | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp -index 0cad569..22df02b 100644 ---- a/src/webchannel/qmetaobjectpublisher.cpp -+++ b/src/webchannel/qmetaobjectpublisher.cpp -@@ -41,7 +41,9 @@ - #include <QDebug> - #include <QJsonObject> - #include <QJsonArray> -+#ifndef QT_NO_JSVALUE - #include <QJSValue> -+#endif - #include <QUuid> - - QT_BEGIN_NAMESPACE -@@ -486,12 +488,14 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA - if (!classInfo.isEmpty()) - objectInfo[KEY_DATA] = classInfo; - return objectInfo; -+#ifndef QT_NO_JSVALUE - } else if (result.canConvert<QJSValue>()) { - // Workaround for keeping QJSValues from QVariant. - // Calling QJSValue::toVariant() converts JS-objects/arrays to QVariantMap/List - // instead of stashing a QJSValue itself into a variant. - // TODO: Improve QJSValue-QJsonValue conversion in Qt. - return wrapResult(result.value<QJSValue>().toVariant(), transport, parentObjectId); -+#endif - } else if (result.canConvert<QVariantList>()) { - // recurse and potentially wrap contents of the array - return wrapList(result.toList(), transport); -diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro -index eba8123..931ee03 100644 ---- a/src/webchannel/webchannel.pro -+++ b/src/webchannel/webchannel.pro -@@ -39,6 +39,8 @@ qtHaveModule(qml) { - - PRIVATE_HEADERS += \ - qqmlwebchannelattached_p.h -+} else { -+ DEFINES += QT_NO_JSVALUE - } - - HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS --- -2.6.2.2.g1b5ffa3 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
