forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/qt5-qtwayland: fix depends, drop patch (!117)

Browse source 
Depend on wayland-dev and remove the LuneOS related patch that does not
apply anymore. We don't ship LuneOS UI anymore (see #49), so there's no
point in carrying around the patch.

This package was broken in the upgrade to Qt 5.12.
This commit is contained in:
Bart Ribbers 2018-12-29 16:53:59 +01:00 committed by Oliver Smith
parent fd6c875064
commit 3072439c23
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main/qt5-qtwayland/0003-QtKeyExtensionGlobal-fix-export.patch
View file

@ -1,14 +0,0 @@
diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h
index fae02b0..d965eac 100644
--- a/src/compositor/extensions/qwlqtkey_p.h
+++ b/src/compositor/extensions/qwlqtkey_p.h
@@ -64,7 +64,7 @@ class QKeyEvent;
namespace QtWayland {
-class QtKeyExtensionGlobal : public QWaylandCompositorExtensionTemplate<QtKeyExtensionGlobal>, public QtWaylandServer::qt_key_extension
+class Q_WAYLAND_COMPOSITOR_EXPORT QtKeyExtensionGlobal : public QWaylandCompositorExtensionTemplate<QtKeyExtensionGlobal>, public QtWaylandServer::qt_key_extension
{
Q_OBJECT
public:

9
main/qt5-qtwayland/APKBUILD
View file

@ -8,10 +8,8 @@ url='http://qt-project.org/'
license="GPL-3.0 GPL-2.0 LGPL-3.0"
pkgdesc='Provides APIs for Wayland'
depends="qt5-qtdeclarative libxcomposite wayland qt5-qtquickcontrols2"
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev libxkbcommon-dev qt5-qtquickcontrols2-dev"
source="http://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${pkgname/qt5-/}-everywhere-src-$pkgver.tar.xz
0003-QtKeyExtensionGlobal-fix-export.patch"
makedepends="$depends_dev libxkbcommon-dev qt5-qtquickcontrols2-dev qt5-qtbase-dev wayland-dev"
source="http://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${pkgname/qt5-/}-everywhere-src-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-doc"
builddir="$srcdir/${pkgname/qt5-/}-everywhere-src-$pkgver"
options="!check"
@ -32,5 +30,4 @@ package() {
install -d "$pkgdir"/usr/share/licenses
ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
}
sha512sums="a6819a918a8249861253ca24109888c4af26e5a75b746d10a516c1abe5c685a2aed85f9a57832596480e89870d8f189ee63609df983ed826148a62f60fb823bc qtwayland-everywhere-src-5.12.0.tar.xz
2e081b0bd66d4f3865a96a53df45fcd04f61a2a951be89ed46405b35a334b4900be1cd834b583c6dca4bfb75ed816aaab8a2d536962922505c30e48fdc3b394d 0003-QtKeyExtensionGlobal-fix-export.patch"
sha512sums="a6819a918a8249861253ca24109888c4af26e5a75b746d10a516c1abe5c685a2aed85f9a57832596480e89870d8f189ee63609df983ed826148a62f60fb823bc qtwayland-everywhere-src-5.12.0.tar.xz"