[arch-commits] Commit in qt5-base/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, December 8, 2016 @ 07:47:17
  Author: arojas
Revision: 282935

Fix crash on plugin unloading (FS#52026)

Modified:
  qt5-base/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-08 07:04:10 UTC (rev 282934)
+++ PKGBUILD	2016-12-08 07:47:17 UTC (rev 282935)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -12,7 +12,7 @@
 pkgdesc='A cross-platform application and UI framework'
 depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'fontconfig'
          'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
-         'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy')
+         'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups')
 makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
              'gtk3' 'libpulse' 'cups' 'freetds')
 optdepends=('qt5-svg: to use SVG icon themes'
@@ -31,13 +31,15 @@
         qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch"
         qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch"
         qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch"
-        qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch")
+        qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch"
+        qtbug-49061.patch::"https://github.com/qt/qtbase/commit/494376f9.patch")
 md5sums=('184f9460b40752d71b15b827260580c2'
          '462f079cd46f869def6858903a718bf5'
          'da4fd787ea877516397a027412e975e1'
          '981255fb1aea0d3c0b5c5f306fe374da'
          '646aea77ca90031c453a65ef61db55f9'
-         '9842c327b091b360da7a4d90f5fdf4da')
+         '9842c327b091b360da7a4d90f5fdf4da'
+         'c86af27562bbbe05c3defd63d00130fd')
 
 prepare() {
   cd ${_pkgfqn}
@@ -68,6 +70,9 @@
 
   # Fix memory leak
   patch -p1 -i ../qtbase-memory-leak.patch
+
+  # Don't unload plugins in QPluginLoader https://bugreports.qt.io/browse/QTBUG-49061
+  patch -p1 -i ../qtbug-49061.patch
 }
 
 build() {