Patch Qt 5.9.1 up to 5.9 HEAD (93ff90d943825b4acb572)

3 files changed, 2 insertions, 57 deletions

diff --git a/0001-Fix-memory-leak-in-QSGAtlasTexture-Manager-create.patch b/0001-Fix-memory-leak-in-QSGAtlasTexture-Manager-create.patch
deleted file mode 100644
index 5e67277cf9f5..000000000000
--- a/0001-Fix-memory-leak-in-QSGAtlasTexture-Manager-create.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 39061af50cc3092289cdd71d17802139590ecb59 Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@qt.io>
-Date: Mon, 24 Jul 2017 15:00:37 +0200
-Subject: [PATCH] Fix memory leak in QSGAtlasTexture::Manager::create()
-
-Parent the Atlas to the manager.
-
-Task-number: QTBUG-61754
-Change-Id: Ida8b0622d1dbcaafa622f72a1d210969fa61d5bf
-Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
----
- src/quick/scenegraph/util/qsgatlastexture.cpp | 7 ++++---
- src/quick/scenegraph/util/qsgatlastexture_p.h | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
-index 22f0b13f4..d5f836a52 100644
---- a/src/quick/scenegraph/util/qsgatlastexture.cpp
-+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
-@@ -116,7 +116,7 @@ QSGTexture *Manager::create(const QImage &image, bool hasAlphaChannel)
-     Texture *t = 0;
-     if (image.width() < m_atlas_size_limit && image.height() < m_atlas_size_limit) {
-         if (!m_atlas)
--            m_atlas = new Atlas(m_atlas_size);
-+            m_atlas = new Atlas(m_atlas_size, this);
-         // t may be null for atlas allocation failure
-         t = m_atlas->create(image);
-         if (t && !hasAlphaChannel && t->hasAlphaChannel())
-@@ -125,8 +125,9 @@ QSGTexture *Manager::create(const QImage &image, bool hasAlphaChannel)
-     return t;
- }
- 
--Atlas::Atlas(const QSize &size)
--    : m_allocator(size)
-+Atlas::Atlas(const QSize &size, QObject *parent)
-+    : QObject(parent)
-+    , m_allocator(size)
-     , m_texture_id(0)
-     , m_size(size)
-     , m_atlas_transient_image_threshold(0)
-diff --git a/src/quick/scenegraph/util/qsgatlastexture_p.h b/src/quick/scenegraph/util/qsgatlastexture_p.h
-index 3dee53954..0bb07e8e8 100644
---- a/src/quick/scenegraph/util/qsgatlastexture_p.h
-+++ b/src/quick/scenegraph/util/qsgatlastexture_p.h
-@@ -88,7 +88,7 @@ private:
- class Atlas : public QObject
- {
- public:
--    Atlas(const QSize &size);
-+    Atlas(const QSize &size, QObject *parent);
-     ~Atlas();
- 
-     void invalidate();
--- 
-2.13.3
-
diff --git a/0001-Move-qt-declarative-to-4c3246e49521b6341ddcc513814ae.patch.bz2 b/0001-Move-qt-declarative-to-4c3246e49521b6341ddcc513814ae.patch.bz2
new file mode 100644
index 000000000000..5e79198ba250
--- /dev/null
+++ b/0001-Move-qt-declarative-to-4c3246e49521b6341ddcc513814ae.patch.bz2
diff --git a/PKGBUILD b/PKGBUILD
index fc967923cc14..92df0a8a98b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -294,7 +294,8 @@ if $_patching; then
   #patch -p1 < ${startdir}/0001-Check-lib64-as-well-as-lib.patch
 
   cd ${_declarativedir}
-  patch -p1 < ${startdir}/0001-Fix-memory-leak-in-QSGAtlasTexture-Manager-create.patch
+  bunzip2 ${startdir}/0001-Move-qt-declarative-to-4c3246e49521b6341ddcc513814ae.patch.bz2
+  patch -p1 < ${startdir}/0001-Move-qt-declarative-to-4c3246e49521b6341ddcc513814ae.patch
   #patch -p1 < ${startdir}/0001-Fix-crash-in-QQuickPixmapReader-friends.patch
   #patch -p1 < ${startdir}/0001-Fix-build-with-qreal-as-float.patch