From 2ef83c43456d4812e8a94255cca1ff1bbf32fff6 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 4 Dec 2016 04:52:43 +0100 Subject: dev-qt: remove Qt 5.5.1 Package-Manager: portage-2.3.2 --- dev-qt/qtwebchannel/Manifest | 1 - ...qtwebchannel-5.5.1-optional-qtdeclarative.patch | 62 ---------------------- dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild | 29 ---------- 3 files changed, 92 deletions(-) delete mode 100644 dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch delete mode 100644 dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild (limited to 'dev-qt/qtwebchannel') diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index 7796c9b22775..260287d72671 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -1,4 +1,3 @@ -DIST qtwebchannel-opensource-src-5.5.1.tar.xz 96684 SHA256 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0 SHA512 018b36b150adb18ac681e76cf52c120e1873c10ac937a311397025e556b74800db3b7d472d2373ddeaa2f9527beeac5c1ca6f57a808aa3f5c19a558cdb2ac699 WHIRLPOOL 97ae4334148d02f7ee49194dfbfc21d05e07f8f9c0568bacc7e5785d657377a456427730b78a2135e33a518d3423ecfb0f4f36007e10b09f7308458ca6be2252 DIST qtwebchannel-opensource-src-5.6.1-1.tar.xz 98164 SHA256 878ab614b30bbf04ef3775af68acd47de9765973650c1db403464e79efd07e82 SHA512 ee384a1d083e29264a55757f706d139a1e4868765a48a2f98660df5d46c01e59d10d1e78c3fb33969b125ac7af78bbe52ef5cf8421577d2517cba9c1336ec56d WHIRLPOOL d3a853d995ffd4b84968e95a3e252af8735c82ace1b460003ea481efa24fb41cb27105cf080795fd527bb51777d8683949b93450c95f09a5c47e10af6a1dec94 DIST qtwebchannel-opensource-src-5.6.2.tar.xz 119792 SHA256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 SHA512 76963aea9a287b360110086ffa146f0b93eac963e6a4adcd6ff6fec83fc5416aee1e374d50a4a47dd86edf25eb486f6f8ef23becdba46d891f5484ec5f336de4 WHIRLPOOL 62076abdec83d872abde159b923ab0a403ac659346824b0e7637cc2c6400fca8a97f1652df25faf0b08ce4cd89e801a5e2fdfda67c3555cdb04e44fbf8262b09 DIST qtwebchannel-opensource-src-5.7.0.tar.xz 119876 SHA256 3ab4cd177cc742ee5015f2b7f943c16ce13380b840f824436b5005485b749816 SHA512 e5b772366d5b4eeedc5b43d7034eedbeced9ced93c38dea92c419a93472ebe7f3e1743bd0c90e73e07c4d0b7e4e257b71fa9debcfa86abee379c1935fac51b64 WHIRLPOOL 1ae0feca61f417f4abdfef9450d182d2ed9e1793c1c0cdc50d1eea3b003441adfe9f69d60c198f5d0d93c1d629a0c6fe1143d90072b9fba8fc73ef38f6a36ede diff --git a/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch b/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch deleted file mode 100644 index e7011ad90a1c..000000000000 --- a/dev-qt/qtwebchannel/files/qtwebchannel-5.5.1-optional-qtdeclarative.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 906d910415454d64ff0b021b06f0df422a8c82bd Mon Sep 17 00:00:00 2001 -From: Andy Shaw -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 -Reviewed-by: Liang Qi ---- - 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 - #include - #include -+#ifndef QT_NO_JSVALUE - #include -+#endif - #include - - 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()) { - // 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().toVariant(), transport, parentObjectId); -+#endif - } else if (result.canConvert()) { - // 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.4.10 - diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild deleted file mode 100644 index e0268b4c1e56..000000000000 --- a/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit qt5-build - -DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ppc64 x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV} - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-optional-qtdeclarative.patch" ) - -src_prepare() { - qt_use_disable_mod qml quick src/src.pro - qt_use_disable_mod qml qml src/webchannel/webchannel.pro - - qt5-build_src_prepare -} -- cgit v1.2.3-65-gdbad