diff options
| author | Donald Carr | 2017-07-04 16:05:24 -0700 |
|---|---|---|
| committer | Donald Carr | 2017-07-04 16:05:24 -0700 |
| commit | 2df5e087b7cff568b8fb7d32618d79f78fcac37d (patch) | |
| tree | 5315630cb791a043ffa3b9aa54b670ff81a93428 | |
| parent | 832850c916733a53b7a1d2ee001402466b1124af (diff) | |
| download | aur-2df5e087b7cff568b8fb7d32618d79f78fcac37d.tar.gz | |
Remove integrated wayland patch
| -rw-r--r-- | 0001-Avoid-double-deletion-of-mBuffer.patch | 31 | ||||
| -rw-r--r-- | PKGBUILD | 2 |
2 files changed, 1 insertions, 32 deletions
diff --git a/0001-Avoid-double-deletion-of-mBuffer.patch b/0001-Avoid-double-deletion-of-mBuffer.patch deleted file mode 100644 index c116b210dbb6..000000000000 --- a/0001-Avoid-double-deletion-of-mBuffer.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1c4d31b99afaa6121b4265783f70b6cc9951b786 Mon Sep 17 00:00:00 2001 -From: Donald Carr <d@chaos-reins.com> -Date: Tue, 13 Jun 2017 11:19:30 -0700 -Subject: [PATCH] Avoid double deletion of mBuffer - -Both WaylandBrcmBuffer and WaylandBuffer were calling - -wl_buffer_destroy(mBuffer) - -without the subclass nulling the pointer on deletion - -Change-Id: I66a553a3d11a1ef90bbfe6ad0fb49f40fe1a0bdb ---- - src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp -index 9842f61c..f2709983 100644 ---- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp -+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp -@@ -91,6 +91,7 @@ public: - { - wl_array_release(&m_array); - wl_buffer_destroy(mBuffer); -+ mBuffer = nullptr; - } - - QSize size() const { return m_size; } --- -2.13.1 - @@ -299,7 +299,7 @@ if $_patching; then cd ${_waylanddir} #patch -p1 < ${startdir}/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch - patch -p1 < ${startdir}/0001-Avoid-double-deletion-of-mBuffer.patch + #patch -p1 < ${startdir}/0001-Avoid-double-deletion-of-mBuffer.patch #cd ${_webenginedir} # reverse patch which breaks dynamic loading of EGL/GLESvs with rpi proprietary drivers |