summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-07-05 04:33:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:15 +0100
commit3c397396278122ad591bbd6ecec4ddb46258b70c (patch)
tree1a83c2095f0d0089ed4452f11671625b4dd87446
parentec9e631f2f60b1b008c3d4e29d3b6880407f9bf0 (diff)
downloadpoky-3c397396278122ad591bbd6ecec4ddb46258b70c.tar.gz
avahi-ui: reduce local pending patches
[Yocto #11548] (From OE-Core rev: 9e18fc1aa4aa0ead854bb4e02eb3af2e7909f597) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
index 8ccef08dfc..942607a846 100644
--- a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
+++ b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
@@ -1,17 +1,18 @@
1From a59f13fab31a6e25bb03b2c2bc3aea576f857b6c Mon Sep 17 00:00:00 2001 1From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Sun, 12 Jun 2016 18:32:49 +0300 3Date: Sun, 12 Jun 2016 18:32:49 +0300
4Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3 4Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3
5 too 5 too
6 6
7Upstream-Status: Pending 7Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130]
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Signed-off-by: Dengke Du <dengke.du@windriver.com>
9--- 10---
10 configure.ac | 2 +- 11 configure.ac | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
12 13
13diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
14index aebb716..48bdf63 100644 15index 87a9a17..9860dcc 100644
15--- a/configure.ac 16--- a/configure.ac
16+++ b/configure.ac 17+++ b/configure.ac
17@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket) 18@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket)
@@ -24,5 +25,5 @@ index aebb716..48bdf63 100644
24 AC_SUBST(interfacesdir) 25 AC_SUBST(interfacesdir)
25 fi 26 fi
26-- 27--
272.1.4 282.8.1
28 29