Remove already merged patch
cover Remove already merged patch
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
Signature · 1 line
2.1.0
PATCH 1/1 qt4: remove already merged patch
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.
--- 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
meta/recipes-qt/qt4/qt4-4.8.7.inc +0 -1
@@ -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 \
meta/recipes-qt/qt4/qt4-4.8.7/0028-Don-t-crash-on-broken-GIF-images.patch deleted +0 -47
47 lines not on this page · raw message
Signature · 1 line
2.1.0
Re: [PATCH 1/1] qt4: remove already merged patch
Quoted 5 lines · 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 <[email protected]>
Signature · 3 lines
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
In reply to Paul EggletonQuoted 3 lines · 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.
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
Quoted 9 lines · On Friday 18 September 2015 17:55:06 Khem Raj wrote:
On Fri, Sep 18, 2015 at 7:16 AM, Paul Eggleton
Quoted 3 lines · <[email protected]> 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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre