[arch-commits] Commit in qt5-wayland/repos/kde-unstable-x86_64 (3 files)

[Antonio Rojas]

    Date: Tuesday, May 21, 2019 @ 07:50:48
  Author: arojas
Revision: 353713

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  qt5-wayland/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 353712, qt5-wayland/kde-unstable/PKGBUILD)
  qt5-wayland/repos/kde-unstable-x86_64/qtwayland-kscreenlocker-crash.patch
    (from rev 353712, qt5-wayland/kde-unstable/qtwayland-kscreenlocker-crash.patch)
Deleted:
  qt5-wayland/repos/kde-unstable-x86_64/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   85 ++++++++++++++++++----------------
 qtwayland-kscreenlocker-crash.patch |   39 +++++++++++++++
 2 files changed, 84 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-21 07:50:13 UTC (rev 353712)
+++ PKGBUILD	2019-05-21 07:50:48 UTC (rev 353713)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-wayland
-_qtver=5.13.0-beta3
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Provides APIs for Wayland'
-depends=('qt5-declarative' 'libxcomposite' 'wayland') # namcap note: wayland is needed for nvidia-libgl users
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('910ef400388e42e6393ea4f57733801884ef96fcd87e122cefac14478009103f')
-
-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-wayland/repos/kde-unstable-x86_64/PKGBUILD (from rev 353712, qt5-wayland/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-21 07:50:48 UTC (rev 353713)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-wayland
+_qtver=5.13.0-beta3
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Provides APIs for Wayland'
+depends=('qt5-declarative' 'libxcomposite' 'wayland') # namcap note: wayland is needed for nvidia-libgl users
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+         qtwayland-kscreenlocker-crash.patch)
+sha256sums=('910ef400388e42e6393ea4f57733801884ef96fcd87e122cefac14478009103f'
+            '3793d004170cb7ce4947d28128d71fc73556857e71384854607ae6c5921d6fe9')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtwayland-kscreenlocker-crash.patch # https://bugreports.qt.io/browse/QTBUG-75920
+}
+
+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-wayland/repos/kde-unstable-x86_64/qtwayland-kscreenlocker-crash.patch (from rev 353712, qt5-wayland/kde-unstable/qtwayland-kscreenlocker-crash.patch)
===================================================================
--- qtwayland-kscreenlocker-crash.patch	                        (rev 0)
+++ qtwayland-kscreenlocker-crash.patch	2019-05-21 07:50:48 UTC (rev 353713)
@@ -0,0 +1,39 @@
+From 999bdb0dafe6f65ea41a4faf24ef5062f3dd6bcc Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing <johan.helsing at qt.io>
+Date: Tue, 21 May 2019 09:06:30 +0200
+Subject: [PATCH 1/1] Client: Don't crash when the cursor theme fails to load
+
+Fixes: QTBUG-75920
+Change-Id: I29d84b487afb2a90b8a633abce2fcc39ca75adae
+---
+ src/client/qwaylandinputdevice.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
+index 39c02d962..7f6f01cd1 100644
+--- a/src/client/qwaylandinputdevice.cpp
++++ b/src/client/qwaylandinputdevice.cpp
+@@ -272,6 +272,10 @@ void QWaylandInputDevice::Pointer::updateCursorTheme()
+     int pixelSize = cursorSize() * scale;
+     auto *display = seat()->mQDisplay;
+     mCursor.theme = display->loadCursorTheme(cursorThemeName(), pixelSize);
++
++    if (!mCursor.theme)
++        return; // A warning has already been printed in loadCursorTheme
++
+     if (auto *arrow = mCursor.theme->cursorImage(Qt::ArrowCursor)) {
+         int arrowPixelSize = qMax(arrow->width, arrow->height); // Not all cursor themes are square
+         while (scale > 1 && arrowPixelSize / scale < cursorSize())
+@@ -310,6 +314,9 @@ void QWaylandInputDevice::Pointer::updateCursor()
+     if (!mCursor.theme || idealCursorScale() != mCursor.themeBufferScale)
+         updateCursorTheme();
+ 
++    if (!mCursor.theme)
++        return;
++
+     // Set from shape using theme
+     if (struct ::wl_cursor_image *image = mCursor.theme->cursorImage(shape)) {
+         struct wl_buffer *buffer = wl_cursor_image_get_buffer(image);
+-- 
+2.16.3
+