aboutsummaryrefslogtreecommitdiffstats
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-21 18:43:16 -0700
commitdb9170bd319d02b6d905ed3d805cbccd5f1764ff (patch)
tree4704314c55b977ccb1dc95a890ab43c9a813835c
parent6015d3a4bfc77c55b80bcddcb757fb14a4555d88 (diff)
downloadmeta-openembedded-db9170bd319d02b6d905ed3d805cbccd5f1764ff.tar.gz
meta-openembedded-db9170bd319d02b6d905ed3d805cbccd5f1764ff.tar.bz2
meta-openembedded-db9170bd319d02b6d905ed3d805cbccd5f1764ff.zip
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 @@
-Index: glibmm-2.22.1/Makefile.am
-===================================================================
---- glibmm-2.22.1.orig/Makefile.am
-+++ glibmm-2.22.1/Makefile.am
+From f48a69fd11b2eda6c43ff046c202cbc4dcd4e92d Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 12 Jul 2011 11:46:37 +0200
+
+---
+ Makefile.am | 7 +------
+ configure.ac | 1 -
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a0df8af..c3d5e06 100644
+--- a/Makefile.am
++++ b/Makefile.am
@@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src
else
src_subdirs =
@@ -16,15 +25,15 @@ Index: glibmm-2.22.1/Makefile.am
glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)
glibmm_include_HEADERS = glib/glibmm.h
-Index: glibmm-2.22.1/configure.ac
-===================================================================
---- glibmm-2.22.1.orig/configure.ac
-+++ glibmm-2.22.1/configure.ac
-@@ -136,7 +136,6 @@ AC_CONFIG_FILES([Makefile
+diff --git a/configure.ac b/configure.ac
+index c20e778..74203be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile
gio/src/Makefile
gio/giomm/Makefile
tests/Makefile
- examples/Makefile
docs/Makefile
docs/reference/Doxyfile
- MSVC_Net2005/glibmm/glibmm.rc
+ MSVC_Net2013/glibmm/glibmm.rc