diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-03-21 16:48:54 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-04 07:50:50 +0000 |
| commit | 5b716987388e43221fc8dc1c56df5c583a0edb0d (patch) | |
| tree | a27e6463ad84143cd1a583771864f8e5e7704d59 /recipes-qt | |
| parent | 32bb7d18a08d1c48873d7ab6332d4cc3815a4dff (diff) | |
maliit-framework-qt5: refresh patches
WARNING: maliit-framework-qt5-0.99.0+gitAUTOINC+62bd54bcde-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch
0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
patching file config.pri
Hunk #1 succeeded at 144 with fuzz 1 (offset -17 lines).
Now at patch
0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
2 files changed, 10 insertions, 14 deletions
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch index acd9a57a..a4103f25 100644 --- a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch @@ -1,4 +1,4 @@ -From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001 +From be5c73c72d1efa90ba440957d6f5ff3278c25545 Mon Sep 17 00:00:00 2001 From: Samuel Stirtzel <s.stirtzel@googlemail.com> Date: Wed, 1 Aug 2012 13:21:51 +0200 Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded @@ -6,16 +6,17 @@ Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded Upstream-Status: Inappropriate [configuration] Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> + --- - config.pri | 8 +++++--- + config.pri | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.pri b/config.pri -index b037b8c..43409f3 100644 +index 8f24864..94d595a 100644 --- a/config.pri +++ b/config.pri -@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) { - QT_WIDGETS = gui widgets +@@ -144,9 +144,11 @@ noxcb { + DEFINES += NOXCB } -MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features @@ -29,6 +30,3 @@ index b037b8c..43409f3 100644 } defineTest(outputFile) { --- -1.7.9.5 - diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch index 73560340..2310e637 100644 --- a/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch @@ -1,4 +1,4 @@ -From cb38c078fa34a3d0cff6bc195edd9f507477d2e1 Mon Sep 17 00:00:00 2001 +From fb4316ca6e44a6b34e7d109360fc716c372e1293 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 11:45:06 -0700 Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags @@ -10,15 +10,16 @@ O1 is a good compromise between debug quality and optimization level. Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- config.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.pri b/config.pri -index 1505f9d..7cc196a 100644 +index 94d595a..d7b221f 100644 --- a/config.pri +++ b/config.pri -@@ -13,8 +13,8 @@ include(defines.pri) +@@ -15,8 +15,8 @@ include(defines.pri) # Linker optimization for release build QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed # Compiler warnings are error if the build type is debug @@ -29,6 +30,3 @@ index 1505f9d..7cc196a 100644 OBJECTS_DIR = .obj MOC_DIR = .moc --- -2.13.2 - |