From owner-svn-ports-head@freebsd.org Mon Feb 25 20:04:07 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E46E71514B85; Mon, 25 Feb 2019 20:04:06 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 596C477A66; Mon, 25 Feb 2019 20:04:06 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31A7821E69; Mon, 25 Feb 2019 20:04:06 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1PK4530073441; Mon, 25 Feb 2019 20:04:05 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1PK45S9073439; Mon, 25 Feb 2019 20:04:05 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201902252004.x1PK45S9073439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 25 Feb 2019 20:04:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493895 - in head/x11-toolkits/qt5-quickcontrols: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/x11-toolkits/qt5-quickcontrols: . files X-SVN-Commit-Revision: 493895 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 596C477A66 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2019 20:04:07 -0000 Author: tcberner Date: Mon Feb 25 20:04:05 2019 New Revision: 493895 URL: https://svnweb.freebsd.org/changeset/ports/493895 Log: x11-toolkits/qt5-quickcontrols: fix regression in 5.12.1 https://bugreports.qt.io/browse/QTBUG-73691 Added: head/x11-toolkits/qt5-quickcontrols/files/ head/x11-toolkits/qt5-quickcontrols/files/patch-git_c23139 (contents, props changed) Modified: head/x11-toolkits/qt5-quickcontrols/Makefile Modified: head/x11-toolkits/qt5-quickcontrols/Makefile ============================================================================== --- head/x11-toolkits/qt5-quickcontrols/Makefile Mon Feb 25 19:56:33 2019 (r493894) +++ head/x11-toolkits/qt5-quickcontrols/Makefile Mon Feb 25 20:04:05 2019 (r493895) @@ -2,6 +2,7 @@ PORTNAME= quickcontrols DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- Added: head/x11-toolkits/qt5-quickcontrols/files/patch-git_c23139 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/qt5-quickcontrols/files/patch-git_c23139 Mon Feb 25 20:04:05 2019 (r493895) @@ -0,0 +1,32 @@ +From c231395eec3494619f4977b4c5cd845b9d7341ae Mon Sep 17 00:00:00 2001 +From: Benjamin Robin +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 +--- + src/controls/Styles/Base/ScrollViewStyle.qml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git src/controls/Styles/Base/ScrollViewStyle.qml src/controls/Styles/Base/ScrollViewStyle.qml +index 6750399d..36b518d3 100644 +--- src/controls/Styles/Base/ScrollViewStyle.qml ++++ 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 + +--