[arch-commits] Commit in qt5-wayland/repos/kde-unstable-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Jun 4 12:17:28 UTC 2019
Date: Tuesday, June 4, 2019 @ 12:17:27
Author: arojas
Revision: 354818
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt5-wayland/repos/kde-unstable-x86_64/PKGBUILD
(from rev 354817, qt5-wayland/kde-unstable/PKGBUILD)
qt5-wayland/repos/kde-unstable-x86_64/qtwayland-kscreenlocker-crash.patch
(from rev 354817, qt5-wayland/kde-unstable/qtwayland-kscreenlocker-crash.patch)
Deleted:
qt5-wayland/repos/kde-unstable-x86_64/PKGBUILD
qt5-wayland/repos/kde-unstable-x86_64/qtwayland-kscreenlocker-crash.patch
-------------------------------------+
PKGBUILD | 85 ++++++++++++++++------------------
qtwayland-kscreenlocker-crash.patch | 78 +++++++++++++++----------------
2 files changed, 79 insertions(+), 84 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-04 12:17:15 UTC (rev 354817)
+++ PKGBUILD 2019-06-04 12:17:27 UTC (rev 354818)
@@ -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-beta4
-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"
- qtwayland-kscreenlocker-crash.patch)
-sha256sums=('8ded42012190d3670779e3ada78b593ffa07a73caba94241a46faf420b3cda85'
- '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/PKGBUILD (from rev 354817, qt5-wayland/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-04 12:17:27 UTC (rev 354818)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-wayland
+_qtver=5.13.0-rc
+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=('fb697dc87edaf7015600ee96e242952da761a84e37e7919b3b3821b3427393da')
+
+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}
+}
Deleted: qtwayland-kscreenlocker-crash.patch
===================================================================
--- qtwayland-kscreenlocker-crash.patch 2019-06-04 12:17:15 UTC (rev 354817)
+++ qtwayland-kscreenlocker-crash.patch 2019-06-04 12:17:27 UTC (rev 354818)
@@ -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
-
Copied: qt5-wayland/repos/kde-unstable-x86_64/qtwayland-kscreenlocker-crash.patch (from rev 354817, qt5-wayland/kde-unstable/qtwayland-kscreenlocker-crash.patch)
===================================================================
--- qtwayland-kscreenlocker-crash.patch (rev 0)
+++ qtwayland-kscreenlocker-crash.patch 2019-06-04 12:17:27 UTC (rev 354818)
@@ -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
+
More information about the arch-commits
mailing list