[arch-commits] Commit in qt5-quickcontrols/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Sunday, February 24, 2019 @ 17:24:31
  Author: arojas
Revision: 346763

archrelease: copy trunk to extra-x86_64

Added:
  qt5-quickcontrols/repos/extra-x86_64/PKGBUILD
    (from rev 346762, qt5-quickcontrols/trunk/PKGBUILD)
  qt5-quickcontrols/repos/extra-x86_64/qtbug-73961.patch
    (from rev 346762, qt5-quickcontrols/trunk/qtbug-73961.patch)
Deleted:
  qt5-quickcontrols/repos/extra-x86_64/PKGBUILD

-------------------+
 PKGBUILD          |   85 +++++++++++++++++++++++++++-------------------------
 qtbug-73961.patch |   29 +++++++++++++++++
 2 files changed, 74 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-24 17:23:37 UTC (rev 346762)
+++ PKGBUILD	2019-02-24 17:24:31 UTC (rev 346763)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-quickcontrols
-_qtver=5.12.1
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Reusable Qt Quick based UI controls to create classic desktop-style user interfaces'
-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")
-sha256sums=('15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}

Copied: qt5-quickcontrols/repos/extra-x86_64/PKGBUILD (from rev 346762, qt5-quickcontrols/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-02-24 17:24:31 UTC (rev 346763)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-quickcontrols
+_qtver=5.12.1
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Reusable Qt Quick based UI controls to create classic desktop-style user interfaces'
+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')
+
+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() {
+  cd build
+
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}

Copied: qt5-quickcontrols/repos/extra-x86_64/qtbug-73961.patch (from rev 346762, qt5-quickcontrols/trunk/qtbug-73961.patch)
===================================================================
--- qtbug-73961.patch	                        (rev 0)
+++ qtbug-73961.patch	2019-02-24 17:24:31 UTC (rev 346763)
@@ -0,0 +1,29 @@
+From e66dad9857cc062ccfc03e410b15ad1d0254dee9 Mon Sep 17 00:00:00 2001
+From: Benjamin Robin <dev at 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
+