git » qt5-base.git » commit 6af8424

Fix time zones for Kazakhstan (FS#49126)

author Antonio Rojas
2016-05-24 22:31:51 UTC
committer Antonio Rojas
2016-05-24 22:31:51 UTC
parent f3aec5c1604c415a1099efe21cb688a1e301c6af

Fix time zones for Kazakhstan (FS#49126)

PKGBUILD +11 -3

diff --git a/PKGBUILD b/PKGBUILD
index 13766fa..2aedc19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.6.0
 pkgver=${_qtver/-/}
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -27,13 +27,17 @@ conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-alsa1.11.patch
-        qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch qtbug-45812.patch)
+        qtbug-51648.patch qtbug-51649.patch qtbug-51676.patch qtbug-45812.patch
+        qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch"
+        qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch")
 md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
          '5e96b5cfa248b8b071919adb27abc715'
          'b09aa4f5763f013b06153fbdbc844404'
          'ef981ff6892337cdab424ebb113b3c39'
          'f59a1ea0f10a055ba930a53832933482'
-         '7f152c40947027acba56023e9d693260')
+         '7f152c40947027acba56023e9d693260'
+         '462f079cd46f869def6858903a718bf5'
+         'da4fd787ea877516397a027412e975e1')
 
 prepare() {
   cd ${_pkgfqn}
@@ -62,6 +66,10 @@ prepare() {
 
   # Fix drag and drop from some applications
   patch -p1 -i ../qtbug-45812.patch
+
+  # Fix parsing of tzfile(5) POSIX rule zone names with bracket quotes
+  patch -p1 -i ../qtbug-53071.patch
+  patch -p1 -i ../qtbug-53071b.patch
 }
 
 build() {