From b6b603b2f30ef3eeab1897ba2938bcc0f61e68f4 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Sun, 19 Jan 2020 16:11:53 -0600 Subject: python-pygobject: update patches Fix patch fuzz as reported by bitbake warning. patching file configure.ac Hunk #2 succeeded at 82 with fuzz 1. The context lines in the patches can be updated with devtool: devtool modify python-pygobject devtool finish --force-patch-refresh python-pygobject (From meta-phosphor rev: 084e71258affcb86d4ac65ffc6ff5da34ff3313b) Signed-off-by: Patrick Williams Change-Id: I7fa8b6f79837159ff58979bebd24a820bd2bae96 Signed-off-by: Brad Bishop --- .../obsolete_automake_macros.patch | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch index c2591123b..9e251a37a 100644 --- a/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch +++ b/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch @@ -1,23 +1,34 @@ +From 9de1bb6f37c4aedb9b21640003db46927d25b30b Mon Sep 17 00:00:00 2001 +From: Marko Lindqvist +Date: Wed, 22 Jun 2016 16:30:42 -0500 +Subject: [PATCH] python-pygobject: Backport 2.28.3 + Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101] Signed-off-by: Marko Lindqvist -diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac ---- pygobject-2.27.91/configure.ac 2011-02-23 22:14:37.000000000 +0200 -+++ pygobject-2.27.91/configure.ac 2013-01-03 05:13:44.034949954 +0200 -@@ -35,7 +35,7 @@ + +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f5ba355..ac5547a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,7 +35,7 @@ AC_SUBST(PYGOBJECT_MINOR_VERSION, pygobject_minor_version) AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version]) AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version) - + -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) AM_INIT_AUTOMAKE(foreign) AM_MAINTAINER_MODE -@@ -82,7 +82,6 @@ +@@ -82,7 +82,6 @@ dnl when using libtool 2.x create libtool early, because it's used in configure m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) AC_ISC_POSIX AC_PROG_CC -AM_PROG_CC_STDC AM_PROG_CC_C_O - - # check that we have the minimum version of python necisary to build + + # check that we have the minimum version of python necessary to build -- cgit v1.2.3