summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-03-16 20:12:32 +0000
committerArmin Kuster <akuster808@gmail.com>2018-03-16 19:57:03 -0700
commit61914441e8b69e99907a05e190a8d90641b99190 (patch)
tree07c33a68a96a5b4c3dbbbf8994dee3eb5e7ee51d
parent0c4b6aa806aaba6670b671e4da65f70b336747e5 (diff)
downloadmeta-openembedded-61914441e8b69e99907a05e190a8d90641b99190.tar.gz
glibmm: refresh the patch
WARNING: glibmm-2.54.1-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 remove-examples.patch patching file Makefile.am patching file configure.ac Hunk #1 succeeded at 166 with fuzz 1 (offset 30 lines). Now at patch remove-examples.patch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch29
1 files changed, 19 insertions, 10 deletions
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch b/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch
index a5944c288..d32fe78d3 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch
+++ b/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch
@@ -1,7 +1,16 @@
1Index: glibmm-2.22.1/Makefile.am 1From f48a69fd11b2eda6c43ff046c202cbc4dcd4e92d Mon Sep 17 00:00:00 2001
2=================================================================== 2From: Koen Kooi <koen@dominion.thruhere.net>
3--- glibmm-2.22.1.orig/Makefile.am 3Date: Tue, 12 Jul 2011 11:46:37 +0200
4+++ glibmm-2.22.1/Makefile.am 4
5---
6 Makefile.am | 7 +------
7 configure.ac | 1 -
8 2 files changed, 1 insertion(+), 7 deletions(-)
9
10diff --git a/Makefile.am b/Makefile.am
11index a0df8af..c3d5e06 100644
12--- a/Makefile.am
13+++ b/Makefile.am
5@@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src 14@@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src
6 else 15 else
7 src_subdirs = 16 src_subdirs =
@@ -16,15 +25,15 @@ Index: glibmm-2.22.1/Makefile.am
16 25
17 glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME) 26 glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)
18 glibmm_include_HEADERS = glib/glibmm.h 27 glibmm_include_HEADERS = glib/glibmm.h
19Index: glibmm-2.22.1/configure.ac 28diff --git a/configure.ac b/configure.ac
20=================================================================== 29index c20e778..74203be 100644
21--- glibmm-2.22.1.orig/configure.ac 30--- a/configure.ac
22+++ glibmm-2.22.1/configure.ac 31+++ b/configure.ac
23@@ -136,7 +136,6 @@ AC_CONFIG_FILES([Makefile 32@@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile
24 gio/src/Makefile 33 gio/src/Makefile
25 gio/giomm/Makefile 34 gio/giomm/Makefile
26 tests/Makefile 35 tests/Makefile
27- examples/Makefile 36- examples/Makefile
28 docs/Makefile 37 docs/Makefile
29 docs/reference/Doxyfile 38 docs/reference/Doxyfile
30 MSVC_Net2005/glibmm/glibmm.rc 39 MSVC_Net2013/glibmm/glibmm.rc