author | Antonio Rojas
<arojas@archlinux.org> 2018-03-22 10:59:33 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2018-03-22 10:59:33 UTC |
parent | 4a030d2fc8bad9ee48690da384c6eaa41b5c7e36 |
PKGBUILD | +15 | -5 |
diff --git a/PKGBUILD b/PKGBUILD index ce6f7af..ed7cad9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=qt5-wayland _qtver=5.10.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=3 arch=('x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -14,11 +14,17 @@ depends=('qt5-declarative' 'libxcomposite' 'wayland') # namcap note: wayland is groups=('qt' 'qt5') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - qtwayland-key-compose.patch::"https://github.com/qt/qtwayland/commit/57c4af2b.patch" - qtbug-62044.patch) + qtwayland-key-compose.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=57c4af2b" + qtbug-62044.patch + qtbug-67150.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=26a6372b" + qtbug-66867.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=e283cc05" + qtwayland-context-create.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=7ce033cb") sha256sums=('f5a7643a5ebcdc50d02b293191e675f387f67dc360c27bf6f94345372fba6356' - '401debccda18236869d601883e1ea9c0d0a541ea12656e43ef9e7d53b835dd92' - '4b0ac091873b7a2b156ed2af4b2e32ecb22bfb99618f1ae76e9b72670933c3dd') + 'a96b50265791b0d6288deacde3bf75cd4aaf0429412f89190c787793d4a98901' + '4b0ac091873b7a2b156ed2af4b2e32ecb22bfb99618f1ae76e9b72670933c3dd' + '88aef190da6b99641bd9d039902d6d4b5a007b9920535694ee48884d9f7a554f' + '223c5d752e0e0edc36492dc5e4e4ae5b65c61ec30ce499c044c2e99ac31c6e6f' + '2717e699701232164447ce73c482f79cdcb7c11ea22cfee1aeb210f106d91c38') prepare() { mkdir -p build @@ -26,6 +32,10 @@ prepare() { cd $_pkgfqn patch -p1 -i ../qtwayland-key-compose.patch # Backport key composition support patch -p1 -i ../qtbug-62044.patch # Fix crash when connecting a new screen +# Backport some crash fixes + patch -p1 -i ../qtbug-67150.patch + patch -p1 -i ../qtbug-66867.patch + patch -p1 -i ../qtwayland-context-create.patch } build() {