[PATCH 0/1] Remove already merged patch

[PATCH 0/1] Remove already merged patch

[Paul Eggleton]

The following changes since commit 72682d72b52355c3fed947167ca3c6064340ead1:

  autotools.bbclass: mkdir ${B} -> mkdir -p ${B} (2015-09-16 22:17:19 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/qt4-remove-merged-patch
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-remove-merged-patch

Paul Eggleton (1):
  qt4: remove already merged patch

 meta/recipes-qt/qt4/qt4-4.8.7.inc                  |  1 -
 .../0028-Don-t-crash-on-broken-GIF-images.patch    | 47 ----------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch

-- 
2.1.0

[PATCH 1/1] qt4: remove already merged patch

[Paul Eggleton]

This patch was merged into the 4.8.7 release. This was missed on
upgrade, and we didn't notice because our quilt-based patch handling
code ignores already-applied patches.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-qt/qt4/qt4-4.8.7.inc                  |  1 -
 .../0028-Don-t-crash-on-broken-GIF-images.patch    | 47 ----------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch

diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index 5257e76..10f87a7 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -21,7 +21,6 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
            file://0018-configure-make-pulseaudio-a-configurable-option.patch \
            file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
            file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
-           file://0028-Don-t-crash-on-broken-GIF-images.patch \
            file://0030-aarch64_arm64_qatomic_support.patch \
            file://0031-aarch64_arm64_mkspecs.patch \
            file://0032-aarch64_add_header.patch \
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch
deleted file mode 100644
index 906e2fd..0000000
--- a/meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001
-From: Lars Knoll <lars.knoll@digia.com>
-Date: Thu, 24 Apr 2014 15:33:27 +0200
-Subject: [PATCH] Don't crash on broken GIF images
-
-Broken GIF images could set invalid width and height
-values inside the image, leading to Qt creating a null
-QImage for it. In that case we need to abort decoding
-the image and return an error.
-
-Initial patch by Rich Moore.
-
-Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
-
-Task-number: QTBUG-38367
-Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
-Security-advisory: CVE-2014-0190
-Reviewed-by: Richard J. Moore <rich@kde.org>
-
-Upstream-Status: Backport
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-
----
- src/gui/image/qgifhandler.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 3324f04..5199dd3 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
-                     memset(bits, 0, image->byteCount());
-                 }
- 
-+                // Check if the previous attempt to create the image failed. If it
-+                // did then the image is broken and we should give up.
-+                if (image->isNull()) {
-+                    state = Error;
-+                    return -1;
-+                }
-+
-                 disposePrevious(image);
-                 disposed = false;
- 
--- 
-1.9.3
-
-- 
2.1.0

Re: [PATCH 1/1] qt4: remove already merged patch

[Otavio Salvador]

On Fri, Sep 18, 2015 at 11:16 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> This patch was merged into the 4.8.7 release. This was missed on
> upgrade, and we didn't notice because our quilt-based patch handling
> code ignores already-applied patches.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>


Acked-by: Otavio Salvador <otavio@ossystems.com.br>


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 1/1] qt4: remove already merged patch

[Khem Raj]

On Fri, Sep 18, 2015 at 7:16 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> This patch was merged into the 4.8.7 release. This was missed on
> upgrade, and we didn't notice because our quilt-based patch handling
> code ignores already-applied patches.

this is a problem. My host quilt fails on me on duplicate patching,
this should be default otherwise we will accumulate dead code.

Re: [PATCH 1/1] qt4: remove already merged patch

[Paul Eggleton]

On Friday 18 September 2015 17:55:06 Khem Raj wrote:
> On Fri, Sep 18, 2015 at 7:16 AM, Paul Eggleton
> 
> <paul.eggleton@linux.intel.com> wrote:
> > This patch was merged into the 4.8.7 release. This was missed on
> > upgrade, and we didn't notice because our quilt-based patch handling
> > code ignores already-applied patches.
> 
> this is a problem. My host quilt fails on me on duplicate patching,
> this should be default otherwise we will accumulate dead code.

I suspect this is the way it's always been unfortunately; not to say it 
shouldn't be fixed though. When I cleaned this up last time I found 5 or 6 
recipes in OE-Core that had already-applied patches. It may be the logic we 
have in patch.bbclass / lib/oe/patch.py that wraps quilt rather than quilt 
itself; other than fixes I've made to the git part, that code is ancient.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre