summaryrefslogtreecommitdiffstats
path: root/recipes-qt/maliit
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-03-21 16:48:54 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-04 07:50:50 +0000
commit5b716987388e43221fc8dc1c56df5c583a0edb0d (patch)
treea27e6463ad84143cd1a583771864f8e5e7704d59 /recipes-qt/maliit
parent32bb7d18a08d1c48873d7ab6332d4cc3815a4dff (diff)
downloadmeta-qt5-5b716987388e43221fc8dc1c56df5c583a0edb0d.tar.gz
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/maliit')
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch14
-rw-r--r--recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch10
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 @@
1From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001 1From be5c73c72d1efa90ba440957d6f5ff3278c25545 Mon Sep 17 00:00:00 2001
2From: Samuel Stirtzel <s.stirtzel@googlemail.com> 2From: Samuel Stirtzel <s.stirtzel@googlemail.com>
3Date: Wed, 1 Aug 2012 13:21:51 +0200 3Date: Wed, 1 Aug 2012 13:21:51 +0200
4Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded 4Subject: [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
6Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
7 7
8Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> 8Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
9
9--- 10---
10 config.pri | 8 +++++--- 11 config.pri | 8 +++++---
11 1 file changed, 5 insertions(+), 3 deletions(-) 12 1 file changed, 5 insertions(+), 3 deletions(-)
12 13
13diff --git a/config.pri b/config.pri 14diff --git a/config.pri b/config.pri
14index b037b8c..43409f3 100644 15index 8f24864..94d595a 100644
15--- a/config.pri 16--- a/config.pri
16+++ b/config.pri 17+++ b/config.pri
17@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) { 18@@ -144,9 +144,11 @@ noxcb {
18 QT_WIDGETS = gui widgets 19 DEFINES += NOXCB
19 } 20 }
20 21
21-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features 22-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
@@ -29,6 +30,3 @@ index b037b8c..43409f3 100644
29 } 30 }
30 31
31 defineTest(outputFile) { 32 defineTest(outputFile) {
32--
331.7.9.5
34
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 @@
1From cb38c078fa34a3d0cff6bc195edd9f507477d2e1 Mon Sep 17 00:00:00 2001 1From fb4316ca6e44a6b34e7d109360fc716c372e1293 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Jul 2017 11:45:06 -0700 3Date: Wed, 12 Jul 2017 11:45:06 -0700
4Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags 4Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags
@@ -10,15 +10,16 @@ O1 is a good compromise between debug quality and
10optimization level. 10optimization level.
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
13--- 14---
14 config.pri | 4 ++-- 15 config.pri | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
16 17
17diff --git a/config.pri b/config.pri 18diff --git a/config.pri b/config.pri
18index 1505f9d..7cc196a 100644 19index 94d595a..d7b221f 100644
19--- a/config.pri 20--- a/config.pri
20+++ b/config.pri 21+++ b/config.pri
21@@ -13,8 +13,8 @@ include(defines.pri) 22@@ -15,8 +15,8 @@ include(defines.pri)
22 # Linker optimization for release build 23 # Linker optimization for release build
23 QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed 24 QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed
24 # Compiler warnings are error if the build type is debug 25 # Compiler warnings are error if the build type is debug
@@ -29,6 +30,3 @@ index 1505f9d..7cc196a 100644
29 30
30 OBJECTS_DIR = .obj 31 OBJECTS_DIR = .obj
31 MOC_DIR = .moc 32 MOC_DIR = .moc
32--
332.13.2
34