git » qt5-quickcontrols.git » commit 93238af

Qt 5.12.2

author Antonio Rojas
2019-03-14 12:17:30 UTC
committer Antonio Rojas
2019-03-14 12:17:30 UTC
parent 8290b8a9b7c3d5178672a38acb174073b37ddaac

Qt 5.12.2

PKGBUILD +4 -9
qtbug-73961.patch +0 -29

diff --git a/PKGBUILD b/PKGBUILD
index 6f05d0f..82fafa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qt5-quickcontrols
-_qtver=5.12.1
+_qtver=5.12.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -13,16 +13,11 @@ depends=('qt5-declarative')
 makedepends=()
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qtbug-73961.patch)
-sha256sums=('15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c'
-            '1ed9b1c0a42c26d9b16d689b8a6b45ec590940bba6534d6410199809b0db4457')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e')
 
 prepare() {
   mkdir -p build
-
-  cd $_pkgfqn
-  patch -p1 -i ../qtbug-73961.patch # Fix OOM with some Plasma themes https://bugreports.qt.io/browse/QTBUG-73691
 }
 
 build() {
diff --git a/qtbug-73961.patch b/qtbug-73961.patch
deleted file mode 100644
index d67d61f..0000000
--- a/qtbug-73961.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e66dad9857cc062ccfc03e410b15ad1d0254dee9 Mon Sep 17 00:00:00 2001
-From: Benjamin Robin <dev@benjarobin.fr>
-Date: Sun, 24 Feb 2019 10:28:14 +0100
-Subject: [PATCH] Fix ScrollView scrollbar handles when the content is empty
-
-Task-number: QTBUG-73691
-Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d
----
- 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 6750399d429..36b518d3933 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.20.1
-