diff options
-rw-r--r-- | 0001-Adjust-Raspberry-Pi-integration-to-new-API.patch | 83 | ||||
-rw-r--r-- | 0001-Fix-qreal-double-mingling.patch | 35 | ||||
-rw-r--r-- | PKGBUILD | 7 |
3 files changed, 1 insertions, 124 deletions
diff --git a/0001-Adjust-Raspberry-Pi-integration-to-new-API.patch b/0001-Adjust-Raspberry-Pi-integration-to-new-API.patch deleted file mode 100644 index cde586635873..000000000000 --- a/0001-Adjust-Raspberry-Pi-integration-to-new-API.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 83c85fa8d7f69890e85018cf8e45d8b2e98b3486 Mon Sep 17 00:00:00 2001 -From: Donald Carr <sirspudd@gmail.com> -Date: Tue, 15 Mar 2016 13:25:36 -0700 -Subject: [PATCH] Adjust Raspberry Pi integration to new API - -Change-Id: I7ef64e5dd5e87e62ec83fc05076a5c2e93d11638 ---- - src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri | 2 +- - .../compositor/brcm-egl/brcmeglintegration.cpp | 10 ++-------- - .../compositor/brcm-egl/brcmeglintegration.h | 3 +-- - 3 files changed, 4 insertions(+), 11 deletions(-) - -diff --git a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri -index 83c7b62..f478071 100644 ---- a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri -+++ b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri -@@ -1,4 +1,4 @@ --QT = compositor compositor-private core-private gui-private -+QT = waylandcompositor waylandcompositor-private core-private gui-private - - INCLUDEPATH += $$PWD - -diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp -index 08df635..508e882 100644 ---- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp -+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp -@@ -36,7 +36,6 @@ - - #include "brcmeglintegration.h" - #include "brcmbuffer.h" --#include <QtWaylandCompositor/private/qwlsurface_p.h> - #include <QtWaylandCompositor/qwaylandsurface.h> - #include <qpa/qplatformnativeinterface.h> - #include <QtGui/QGuiApplication> -@@ -76,7 +75,7 @@ BrcmEglIntegration::BrcmEglIntegration() - { - } - --void BrcmEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay) -+void BrcmEglIntegration::initializeHardware(struct ::wl_display *display) - { - Q_D(BrcmEglIntegration); - -@@ -114,7 +113,7 @@ void BrcmEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay) - return; - } - d->valid = true; -- init(waylandDisplay->handle(), 1); -+ init(display, 1); - } - } - -@@ -147,11 +146,6 @@ void BrcmEglIntegration::bindTextureToBuffer(struct ::wl_resource *buffer) - d->eglDestroyImageKHR(d->egl_display, image); - } - --bool BrcmEglIntegration::isYInverted(struct ::wl_resource *) const --{ -- return false; --} -- - void BrcmEglIntegration::brcm_bind_resource(Resource *) - { - } -diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h -index 90f447c..48dd9c4 100644 ---- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h -+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h -@@ -52,10 +52,9 @@ class BrcmEglIntegration : public QtWayland::ClientBufferIntegration, public QtW - public: - BrcmEglIntegration(); - -- void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE; -+ void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; - - void bindTextureToBuffer(struct ::wl_resource *buffer) Q_DECL_OVERRIDE; -- bool isYInverted(struct ::wl_resource *) const Q_DECL_OVERRIDE; - - QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE; - --- -2.7.3 - diff --git a/0001-Fix-qreal-double-mingling.patch b/0001-Fix-qreal-double-mingling.patch deleted file mode 100644 index 38f953e637c1..000000000000 --- a/0001-Fix-qreal-double-mingling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6d2f3b5f871426ebc68f487b1572e4c9eb9abb0e Mon Sep 17 00:00:00 2001 -From: Donald Carr <sirspudd@gmail.com> -Date: Wed, 23 Mar 2016 14:59:45 -0700 -Subject: [PATCH] Fix qreal/double mingling - -Change-Id: I3ad1dc194ef1fcb836273a2f7e581109c80f11a0 ---- - src/imports/location/qdeclarativegeomap.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp -index 591bcd7..dd4eebc 100644 ---- a/src/imports/location/qdeclarativegeomap.cpp -+++ b/src/imports/location/qdeclarativegeomap.cpp -@@ -572,7 +572,7 @@ void QDeclarativeGeoMap::setMinimumZoomLevel(qreal minimumZoomLevel) - if (m_gestureArea && minimumZoomLevel >= 0) { - qreal oldMinimumZoomLevel = this->minimumZoomLevel(); - if (m_mappingManagerInitialized) { -- minimumZoomLevel = qBound(m_map->minimumZoom(),minimumZoomLevel,m_mappingManager->cameraCapabilities().maximumZoomLevel()); -+ minimumZoomLevel = qBound(qreal(m_map->minimumZoom()),minimumZoomLevel,qreal(m_mappingManager->cameraCapabilities().maximumZoomLevel())); - } - - m_gestureArea->setMinimumZoomLevel(minimumZoomLevel); -@@ -619,7 +619,7 @@ void QDeclarativeGeoMap::setMaximumZoomLevel(qreal maximumZoomLevel) - if (m_gestureArea && maximumZoomLevel >= 0) { - qreal oldMaximumZoomLevel = this->maximumZoomLevel(); - if (m_mappingManagerInitialized) { -- maximumZoomLevel = qBound(m_map->minimumZoom(),maximumZoomLevel,m_mappingManager->cameraCapabilities().maximumZoomLevel()); -+ maximumZoomLevel = qBound(qreal(m_map->minimumZoom()),maximumZoomLevel,qreal(m_mappingManager->cameraCapabilities().maximumZoomLevel())); - } - - m_gestureArea->setMaximumZoomLevel(maximumZoomLevel); --- -2.7.4 - @@ -25,7 +25,7 @@ _local_qt5_repo="/opt/dev/src/qtproject/qt5" # PKGBUILD -pkgrel=7 +pkgrel=8 _piver=2 _pkgvermajmin="5.7" @@ -156,13 +156,9 @@ fi cd ${_basedir} patch -p1 < ${_patch_dir}/0001-Make-CFLAGS-CXXFLAGS-behave-consistently-in-config.t.patch patch -p1 < ${_patch_dir}/0002-Adjust-egl-config.test-to-pass-sysrooted-libs.patch - cd ${_waylanddir} - patch -p1 < ${_patch_dir}/0001-Adjust-Raspberry-Pi-integration-to-new-API.patch cd ${_webenginedir} patch -p1 < ${_patch_dir}/0001-Include-neon-support-for-any-fpu-.-neon.patch patch -p1 < ${_patch_dir}/0001-Always-define-arm_thumb.patch - cd ${_locationdir} - patch -p1 < ${_patch_dir}/0001-Fix-qreal-double-mingling.patch # end patch @@ -196,7 +192,6 @@ fi -no-xcb \ \ -skip qtscript \ - -skip qtenginio \ \ -sysroot ${_sysroot} \ -device ${_mkspec} \ |