git » qt5-base.git » commit 7496fbd

Fix memory leak (FS#51896), revert unintended change

author Antonio Rojas
2016-11-20 11:08:03 UTC
committer Antonio Rojas
2016-11-20 11:08:03 UTC
parent 8625df09ecdf3b46ad54cc692107aca35a50a5cd

Fix memory leak (FS#51896), revert unintended change

PKGBUILD +5 -5

diff --git a/PKGBUILD b/PKGBUILD
index e430853..2d19658 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,13 +31,13 @@ source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submo
         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"
-        no-gtk-qpa-on-wayland.patch)
+        qtbase-memory-leak.patch::"https://github.com/qt/qtbase/commit/42283868.patch")
 md5sums=('184f9460b40752d71b15b827260580c2'
          '462f079cd46f869def6858903a718bf5'
          'da4fd787ea877516397a027412e975e1'
          '981255fb1aea0d3c0b5c5f306fe374da'
          '646aea77ca90031c453a65ef61db55f9'
-         '880c9d0060916888ba17b7f9ea41a8c5')
+         '9842c327b091b360da7a4d90f5fdf4da')
 
 prepare() {
   cd ${_pkgfqn}
@@ -66,8 +66,8 @@ prepare() {
   # Fix freetype engine performance 
   patch -p1 -i ../qtbug-49452.patch
 
-  # Don't use the GTK QPA on Wayland - file chooser segfaults
-  patch -p1 -i ../no-gtk-qpa-on-wayland.patch
+  # Fix memory leak
+  patch -p1 -i ../qtbase-memory-leak.patch
 }
 
 build() {