summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-19 10:31:46 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-19 12:17:58 +0100
commit559339f437bb710afd89268109436bf6cab2d65e (patch)
tree5fa8b0bc7fac69ecb0617e0468c296267e4eddb9 /dev-qt/qtquickcontrols
parentkde-frameworks/plasma: Drop 5.56.1-r1 (diff)
downloadgentoo-559339f437bb710afd89268109436bf6cab2d65e.tar.gz
gentoo-559339f437bb710afd89268109436bf6cab2d65e.tar.bz2
gentoo-559339f437bb710afd89268109436bf6cab2d65e.zip
dev-qt: Drop Qt 5.12.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'dev-qt/qtquickcontrols')
-rw-r--r--dev-qt/qtquickcontrols/Manifest1
-rw-r--r--dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch34
-rw-r--r--dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild34
3 files changed, 0 insertions, 69 deletions
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index d07da7da7d4..60804da93df 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,3 +1,2 @@
DIST qtquickcontrols-everywhere-src-5.11.3.tar.xz 6053336 BLAKE2B 304fbc5e0028f49662dd077349a28ef974470aa4e4389d633a409b6a756c24a730a675b774429246e1923fa1ff3f6b33b8cea75e588c58c55232519c4af45500 SHA512 359a2509e35240b50dea06e7197ce974a92a7f4fe902b7f6c40b087945eaa8faa0395d3d35a6c79c3a5bc75fadc75688d36338086ac67bf2ab8be795a60905b7
-DIST qtquickcontrols-everywhere-src-5.12.1.tar.xz 6055248 BLAKE2B 572b497a6694da3110dde2a3088afd442959a1cd109836366968c95e9748c416b85c986d6fb74a8316641e20dbe86178f0a24d20a826496eb707407bb4767949 SHA512 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623
DIST qtquickcontrols-everywhere-src-5.12.2.tar.xz 6054972 BLAKE2B 923583d954296c0ecf5c29d0b8aafe183542a40c03b4ff1f2b3c02da38ef020da7666c17e57f1c246a8d17331ed181fbed7c658d64abb04cdebd25e8c1eee48d SHA512 4ff3da74039de6106106f50752943765dd89f7ed0ecc15b95af1ca66bdce104f0a34aac6a870ee38bbaed0447449b73fbfd360d019f9e41d14af96d691ec8149
diff --git a/dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch b/dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch
deleted file mode 100644
index b58f26ac53c..00000000000
--- a/dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c231395eec3494619f4977b4c5cd845b9d7341ae Mon Sep 17 00:00:00 2001
-From: Benjamin Robin <dev@benjarobin.fr>
-Date: Sun, 24 Feb 2019 10:28:14 +0100
-Subject: [PATCH] ScrollViewStyle: Avoid division by zero in extent computation
-
-If the flickableItem content is empty (contentWidth / contentHeight is
-equal to 0), prevent the division by zero in the computation of the
-extent variable.
-
-Task-number: QTBUG-73691
-Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d
-Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
----
- src/controls/Styles/Base/ScrollViewStyle.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
-index 6750399d4..36b518d39 100644
---- a/src/controls/Styles/Base/ScrollViewStyle.qml
-+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
-@@ -370,8 +370,8 @@ Style {
-
- property var flickableItem: control.flickableItem
- property int extent: Math.max(minimumHandleLength, __styleData.horizontal ?
-- Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width :
-- Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height)
-+ Math.min(1, ((flickableItem && flickableItem.contentWidth > 0.0) ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width :
-+ Math.min(1, ((flickableItem && flickableItem.contentHeight > 0.0) ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height)
- readonly property real range: __control.maximumValue - __control.minimumValue
- readonly property real begin: __control.value - __control.minimumValue
-
---
-2.16.3
-
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild
deleted file mode 100644
index a2971f97dd8..00000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-scrollviewstyle-div-by-zero.patch" )
-
-src_prepare() {
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/controls/Private/private.pri \
- tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
- tests/auto/controls/controls.pro \
- tests/auto/testplugin/testplugin.pro
-
- qt5-build_src_prepare
-}