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

[Antonio Rojas]

    Date: Wednesday, June 26, 2019 @ 10:19:34
  Author: arojas
Revision: 356943

archrelease: copy trunk to testing-x86_64

Added:
  qt5-wayland/repos/testing-x86_64/PKGBUILD
    (from rev 356942, qt5-wayland/trunk/PKGBUILD)
Deleted:
  qt5-wayland/repos/testing-x86_64/PKGBUILD
  qt5-wayland/repos/testing-x86_64/qtwayland-kscreenlocker-crash.patch

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-26 10:19:16 UTC (rev 356942)
+++ PKGBUILD	2019-06-26 10:19:34 UTC (rev 356943)
@@ -1,45 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-wayland
-_qtver=5.13.0
-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/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        kdebug-407651.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=21a5038f")
-sha256sums=('b67a6d8119628bca3301bd03992880db07d61d405534067c9cd2a598695a7cf3'
-            'f21ff86a4ffb4ba7648cba8d6434d7b0a8caa8abf650ba382d3cfa63c934e01b')
-
-prepare() {
-  mkdir -p build
-
-  cd $_pkgfqn
-  patch -p1 -i ../kdebug-407651.patch # Prevent windows from getting larger after closing and reopening https://bugs.kde.org/show_bug.cgi?id=407651
-}
-
-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/testing-x86_64/PKGBUILD (from rev 356942, qt5-wayland/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-26 10:19:34 UTC (rev 356943)
@@ -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
+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/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        kdebug-407651.patch::"https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=21a5038f")
+sha256sums=('b67a6d8119628bca3301bd03992880db07d61d405534067c9cd2a598695a7cf3'
+            'f21ff86a4ffb4ba7648cba8d6434d7b0a8caa8abf650ba382d3cfa63c934e01b')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../kdebug-407651.patch # Prevent windows from getting larger after closing and reopening https://bugs.kde.org/show_bug.cgi?id=407651
+}
+
+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}
+}

Deleted: qtwayland-kscreenlocker-crash.patch
===================================================================
--- qtwayland-kscreenlocker-crash.patch	2019-06-26 10:19:16 UTC (rev 356942)
+++ qtwayland-kscreenlocker-crash.patch	2019-06-26 10:19:34 UTC (rev 356943)
@@ -1,39 +0,0 @@
-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
-